diff options
| author |  Tony Crisci <tony@dubstepdish.com> | 2017-12-16 07:33:23 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-12-16 07:33:23 -0500 |
| commit | 9fa70ce426a78921fa61f25f8b30a73a2a7d9ad7 (patch) | |
| tree | 823cce0da3f7e0dc21c26bef7e639e8370e29b3d /sway/main.c | |
| parent | keyboard cleanup (diff) | |
| parent | Merge pull request #1503 from emersion/output-config (diff) | |
| download | sway-9fa70ce426a78921fa61f25f8b30a73a2a7d9ad7.tar.gz sway-9fa70ce426a78921fa61f25f8b30a73a2a7d9ad7.tar.zst sway-9fa70ce426a78921fa61f25f8b30a73a2a7d9ad7.zip | |
Merge branch 'wlroots' into feature/input
Diffstat (limited to 'sway/main.c')
| -rw-r--r-- | sway/main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sway/main.c b/sway/main.c index 25032aa0..bd69395a 100644 --- a/sway/main.c +++ b/sway/main.c | |||
| @@ -406,6 +406,10 @@ int main(int argc, char **argv) { | |||
| 406 | 406 | ||
| 407 | security_sanity_check(); | 407 | security_sanity_check(); |
| 408 | 408 | ||
| 409 | // TODO: wait for server to be ready | ||
| 410 | // TODO: consume config->cmd_queue | ||
| 411 | config->active = true; | ||
| 412 | |||
| 409 | if (!terminate_request) { | 413 | if (!terminate_request) { |
| 410 | server_run(&server); | 414 | server_run(&server); |
| 411 | } | 415 | } |