aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Connor E <38229097+c-edw@users.noreply.github.com>2019-02-05 15:39:22 +0000
committerLibravatar Drew DeVault <sir@cmpwn.com>2019-02-11 10:22:53 -0500
commitcc5139d52ace3bbfa8fd706fe408551c11766f4c (patch)
tree00dbf9a7f3a1c81ccc358fb7ef8e2d66fd872b3f
parentIf validating the config, do it as early as possible. (diff)
downloadsway-cc5139d52ace3bbfa8fd706fe408551c11766f4c.tar.gz
sway-cc5139d52ace3bbfa8fd706fe408551c11766f4c.tar.zst
sway-cc5139d52ace3bbfa8fd706fe408551c11766f4c.zip
Initialize server so input manager is available.
-rw-r--r--sway/main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sway/main.c b/sway/main.c
index b3ffdd83..67d0f799 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -318,12 +318,6 @@ int main(int argc, char **argv) {
318 detect_proprietary(allow_unsupported_gpu); 318 detect_proprietary(allow_unsupported_gpu);
319 detect_raspi(); 319 detect_raspi();
320 320
321 if (validate) {
322 bool valid = load_main_config(config_path, false, true);
323 free(config_path);
324 return valid ? 0 : 1;
325 }
326
327 if (optind < argc) { // Behave as IPC client 321 if (optind < argc) { // Behave as IPC client
328 if (optind != 1) { 322 if (optind != 1) {
329 sway_log(SWAY_ERROR, "Don't use options with the IPC client"); 323 sway_log(SWAY_ERROR, "Don't use options with the IPC client");
@@ -365,6 +359,12 @@ int main(int argc, char **argv) {
365 return 1; 359 return 1;
366 } 360 }
367 361
362 if (validate) {
363 bool valid = load_main_config(config_path, false, true);
364 free(config_path);
365 return valid ? 0 : 1;
366 }
367
368 ipc_init(&server); 368 ipc_init(&server);
369 369
370 setenv("WAYLAND_DISPLAY", server.socket, true); 370 setenv("WAYLAND_DISPLAY", server.socket, true);