From af7e1de87bb4014d27a92b255f5fc522bf259f4a Mon Sep 17 00:00:00 2001 From: Chris Sobczak Date: Fri, 26 Jun 2026 13:01:00 -0700 Subject: Downlaod shiftview patch --- patches/shiftview/README.md | 9 +++++ patches/shiftview/shiftview.patch | 76 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 patches/shiftview/README.md create mode 100644 patches/shiftview/shiftview.patch diff --git a/patches/shiftview/README.md b/patches/shiftview/README.md new file mode 100644 index 0000000..8e26f4d --- /dev/null +++ b/patches/shiftview/README.md @@ -0,0 +1,9 @@ +### Description +Add keybindings to cycle through tags with visible clients. + +### Download +- [git branch](https://codeberg.org/guidocella/dwl/src/branch/shiftview) +- [2026-02-09](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/shiftview/shiftview.patch) + +### Authors +- [Guido Cella](https://codeberg.org/guidocella) diff --git a/patches/shiftview/shiftview.patch b/patches/shiftview/shiftview.patch new file mode 100644 index 0000000..50a849b --- /dev/null +++ b/patches/shiftview/shiftview.patch @@ -0,0 +1,76 @@ +From ce4217d8ee9c28ba76ca34fae7a7c3ef1aceecb0 Mon Sep 17 00:00:00 2001 +From: Guido Cella +Date: Sat, 27 Jan 2024 22:43:29 +0100 +Subject: [PATCH] cycle through tags + +--- + config.def.h | 4 ++++ + shiftview.c | 34 ++++++++++++++++++++++++++++++++++ + 2 files changed, 38 insertions(+) + create mode 100644 shiftview.c + +diff --git a/config.def.h b/config.def.h +index 8a6eda0..fd80703 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -118,6 +118,8 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA + static const char *termcmd[] = { "foot", NULL }; + static const char *menucmd[] = { "wmenu-run", NULL }; + ++#include "shiftview.c" ++ + static const Key keys[] = { + /* Note that Shift changes certain key codes: 2 -> at, etc. */ + /* modifier key function argument */ +@@ -131,6 +133,8 @@ static const Key keys[] = { + { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} }, + { MODKEY, XKB_KEY_Return, zoom, {0} }, + { MODKEY, XKB_KEY_Tab, view, {0} }, ++ { MODKEY, XKB_KEY_a, shiftview, { .i = -1 } }, ++ { MODKEY, XKB_KEY_semicolon, shiftview, { .i = 1 } }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_c, killclient, {0} }, + { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, + { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, +diff --git a/shiftview.c b/shiftview.c +new file mode 100644 +index 0000000..fa53db0 +--- /dev/null ++++ b/shiftview.c +@@ -0,0 +1,34 @@ ++// "arg->i" stores the number of tags to shift right (positive value) ++// or left (negative value) ++void ++shiftview(const Arg *arg) ++{ ++ Arg a; ++ Client *c; ++ bool visible = false; ++ int i = arg->i; ++ int count = 0; ++ int nextseltags, curseltags = selmon->tagset[selmon->seltags]; ++ ++ do { ++ if (i > 0) // left circular shift ++ nextseltags = (curseltags << i) | (curseltags >> (TAGCOUNT - i)); ++ else // right circular shift ++ nextseltags = curseltags >> (-i) | (curseltags << (TAGCOUNT + i)); ++ ++ // Check if the tag is visible ++ wl_list_for_each(c, &clients, link) { ++ if (c->mon == selmon && nextseltags & c->tags) { ++ visible = true; ++ break; ++ } ++ } ++ ++ i += arg->i; ++ } while (!visible && ++count <= TAGCOUNT); ++ ++ if (count <= TAGCOUNT) { ++ a.i = nextseltags; ++ view(&a); ++ } ++} +-- +2.52.0 + -- cgit v1.2.3 From f6a0b8570b75119bce201ef6476e333f97d622bf Mon Sep 17 00:00:00 2001 From: Chris Sobczak Date: Fri, 26 Jun 2026 18:41:23 -0700 Subject: Apply shiftview.patch --- config.def.h | 4 ++++ shiftview.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 shiftview.c diff --git a/config.def.h b/config.def.h index 8a6eda0..fd80703 100644 --- a/config.def.h +++ b/config.def.h @@ -118,6 +118,8 @@ static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TA static const char *termcmd[] = { "foot", NULL }; static const char *menucmd[] = { "wmenu-run", NULL }; +#include "shiftview.c" + static const Key keys[] = { /* Note that Shift changes certain key codes: 2 -> at, etc. */ /* modifier key function argument */ @@ -131,6 +133,8 @@ static const Key keys[] = { { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} }, { MODKEY, XKB_KEY_Return, zoom, {0} }, { MODKEY, XKB_KEY_Tab, view, {0} }, + { MODKEY, XKB_KEY_a, shiftview, { .i = -1 } }, + { MODKEY, XKB_KEY_semicolon, shiftview, { .i = 1 } }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_c, killclient, {0} }, { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, diff --git a/shiftview.c b/shiftview.c new file mode 100644 index 0000000..fa53db0 --- /dev/null +++ b/shiftview.c @@ -0,0 +1,34 @@ +// "arg->i" stores the number of tags to shift right (positive value) +// or left (negative value) +void +shiftview(const Arg *arg) +{ + Arg a; + Client *c; + bool visible = false; + int i = arg->i; + int count = 0; + int nextseltags, curseltags = selmon->tagset[selmon->seltags]; + + do { + if (i > 0) // left circular shift + nextseltags = (curseltags << i) | (curseltags >> (TAGCOUNT - i)); + else // right circular shift + nextseltags = curseltags >> (-i) | (curseltags << (TAGCOUNT + i)); + + // Check if the tag is visible + wl_list_for_each(c, &clients, link) { + if (c->mon == selmon && nextseltags & c->tags) { + visible = true; + break; + } + } + + i += arg->i; + } while (!visible && ++count <= TAGCOUNT); + + if (count <= TAGCOUNT) { + a.i = nextseltags; + view(&a); + } +} -- cgit v1.2.3 From cc93d10f76dfdeebb8c0dab38a8ecbb3495ea88e Mon Sep 17 00:00:00 2001 From: Chris Sobczak Date: Fri, 26 Jun 2026 18:43:00 -0700 Subject: Set keybindings for w and q --- config.def.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.def.h b/config.def.h index fd80703..8112f2b 100644 --- a/config.def.h +++ b/config.def.h @@ -133,8 +133,8 @@ static const Key keys[] = { { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} }, { MODKEY, XKB_KEY_Return, zoom, {0} }, { MODKEY, XKB_KEY_Tab, view, {0} }, - { MODKEY, XKB_KEY_a, shiftview, { .i = -1 } }, - { MODKEY, XKB_KEY_semicolon, shiftview, { .i = 1 } }, + { MODKEY, XKB_KEY_q, shiftview, { .i = -1 } }, + { MODKEY, XKB_KEY_w, shiftview, { .i = 1 } }, { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_c, killclient, {0} }, { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, -- cgit v1.2.3 From 8cd908a0a3fca2f870ed53f0b9a1ff79752f5a8d Mon Sep 17 00:00:00 2001 From: Chris Sobczak Date: Fri, 26 Jun 2026 19:13:09 -0700 Subject: Adjust shiftview so that it cycles through all tags regardless of active windows --- shiftview.c | 50 +++++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/shiftview.c b/shiftview.c index fa53db0..ddd81ef 100644 --- a/shiftview.c +++ b/shiftview.c @@ -1,34 +1,30 @@ -// "arg->i" stores the number of tags to shift right (positive value) -// or left (negative value) +// shiftview all tags regardless of tags having open windows void shiftview(const Arg *arg) { - Arg a; - Client *c; - bool visible = false; - int i = arg->i; - int count = 0; - int nextseltags, curseltags = selmon->tagset[selmon->seltags]; + Arg view_argument; + uint32_t destination_tag; - do { - if (i > 0) // left circular shift - nextseltags = (curseltags << i) | (curseltags >> (TAGCOUNT - i)); - else // right circular shift - nextseltags = curseltags >> (-i) | (curseltags << (TAGCOUNT + i)); + // arg->i represents the direction and distance passed from config.def.h (usually -1 and +1) + if(arg->i > 0){ + // shift right (increase tag index), move the active tag bit to the left (0001) to (0010) + destination_tag = selmon->tagset[selmon->seltags] << arg->i; + }else{ + // shift to the left + destination_tag = selmon->tagset[selmon->seltags] >> (-arg->i); + } - // Check if the tag is visible - wl_list_for_each(c, &clients, link) { - if (c->mon == selmon && nextseltags & c->tags) { - visible = true; - break; - } - } + // TAGMASK defines the valid boundary for tags (111111111) for 9 tags + // if the shift pushed the active bit outside the bounds, destination_tag will become 0 + if(!(destination_tag & TAGMASK)){ + // If we went off to the right edge, wrap around to the first tag (000000001) + // If we went off to the left, wrap around to the last tag (bit 1 shifted left by TAGCOUNT - 1) + destination_tag = arg->i > 0 ? 1 : 1 << (TAGCOUNT - 1); + } - i += arg->i; - } while (!visible && ++count <= TAGCOUNT); - - if (count <= TAGCOUNT) { - a.i = nextseltags; - view(&a); - } + // pack the destination tag bitmask into the required dwl argument struct + view_argument.ui = destination_tag; + + // pass the destination tag to dwl's view function + view(&view_argument); } -- cgit v1.2.3