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

i3: add "native" sway/i3 sort mode

Browse source 
This adds a sort mode for workspaces which corresponds to the default
behavior in sway/i3.
This commit is contained in:
Armin Fisslthaler 2023-03-24 17:45:52 +01:00
parent 8ccd79ad08
commit f21db9caca
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/i3.c
View file

@ -21,7 +21,7 @@
#include "i3-ipc.h" #include "i3-ipc.h"
#include "i3-common.h" #include "i3-common.h"
enum sort_mode {SORT_NONE, SORT_ASCENDING, SORT_DESCENDING}; enum sort_mode {SORT_NONE, SORT_NATIVE, SORT_ASCENDING, SORT_DESCENDING};
struct ws_content { struct ws_content {
char *name; char *name;
@ -185,6 +185,21 @@ workspace_add(struct private *m, struct workspace ws)
tll_push_back(m->workspaces, ws); tll_push_back(m->workspaces, ws);
return; return;
case SORT_NATIVE:
if (ws.name_as_int >= 0) {
tll_foreach(m->workspaces, it) {
if (it->item.name_as_int < 0)
continue;
if (it->item.name_as_int > ws.name_as_int) {
tll_insert_before(m->workspaces, it, ws);
return;
}
}
};
tll_push_back(m->workspaces, ws);
return;
case SORT_ASCENDING: case SORT_ASCENDING:
if (ws.name_as_int >= 0) { if (ws.name_as_int >= 0) {
tll_foreach(m->workspaces, it) { tll_foreach(m->workspaces, it) {
@ -974,6 +989,7 @@ from_conf(const struct yml_node *node, struct conf_inherit inherited)
enum sort_mode sort_mode = enum sort_mode sort_mode =
sort_value == NULL ? SORT_NONE : sort_value == NULL ? SORT_NONE :
strcmp(sort_value, "none") == 0 ? SORT_NONE : strcmp(sort_value, "none") == 0 ? SORT_NONE :
strcmp(sort_value, "native") == 0 ? SORT_NATIVE :
strcmp(sort_value, "ascending") == 0 ? SORT_ASCENDING : SORT_DESCENDING; strcmp(sort_value, "ascending") == 0 ? SORT_ASCENDING : SORT_DESCENDING;
const size_t persistent_count = const size_t persistent_count =
@ -1041,7 +1057,7 @@ static bool
verify_sort(keychain_t *chain, const struct yml_node *node) verify_sort(keychain_t *chain, const struct yml_node *node)
{ {
return conf_verify_enum( return conf_verify_enum(
chain, node, (const char *[]){"none", "ascending", "descending"}, 3); chain, node, (const char *[]){"none", "native", "ascending", "descending"}, 4);
} }
static bool static bool