pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

module/i3: separate numerical workspace names from non-numerical

Browse source 
When sorting workspaces in ascending order, put numerical
workspaces *after* non-numerical ones.

When sorting in descending order, put numerical workspaces *before*
non-numerical.

In both cases, sort numerical workspaces using a numerical comparison,
rather that doing a lexicographical sorting.

Closes #30
This commit is contained in:
Daniel Eklöf 2021-01-04 20:16:30 +01:00
parent f88f7a5046
commit 6cbf093af9
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 50 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
modules/i3.c
View file

@ -30,6 +30,8 @@ struct ws_content {
struct workspace { struct workspace {
char *name; char *name;
int name_as_int; /* -1 is name is not a decimal number */
char *output; char *output;
bool visible; bool visible;
bool focused; bool focused;
@ -78,8 +80,22 @@ workspace_from_json(const struct json_object *json, struct workspace *ws)
json_object_object_get_ex(json, "focused", &focused); json_object_object_get_ex(json, "focused", &focused);
json_object_object_get_ex(json, "urgent", &urgent); json_object_object_get_ex(json, "urgent", &urgent);
const char *name_as_string = json_object_get_string(name);
int name_as_int = 0;
for (const char *p = name_as_string; *p != '\0'; p++) {
if (!(*p >= '0' && *p <= '9')) {
name_as_int = -1;
break;
}
name_as_int *= 10;
name_as_int += *p - '0';
}
*ws = (struct workspace) { *ws = (struct workspace) {
.name = strdup(json_object_get_string(name)), .name = strdup(name_as_string),
.name_as_int = name_as_int,
.output = strdup(json_object_get_string(output)), .output = strdup(json_object_get_string(output)),
.visible = json_object_get_boolean(visible), .visible = json_object_get_boolean(visible),
.focused = json_object_get_boolean(focused), .focused = json_object_get_boolean(focused),
@ -107,6 +123,7 @@ workspaces_free(struct private *m)
tll_free(m->workspaces); tll_free(m->workspaces);
} }
static void static void
workspace_add(struct private *m, struct workspace ws) workspace_add(struct private *m, struct workspace ws)
{ {
@ -116,20 +133,44 @@ workspace_add(struct private *m, struct workspace ws)
return; return;
case SORT_ASCENDING: case SORT_ASCENDING:
tll_foreach(m->workspaces, it) { if (ws.name_as_int >= 0) {
if (strcoll(it->item.name, ws.name) > 0) { tll_foreach(m->workspaces, it) {
tll_insert_before(m->workspaces, it, ws); if (it->item.name_as_int < 0)
return; continue;
if (it->item.name_as_int > ws.name_as_int) {
tll_insert_before(m->workspaces, it, ws);
return;
}
}
} else {
tll_foreach(m->workspaces, it) {
if (strcoll(it->item.name, ws.name) > 0 ||
it->item.name_as_int >= 0)
{
tll_insert_before(m->workspaces, it, ws);
return;
}
} }
} }
tll_push_back(m->workspaces, ws); tll_push_back(m->workspaces, ws);
return; return;
case SORT_DESCENDING: case SORT_DESCENDING:
tll_foreach(m->workspaces, it) { if (ws.name_as_int >= 0) {
if (strcoll(it->item.name, ws.name) < 0) { tll_foreach(m->workspaces, it) {
tll_insert_before(m->workspaces, it, ws); if (it->item.name_as_int < ws.name_as_int) {
return; tll_insert_before(m->workspaces, it, ws);
return;
}
}
} else {
tll_foreach(m->workspaces, it) {
if (it->item.name_as_int >= 0)
continue;
if (strcoll(it->item.name, ws.name) < 0) {
tll_insert_before(m->workspaces, it, ws);
return;
}
} }
} }
tll_push_back(m->workspaces, ws); tll_push_back(m->workspaces, ws);