diff options
author | S. Christoffer Eliesen <christoffer@eliesen.no> | 2015-11-19 13:05:59 +0100 |
---|---|---|
committer | S. Christoffer Eliesen <christoffer@eliesen.no> | 2015-11-22 11:08:08 +0100 |
commit | 5531dbe1b2026a88670c812d40f0efccb4b52c7f (patch) | |
tree | 793b93d9df55478856a9d6dda7d99d3f8bd7d0e7 /sway/commands.c | |
parent | stringop: lenient_strcmp: Add. (diff) | |
download | sway-5531dbe1b2026a88670c812d40f0efccb4b52c7f.tar.gz sway-5531dbe1b2026a88670c812d40f0efccb4b52c7f.tar.zst sway-5531dbe1b2026a88670c812d40f0efccb4b52c7f.zip |
cmd_workspace: Don't fill up config->workspace_outputs with duplicates.
This also fixes a bug where issuing a new "workspace a output b" command
for an already assigned workspace would not work (the old config would
be found first and used instead).
Diffstat (limited to 'sway/commands.c')
-rw-r--r-- | sway/commands.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sway/commands.c b/sway/commands.c index 173f0f53..7f24f5ab 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -1318,9 +1318,15 @@ static struct cmd_results *cmd_workspace(int argc, char **argv) { | |||
1318 | return error; | 1318 | return error; |
1319 | } | 1319 | } |
1320 | struct workspace_output *wso = calloc(1, sizeof(struct workspace_output)); | 1320 | struct workspace_output *wso = calloc(1, sizeof(struct workspace_output)); |
1321 | sway_log(L_DEBUG, "Assigning workspace %s to output %s", argv[0], argv[2]); | ||
1322 | wso->workspace = strdup(argv[0]); | 1321 | wso->workspace = strdup(argv[0]); |
1323 | wso->output = strdup(argv[2]); | 1322 | wso->output = strdup(argv[2]); |
1323 | int i = -1; | ||
1324 | if ((i = list_seq_find(config->workspace_outputs, workspace_output_cmp_workspace, wso)) != -1) { | ||
1325 | struct workspace_output *old = config->workspace_outputs->items[i]; | ||
1326 | free(old); // workspaces can only be assigned to a single output | ||
1327 | list_del(config->workspace_outputs, i); | ||
1328 | } | ||
1329 | sway_log(L_DEBUG, "Assigning workspace %s to output %s", argv[0], argv[2]); | ||
1324 | list_add(config->workspace_outputs, wso); | 1330 | list_add(config->workspace_outputs, wso); |
1325 | if (!config->reading) { | 1331 | if (!config->reading) { |
1326 | // TODO: Move workspace to output. (dont do so when reloading) | 1332 | // TODO: Move workspace to output. (dont do so when reloading) |