Added in command queue

sway/commands.c

@@ -229,8 +229,8 @@ static bool cmd_set(struct sway_config *config, int argc, char **argv) {
 
 static bool _do_split(struct sway_config *config, int argc, char **argv, int layout) {
 	char *name = layout == L_VERT  ? "splitv":
-	             layout == L_HORIZ ? "splith":
+				 layout == L_HORIZ ? "splith":
-	                                 "split";
+									 "split";
 	if (!checkarg(argc, name, EXPECTED_EQUAL_TO, 0)) {
 		return false;
 	}

sway/config.c

@@ -33,6 +33,7 @@ bool load_config() {
 void config_defaults(struct sway_config *config) {
 	config->symbols = create_list();
 	config->modes = create_list();
+	config->cmd_queue = create_list();
 	config->current_mode = malloc(sizeof(struct sway_mode));
 	config->current_mode->name = NULL;
 	config->current_mode->bindings = create_list();
@@ -68,9 +69,20 @@ struct sway_config *read_config(FILE *file, bool is_active) {
 			goto _continue;
 		}
 
-		if (!temp_depth && handle_command(config, line) != true) {
+		// Any command which would require wlc to be initialized
+		// should be queue for later execution
+		list_t *args = split_string(line, " ");
+		sway_log(L_DEBUG, "Checking command %s", line);
+		if (strcmp("workspace", args->items[0]) == 0) {
+			sway_log(L_DEBUG, "Deferring command %s", line);
+			char *cmd = malloc(strlen(line) + 1);
+			strcpy(cmd, line);
+			list_add(config->cmd_queue, cmd);
+		}else if (!temp_depth && !handle_command(config, line)) {
+			sway_log(L_DEBUG, "Config load failed for line %s", line);
 			success = false;
-		}
+		} 
+		list_free(args);
 
 _continue:
 		if (line && line[strlen(line) - 1] == '{') {
@@ -80,6 +92,7 @@ _continue:
 	}
 
 	if (success == false) {
+		sway_log(L_DEBUG, "Config load failed, exiting");
 		exit(1);
 	}
 

sway/config.h

@@ -24,6 +24,7 @@ struct sway_mode {
 struct sway_config {
 	list_t *symbols;
 	list_t *modes;
+	list_t *cmd_queue;
 	struct sway_mode *current_mode;
 
 	// Flags

sway/handlers.c

@@ -163,6 +163,16 @@ static bool handle_pointer_button(wlc_handle view, uint32_t time, const struct w
 	return true;
 }
 
+static void handle_wlc_ready(void) {
+	sway_log(L_DEBUG, "Compositor is ready, executing cmds in queue");
+	int i;
+	for (i = 0; i < config->cmd_queue->length; ++i) {
+		sway_log(L_DEBUG, "Handling command %s", config->cmd_queue->items[i]);
+		handle_command(config, config->cmd_queue->items[i]);
+	}
+	list_free(config->cmd_queue);
+}
+
 
 struct wlc_interface interface = {
 	.output = {
@@ -185,6 +195,9 @@ struct wlc_interface interface = {
 	.pointer = {
 		.motion = handle_pointer_motion,
 		.button = handle_pointer_button
+	},
+	.compositor = {
+		.ready = handle_wlc_ready 
 	}
 };
 

sway/workspace.c

@@ -14,43 +14,46 @@ swayc_t *active_workspace = NULL;
 char *workspace_next_name(void) {
 	sway_log(L_DEBUG, "Workspace: Generating new name");
 	int i;
-    int l = 1;
+	int l = 1;
-    // Scan all workspace bindings to find the next available workspace name,
+	// Scan all workspace bindings to find the next available workspace name,
-    // if none are found/available then default to a number
+	// if none are found/available then default to a number
 	struct sway_mode *mode = config->current_mode;
 
 	for (i = 0; i < mode->bindings->length; ++i) {
 		struct sway_binding *binding = mode->bindings->items[i];
 		const char* command = binding->command;
-	    list_t *args = split_string(command, " ");
+		list_t *args = split_string(command, " ");
-	    sway_log(L_DEBUG, "Workspace: Checking name '%s'", command);
 
-        if (strcmp("workspace", args->items[0]) == 0 && args->length > 1) {
+		if (strcmp("workspace", args->items[0]) == 0 && args->length > 1) {
-	        sway_log(L_DEBUG, "Got valid workspace command for target: '%s'", args->items[1]);
+			sway_log(L_DEBUG, "Got valid workspace command for target: '%s'", args->items[1]);
-            const char* target = args->items[1];
+			const char* target = args->items[1];
 
-            while (*target == ' ' || *target == '\t')
+			while (*target == ' ' || *target == '\t')
-                target++; 
+				target++; 
 
-            // Make sure that the command references an actual workspace
+			// Make sure that the command references an actual workspace
-            // not a command about workspaces
+			// not a command about workspaces
-            if (strcmp(target, "next") == 0 ||
+			if (strcmp(target, "next") == 0 ||
-                strcmp(target, "prev") == 0 ||
+				strcmp(target, "prev") == 0 ||
-                strcmp(target, "next_on_output") == 0 ||
+				strcmp(target, "next_on_output") == 0 ||
-                strcmp(target, "prev_on_output") == 0 ||
+				strcmp(target, "prev_on_output") == 0 ||
-                strcmp(target, "number") == 0 ||
+				strcmp(target, "number") == 0 ||
-                strcmp(target, "back_and_forth") == 0 ||
+				strcmp(target, "back_and_forth") == 0 ||
-                strcmp(target, "current") == 0)
+				strcmp(target, "current") == 0)
-                continue;
+				continue;
-           
+		   
-            //Make sure that the workspace doesn't already exist 
+			//Make sure that the workspace doesn't already exist 
-            if (workspace_find_by_name(args->items[1]))
+			if (workspace_find_by_name(args->items[1]))
-               continue; 
+			   continue; 
 
-            return args->items[1];        }
+			list_free(args);
-    }
+
-    // As a fall back, get the current number of active workspaces
+			sway_log(L_DEBUG, "Workspace: Found free name %s", args->items[1]);
-    // and return that + 1 for the next workspace's name
+			return args->items[1];
+		}
+	}
+	// As a fall back, get the current number of active workspaces
+	// and return that + 1 for the next workspace's name
 	int ws_num = root_container.children->length;
 	if (ws_num >= 10) {
 		l = 2;