mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-16 22:05:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

window-switcher: add order parameter to allow stable window list ordering
Some checks failed
labwc.github.io / notify (push) Has been cancelled
Details

Browse source 
Add a new configuration option to control the window switcher traversal order.

`order="focus"` cycling is convenient for quick toggling, but some users - me as well -
prefer a stable taskbar-like order which can now be achieved with `order="age"`.
This commit is contained in:
Maik Broemme 2025-12-08 18:54:23 +01:00 • committed by GitHub
parent eecb5d0947
commit 8fdf375af3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 45 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/config/rcxml.c
View file

@ -1240,6 +1240,15 @@ entry(xmlNode *node, char *nodename, char *content)
wlr_log(WLR_ERROR, "Invalid windowSwitcher output %s: "
"should be one of all|focused|cursor", content);
}
} else if (!strcasecmp(nodename, "order.windowSwitcher")) {
if (!strcasecmp(content, "focus")) {
rc.window_switcher.order = WINDOW_SWITCHER_ORDER_FOCUS;
} else if (!strcasecmp(content, "age")) {
rc.window_switcher.order = WINDOW_SWITCHER_ORDER_AGE;
} else {
wlr_log(WLR_ERROR, "Invalid windowSwitcher order %s: "
"should be one of focus|age", content);
}
/* The following two are for backward compatibility only. */
} else if (!strcasecmp(nodename, "show.windowSwitcher")) {
@ -1485,6 +1494,7 @@ rcxml_init(void)
rc.window_switcher.criteria = LAB_VIEW_CRITERIA_CURRENT_WORKSPACE
| LAB_VIEW_CRITERIA_ROOT_TOPLEVEL
| LAB_VIEW_CRITERIA_NO_SKIP_WINDOW_SWITCHER;
rc.window_switcher.order = WINDOW_SWITCHER_ORDER_FOCUS;
rc.resize_indicator = LAB_RESIZE_INDICATOR_NEVER;
rc.resize_draw_contents = true;

20
src/cycle/cycle.c
View file

@ -276,13 +276,31 @@ create_osd_on_output(struct output *output)
assert(output->cycle_osd.tree);
}
static void
insert_view_ordered_by_age(struct wl_list *views, struct view *new_view)
{
struct wl_list *link = views;
struct view *view;
wl_list_for_each(view, views, cycle_link) {
if (view->creation_id >= new_view->creation_id) {
break;
}
link = &view->cycle_link;
}
wl_list_insert(link, &new_view->cycle_link);
}
/* Return false on failure */
static bool
init_cycle(struct server *server)
{
struct view *view;
for_each_view(view, &server->views, rc.window_switcher.criteria) {
wl_list_append(&server->cycle.views, &view->cycle_link);
if (rc.window_switcher.order == WINDOW_SWITCHER_ORDER_AGE) {
insert_view_ordered_by_age(&server->cycle.views, view);
} else {
wl_list_append(&server->cycle.views, &view->cycle_link);
}
}
if (wl_list_empty(&server->cycle.views)) {
wlr_log(WLR_DEBUG, "no views to switch between");

1
src/xdg.c
View file

@ -1085,6 +1085,7 @@ handle_new_xdg_toplevel(struct wl_listener *listener, void *data)
CONNECT_SIGNAL(xdg_surface, xdg_toplevel_view, new_popup);
wl_list_insert(&server->views, &view->link);
view->creation_id = server->next_view_creation_id++;
}
static void

1
src/xwayland.c
View file

@ -1036,6 +1036,7 @@ xwayland_view_create(struct server *server,
CONNECT_SIGNAL(xsurface, xwayland_view, map_request);
wl_list_insert(&view->server->views, &view->link);
view->creation_id = view->server->next_view_creation_id++;
if (xsurface->surface) {
handle_associate(&xwayland_view->associate, NULL);