diff options
author | Zandr Martin <zandrmartin+git@gmail.com> | 2016-05-28 08:35:58 -0500 |
---|---|---|
committer | Zandr Martin <zandrmartin+git@gmail.com> | 2016-05-28 08:35:58 -0500 |
commit | 7df38ce9dade4708fb658bab88eb5eb4824d3556 (patch) | |
tree | d43477a8ead345a7ca3d2f40c4335ec44352ec65 | |
parent | Implement sort_workspaces() function for outputs. (diff) | |
download | sway-7df38ce9dade4708fb658bab88eb5eb4824d3556.tar.gz sway-7df38ce9dade4708fb658bab88eb5eb4824d3556.tar.zst sway-7df38ce9dade4708fb658bab88eb5eb4824d3556.zip |
remove alphabetic sorting from sort_workspaces
also add a couple missing spaces to container.c (unrelated)
-rw-r--r-- | sway/commands.c | 4 | ||||
-rw-r--r-- | sway/output.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sway/commands.c b/sway/commands.c index fbdb5fb8..487b6a8e 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -2328,7 +2328,7 @@ static struct cmd_results *cmd_workspace(int argc, char **argv) { | |||
2328 | if (!(ws=workspace_by_number(argv[1]))) { | 2328 | if (!(ws=workspace_by_number(argv[1]))) { |
2329 | ws = workspace_create(argv[1]); | 2329 | ws = workspace_create(argv[1]); |
2330 | } | 2330 | } |
2331 | }else if (strcasecmp(argv[0], "next") == 0) { | 2331 | } else if (strcasecmp(argv[0], "next") == 0) { |
2332 | ws = workspace_next(); | 2332 | ws = workspace_next(); |
2333 | } else if (strcasecmp(argv[0], "prev") == 0) { | 2333 | } else if (strcasecmp(argv[0], "prev") == 0) { |
2334 | ws = workspace_prev(); | 2334 | ws = workspace_prev(); |
@@ -2343,7 +2343,7 @@ static struct cmd_results *cmd_workspace(int argc, char **argv) { | |||
2343 | } | 2343 | } |
2344 | } | 2344 | } |
2345 | } else { | 2345 | } else { |
2346 | if (!(ws= workspace_by_name(argv[0]))) { | 2346 | if (!(ws = workspace_by_name(argv[0]))) { |
2347 | ws = workspace_create(argv[0]); | 2347 | ws = workspace_create(argv[0]); |
2348 | } | 2348 | } |
2349 | } | 2349 | } |
diff --git a/sway/output.c b/sway/output.c index 046dee8c..53b24232 100644 --- a/sway/output.c +++ b/sway/output.c | |||
@@ -193,8 +193,6 @@ int sort_workspace_cmp_qsort(const void *_a, const void *_b) { | |||
193 | retval = -1; | 193 | retval = -1; |
194 | } else if (isdigit(b->name[0])) { | 194 | } else if (isdigit(b->name[0])) { |
195 | retval = 1; | 195 | retval = 1; |
196 | } else { | ||
197 | retval = strcmp(a->name, b->name); | ||
198 | } | 196 | } |
199 | 197 | ||
200 | return retval; | 198 | return retval; |