diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-08-18 09:30:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-18 09:30:13 -0400 |
| commit | 5c779c11f6fc2ca214f64b905086dead170ae174 (patch) | |
| tree | bf71a43528328a786be1a4de02781e6e83aea406 /sway/tree/output.c | |
| parent | cfe205b36fba77ba64184e0c1e8dcb211a7a8904 (diff) | |
| parent | 16c663ed49e3950388901f220066e4da69956dfb (diff) | |
Merge pull request #2481 from RyanDwyer/rename-functions
Rename container_sort_workspaces and container_wrap_children
Diffstat (limited to 'sway/tree/output.c')
| -rw-r--r-- | sway/tree/output.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/sway/tree/output.c b/sway/tree/output.c index 31e3bf9b..ab955359 100644 --- a/sway/tree/output.c +++ b/sway/tree/output.c @@ -1,4 +1,5 @@ #define _POSIX_C_SOURCE 200809L +#include <ctype.h> #include <string.h> #include <strings.h> #include "sway/ipc-server.h" @@ -28,7 +29,7 @@ static void restore_workspaces(struct sway_container *output) { } } - container_sort_workspaces(output); + output_sort_workspaces(output); } struct sway_container *output_create( @@ -102,3 +103,23 @@ struct sway_container *output_create( return output; } +static int sort_workspace_cmp_qsort(const void *_a, const void *_b) { + struct sway_container *a = *(void **)_a; + struct sway_container *b = *(void **)_b; + + if (isdigit(a->name[0]) && isdigit(b->name[0])) { + int a_num = strtol(a->name, NULL, 10); + int b_num = strtol(b->name, NULL, 10); + return (a_num < b_num) ? -1 : (a_num > b_num); + } else if (isdigit(a->name[0])) { + return -1; + } else if (isdigit(b->name[0])) { + return 1; + } + return 0; +} + +void output_sort_workspaces(struct sway_container *output) { + list_stable_sort(output->children, sort_workspace_cmp_qsort); +} + |