From 1f2e23ba3c1aac05250b722eb97f5e3ab650b3ed Mon Sep 17 00:00:00 2001 From: A Frederick Christensen Date: Thu, 26 Feb 2026 17:22:54 -0600 Subject: [PATCH] simple_scratchpad: Update for 0.8 and for wlroots-next-f4249db --- patches/simple_scratchpad/README.md | 3 +- ...v0.7.patch => simple_scratchpad-0.8.patch} | 66 +++--- ...mple_scratchpad-wlroots-next-f4249db.patch | 219 ++++++++++++++++++ 3 files changed, 254 insertions(+), 34 deletions(-) rename patches/simple_scratchpad/{simple_scratchpad-v0.7.patch => simple_scratchpad-0.8.patch} (75%) create mode 100644 patches/simple_scratchpad/simple_scratchpad-wlroots-next-f4249db.patch diff --git a/patches/simple_scratchpad/README.md b/patches/simple_scratchpad/README.md index 8076d96..d7918bb 100644 --- a/patches/simple_scratchpad/README.md +++ b/patches/simple_scratchpad/README.md @@ -19,7 +19,8 @@ Adds functions to add, toggle and remove clients to/from scratchpad client list. ### Download - [git branch](https://codeberg.org/julmajustus/dwl/src/branch/simple_scratchpad) -- [0.7](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simple_scratchpad/simple_scratchpad-v0.7.patch) +- [scratchpad-wlroots-next-f4249db.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simple_scratchpad/simple_scratchpad-f4249db.patch) +- [scratchpad-0.8.patch](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/simple_scratchpad/simple_scratchpad-0.8.patch) ### Authors - [julmajustus](https://codeberg.org/julmajustus) diff --git a/patches/simple_scratchpad/simple_scratchpad-v0.7.patch b/patches/simple_scratchpad/simple_scratchpad-0.8.patch similarity index 75% rename from patches/simple_scratchpad/simple_scratchpad-v0.7.patch rename to patches/simple_scratchpad/simple_scratchpad-0.8.patch index a273559..0d8af99 100644 --- a/patches/simple_scratchpad/simple_scratchpad-v0.7.patch +++ b/patches/simple_scratchpad/simple_scratchpad-0.8.patch @@ -1,34 +1,34 @@ -From a8d29e03f565b54a68c6c2cb2da103366c627825 Mon Sep 17 00:00:00 2001 -From: julmajustus -Date: Sat, 4 Jan 2025 13:22:12 +0200 -Subject: [PATCH] add simple_scratchpad +From 0d603b179ccccbb4270fd202a14a2db18d0a5413 Mon Sep 17 00:00:00 2001 +From: A Frederick Christensen +Date: Thu, 26 Feb 2026 17:09:28 -0600 +Subject: [PATCH] Apply simple_scratchpad patch --- config.def.h | 3 ++ dwl.c | 34 +++++++++++++++++++++-- - simple_scratchpad.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 102 insertions(+), 2 deletions(-) + simple_scratchpad.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 103 insertions(+), 2 deletions(-) create mode 100644 simple_scratchpad.c diff --git a/config.def.h b/config.def.h -index 22d2171..83f19b3 100644 +index 8a6eda0..6254fc9 100644 --- a/config.def.h +++ b/config.def.h -@@ -136,6 +136,9 @@ static const Key keys[] = { - { MODKEY, XKB_KEY_Return, zoom, {0} }, - { MODKEY, XKB_KEY_Tab, view, {0} }, - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} }, -+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Z, addscratchpad, {0} }, -+ { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_z, togglescratchpad, {0} }, -+ { MODKEY, XKB_KEY_z, removescratchpad, {0} }, - { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, - { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, - { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, +@@ -132,6 +132,9 @@ static const Key keys[] = { + { MODKEY, XKB_KEY_Return, zoom, {0} }, + { MODKEY, XKB_KEY_Tab, view, {0} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_c, killclient, {0} }, ++ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_z, addscratchpad, {0} }, ++ { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_z, togglescratchpad, {0} }, ++ { MODKEY, XKB_KEY_z, removescratchpad, {0} }, + { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, + { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, + { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, diff --git a/dwl.c b/dwl.c -index a2711f6..85f4a51 100644 +index 44f3ad9..215f630 100644 --- a/dwl.c +++ b/dwl.c -@@ -141,6 +141,7 @@ typedef struct { +@@ -139,6 +139,7 @@ typedef struct { uint32_t tags; int isfloating, isurgent, isfullscreen; uint32_t resize; /* configure serial of a pending resize */ @@ -36,7 +36,7 @@ index a2711f6..85f4a51 100644 } Client; typedef struct { -@@ -243,6 +244,7 @@ typedef struct { +@@ -240,6 +241,7 @@ typedef struct { } SessionLock; /* function declarations */ @@ -44,7 +44,7 @@ index a2711f6..85f4a51 100644 static void applybounds(Client *c, struct wlr_box *bbox); static void applyrules(Client *c); static void arrange(Monitor *m); -@@ -317,6 +319,7 @@ static void printstatus(void); +@@ -314,6 +316,7 @@ static void printstatus(void); static void powermgrsetmode(struct wl_listener *listener, void *data); static void quit(const Arg *arg); static void rendermon(struct wl_listener *listener, void *data); @@ -52,7 +52,7 @@ index a2711f6..85f4a51 100644 static void requestdecorationmode(struct wl_listener *listener, void *data); static void requeststartdrag(struct wl_listener *listener, void *data); static void requestmonstate(struct wl_listener *listener, void *data); -@@ -340,6 +343,7 @@ static void tagmon(const Arg *arg); +@@ -336,6 +339,7 @@ static void tagmon(const Arg *arg); static void tile(Monitor *m); static void togglefloating(const Arg *arg); static void togglefullscreen(const Arg *arg); @@ -60,17 +60,17 @@ index a2711f6..85f4a51 100644 static void toggletag(const Arg *arg); static void toggleview(const Arg *arg); static void unlocksession(struct wl_listener *listener, void *data); -@@ -413,6 +417,9 @@ static struct wlr_box sgeom; +@@ -406,6 +410,9 @@ static struct wlr_box sgeom; static struct wl_list mons; static Monitor *selmon; +static struct wl_list scratchpad_clients; +static int scratchpad_visible = 1; + - #ifdef XWAYLAND - static void activatex11(struct wl_listener *listener, void *data); - static void associatex11(struct wl_listener *listener, void *data); -@@ -432,6 +439,8 @@ static xcb_atom_t netatom[NetLast]; + /* global event handlers */ + static struct wl_listener cursor_axis = {.notify = axisnotify}; + static struct wl_listener cursor_button = {.notify = buttonpress}; +@@ -455,6 +462,8 @@ static struct wlr_xwayland *xwayland; /* attempt to encapsulate suck into one file */ #include "client.h" @@ -79,7 +79,7 @@ index a2711f6..85f4a51 100644 /* function implementations */ void applybounds(Client *c, struct wlr_box *bbox) -@@ -1259,10 +1268,20 @@ void +@@ -1328,10 +1337,20 @@ void destroynotify(struct wl_listener *listener, void *data) { /* Called when the xdg_toplevel is destroyed. */ @@ -101,7 +101,7 @@ index a2711f6..85f4a51 100644 #ifdef XWAYLAND if (c->type != XDGShell) { wl_list_remove(&c->activate.link); -@@ -2306,11 +2325,21 @@ setcursorshape(struct wl_listener *listener, void *data) +@@ -2333,11 +2352,21 @@ setcursorshape(struct wl_listener *listener, void *data) void setfloating(Client *c, int floating) { @@ -124,17 +124,17 @@ index a2711f6..85f4a51 100644 wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen || (p && p->isfullscreen) ? LyrFS : c->isfloating ? LyrFloat : LyrTile]); -@@ -2534,6 +2563,7 @@ setup(void) +@@ -2554,6 +2583,7 @@ setup(void) */ wl_list_init(&clients); wl_list_init(&fstack); + wl_list_init(&scratchpad_clients); xdg_shell = wlr_xdg_shell_create(dpy, 6); - LISTEN_STATIC(&xdg_shell->events.new_toplevel, createnotify); + wl_signal_add(&xdg_shell->events.new_toplevel, &new_xdg_toplevel); diff --git a/simple_scratchpad.c b/simple_scratchpad.c new file mode 100644 -index 0000000..381f4b5 +index 0000000..26d6b66 --- /dev/null +++ b/simple_scratchpad.c @@ -0,0 +1,68 @@ @@ -207,5 +207,5 @@ index 0000000..381f4b5 + } +} -- -2.45.2 +2.52.0 diff --git a/patches/simple_scratchpad/simple_scratchpad-wlroots-next-f4249db.patch b/patches/simple_scratchpad/simple_scratchpad-wlroots-next-f4249db.patch new file mode 100644 index 0000000..690fa99 --- /dev/null +++ b/patches/simple_scratchpad/simple_scratchpad-wlroots-next-f4249db.patch @@ -0,0 +1,219 @@ +From 94e649317328c7af091516fe3441ea80a814d1e4 Mon Sep 17 00:00:00 2001 +From: A Frederick Christensen +Date: Thu, 26 Feb 2026 17:18:17 -0600 +Subject: [PATCH] Apply simple_scratchpad patch + +--- + config.def.h | 4 ++- + dwl.c | 34 +++++++++++++++++++++-- + simple_scratchpad.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 103 insertions(+), 3 deletions(-) + create mode 100644 simple_scratchpad.c + +diff --git a/config.def.h b/config.def.h +index 8a6eda0..bd6cb40 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -132,6 +132,9 @@ static const Key keys[] = { + { MODKEY, XKB_KEY_Return, zoom, {0} }, + { MODKEY, XKB_KEY_Tab, view, {0} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_c, killclient, {0} }, ++ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_z, addscratchpad, {0} }, ++ { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_z, togglescratchpad, {0} }, ++ { MODKEY, XKB_KEY_z, removescratchpad, {0} }, + { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, + { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, + { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, +@@ -154,7 +157,6 @@ static const Key keys[] = { + TAGKEYS( XKB_KEY_8, XKB_KEY_asterisk, 7), + TAGKEYS( XKB_KEY_9, XKB_KEY_parenleft, 8), + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_q, quit, {0} }, +- + /* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */ + { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} }, + /* Ctrl-Alt-Fx is used to switch to another VT, if you don't know what a VT is +diff --git a/dwl.c b/dwl.c +index 8a9715d..6ae7707 100644 +--- a/dwl.c ++++ b/dwl.c +@@ -141,6 +141,7 @@ typedef struct { + uint32_t tags; + int isfloating, isurgent, isfullscreen; + uint32_t resize; /* configure serial of a pending resize */ ++ struct wl_list link_temp; + } Client; + + typedef struct { +@@ -242,6 +243,7 @@ typedef struct { + } SessionLock; + + /* function declarations */ ++static void addscratchpad(const Arg *arg); + static void applybounds(Client *c, struct wlr_box *bbox); + static void applyrules(Client *c); + static void arrange(Monitor *m); +@@ -316,6 +318,7 @@ static void printstatus(void); + static void powermgrsetmode(struct wl_listener *listener, void *data); + static void quit(const Arg *arg); + static void rendermon(struct wl_listener *listener, void *data); ++static void removescratchpad(const Arg *arg); + static void requestdecorationmode(struct wl_listener *listener, void *data); + static void requeststartdrag(struct wl_listener *listener, void *data); + static void requestmonstate(struct wl_listener *listener, void *data); +@@ -338,6 +341,7 @@ static void tagmon(const Arg *arg); + static void tile(Monitor *m); + static void togglefloating(const Arg *arg); + static void togglefullscreen(const Arg *arg); ++static void togglescratchpad(const Arg *arg); + static void toggletag(const Arg *arg); + static void toggleview(const Arg *arg); + static void unlocksession(struct wl_listener *listener, void *data); +@@ -408,6 +412,9 @@ static struct wlr_box sgeom; + static struct wl_list mons; + static Monitor *selmon; + ++static struct wl_list scratchpad_clients; ++static int scratchpad_visible = 1; ++ + /* global event handlers */ + static struct wl_listener cursor_axis = {.notify = axisnotify}; + static struct wl_listener cursor_button = {.notify = buttonpress}; +@@ -457,6 +464,8 @@ static struct wlr_xwayland *xwayland; + /* attempt to encapsulate suck into one file */ + #include "client.h" + ++#include "simple_scratchpad.c" ++ + /* function implementations */ + void + applybounds(Client *c, struct wlr_box *bbox) +@@ -1330,10 +1339,20 @@ void + destroynotify(struct wl_listener *listener, void *data) + { + /* Called when the xdg_toplevel is destroyed. */ +- Client *c = wl_container_of(listener, c, destroy); ++ Client *sc, *c = wl_container_of(listener, c, destroy); + wl_list_remove(&c->destroy.link); + wl_list_remove(&c->set_title.link); + wl_list_remove(&c->fullscreen.link); ++ /* Check if destroyed client was part of scratchpad_clients ++ * and clean it from the list if so. */ ++ if (c && wl_list_length(&scratchpad_clients) > 0) { ++ wl_list_for_each(sc, &scratchpad_clients, link_temp) { ++ if (sc == c) { ++ wl_list_remove(&c->link_temp); ++ break; ++ } ++ } ++ } + #ifdef XWAYLAND + if (c->type != XDGShell) { + wl_list_remove(&c->activate.link); +@@ -2335,11 +2354,21 @@ setcursorshape(struct wl_listener *listener, void *data) + void + setfloating(Client *c, int floating) + { +- Client *p = client_get_parent(c); ++ Client *sc, *p = client_get_parent(c); + c->isfloating = floating; + /* If in floating layout do not change the client's layer */ + if (!c->mon || !client_surface(c)->mapped || !c->mon->lt[c->mon->sellt]->arrange) + return; ++ /* Check if unfloated client was part of scratchpad_clients ++ * and remove it from scratchpad_clients list if so */ ++ if (!floating && wl_list_length(&scratchpad_clients) > 0) { ++ wl_list_for_each(sc, &scratchpad_clients, link_temp) { ++ if (sc == c) { ++ wl_list_remove(&c->link_temp); ++ break; ++ } ++ } ++ } + wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen || + (p && p->isfullscreen) ? LyrFS + : c->isfloating ? LyrFloat : LyrTile]); +@@ -2557,6 +2586,7 @@ setup(void) + */ + wl_list_init(&clients); + wl_list_init(&fstack); ++ wl_list_init(&scratchpad_clients); + + xdg_shell = wlr_xdg_shell_create(dpy, 6); + wl_signal_add(&xdg_shell->events.new_toplevel, &new_xdg_toplevel); +diff --git a/simple_scratchpad.c b/simple_scratchpad.c +new file mode 100644 +index 0000000..26d6b66 +--- /dev/null ++++ b/simple_scratchpad.c +@@ -0,0 +1,68 @@ ++/* ************************************************************************** */ ++/* */ ++/* ::: :::::::: */ ++/* simple_scratchpad.c :+: :+: :+: */ ++/* +:+ +:+ +:+ */ ++/* By: jmakkone +#+ +:+ +#+ */ ++/* +#+#+#+#+#+ +#+ */ ++/* Created: 2024/12/19 19:35:02 by jmakkone #+# #+# */ ++/* Updated: 2025/01/04 13:35:50 by jmakkone ### ########.fr */ ++/* */ ++/* ************************************************************************** */ ++ ++void ++addscratchpad(const Arg *arg) ++{ ++ Client *cc, *c = focustop(selmon); ++ ++ if (!c) ++ return; ++ /* Check if the added client is already a scratchpad client */ ++ wl_list_for_each(cc, &scratchpad_clients, link_temp) { ++ if (cc == c) ++ return; ++ } ++ if (!c->isfloating) { ++ setfloating(c, 1); ++ } ++ wl_list_insert(&scratchpad_clients, &c->link_temp); ++} ++ ++void ++togglescratchpad(const Arg *arg) ++{ ++ Client *c; ++ Monitor *m = selmon; ++ ++ scratchpad_visible = !scratchpad_visible; ++ if (scratchpad_visible) { ++ wl_list_for_each(c, &scratchpad_clients, link_temp) { ++ c->mon = m; ++ c->tags = m->tagset[m->seltags]; ++ arrange(m); ++ focusclient(c, 1); ++ } ++ } else { ++ wl_list_for_each(c, &scratchpad_clients, link_temp) { ++ c->tags = 0; ++ focusclient(focustop(m), 1); ++ arrange(m); ++ } ++ } ++} ++ ++void ++removescratchpad(const Arg *arg) ++{ ++ Client *sc, *c = focustop(selmon); ++ ++ if (c && wl_list_length(&scratchpad_clients) > 0) { ++ /* Check if c is in scratchpad_clients */ ++ wl_list_for_each(sc, &scratchpad_clients, link_temp) { ++ if (sc == c) { ++ wl_list_remove(&c->link_temp); ++ break; ++ } ++ } ++ } ++} +-- +2.52.0 +