mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-27 15:36:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

sway: insert numbered workspaces in order

Browse source 
fixes #308

Ordered by number ascending, with insert before same numbers.
Workspaces without numbers are appended at the end of the list.

Example order:
1 2:named 3:the_second 3:the_first 9 FIRST_NAME SECOND_NAME ...
This commit is contained in:
progandy 2015-12-18 01:01:02 +01:00
parent 8f1ac1ef2c
commit 76c520a04b
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/layout.h
View file

@ -24,6 +24,10 @@ int index_child(const swayc_t *child);
// parent must be of type C_WORKSPACE or C_CONTAINER // parent must be of type C_WORKSPACE or C_CONTAINER
void add_child(swayc_t *parent, swayc_t *child); void add_child(swayc_t *parent, swayc_t *child);
// Adds child to parent at index, if parent has no focus, it is set to child
// parent must be of type C_WORKSPACE or C_CONTAINER
void insert_child(swayc_t *parent, swayc_t *child, int index);
// Adds child as floating window to ws, if there is no focus it is set to child. // Adds child as floating window to ws, if there is no focus it is set to child.
// ws must be of type C_WORKSPACE // ws must be of type C_WORKSPACE
void add_floating(swayc_t *ws, swayc_t *child); void add_floating(swayc_t *ws, swayc_t *child);

20
sway/container.c
View file

@ -1,3 +1,4 @@
#include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h> #include <stdbool.h>
#include <strings.h> #include <strings.h>
@ -168,7 +169,24 @@ swayc_t *new_workspace(swayc_t *output, const char *name) {
workspace->visible = false; workspace->visible = false;
workspace->floating = create_list(); workspace->floating = create_list();
add_child(output, workspace); if (isdigit(workspace->name[0])) {
// find position for numbered workspace
// order: ascending numbers, insert before same number
// numbers before unnumbered
int num = strtol(workspace->name, NULL, 10);
int i;
for (i = 0; i < output->children->length; ++i) {
char *name = ((swayc_t *)output->children->items[i])->name;
if (!isdigit(name[0]) || num <= strtol(name, NULL, 10)) {
break;
}
}
insert_child(output, workspace, i);
} else {
// append new unnumbered to the end
add_child(output, workspace);
}
return workspace; return workspace;
} }