diff --git a/patches/genericgaps/README.md b/patches/genericgaps/README.md index f27897d..c1d0ee3 100644 --- a/patches/genericgaps/README.md +++ b/patches/genericgaps/README.md @@ -15,10 +15,11 @@ gaps to be as big or bigger than "inner" gaps anyway. ### Download -- [0.7 2025-02-11](/dwl/dwl-patches/raw/branch/main/patches/genericgaps/genericgaps-0.7.patch): +- [0.8](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/genericgaps/genericgaps.patch) +- [0.7 2025-02-11](https://codeberg.org/dwl/dwl-patches/raw/commit/58e371fcb31bde1e55f99498a77afd9b567a30c8/patches/genericgaps/genericgaps-0.7.patch): added support for `smartgaps` and `monoclegaps` settings and removed the suck from `arrange()` function -- [0.7](/dwl/dwl-patches/raw/branch/main/patches/genericgaps/genericgaps.patch) +- [0.7](https://codeberg.org/dwl/dwl-patches/raw/commit/f8d1cfad116c19c01593f7436468ec0cb7a3297b/patches/genericgaps/genericgaps.patch) ### Authors diff --git a/patches/genericgaps/genericgaps.patch b/patches/genericgaps/genericgaps.patch index aa62b92..5990890 100644 --- a/patches/genericgaps/genericgaps.patch +++ b/patches/genericgaps/genericgaps.patch @@ -1,23 +1,25 @@ -From f2a1b84369266d252fbea57c6f1eb64253617452 Mon Sep 17 00:00:00 2001 -From: Nikita Ivanov -Date: Thu, 12 Dec 2024 22:44:53 +0100 -Subject: [PATCH] Add genericgaps +From ac0b983fef16eb904b77d6b5e98bd61f5cf719f5 Mon Sep 17 00:00:00 2001 +From: nate zhou +Date: Sat, 28 Feb 2026 23:28:08 +0800 +Subject: [PATCH] Patch: genericgaps-0.8.patch --- - config.def.h | 22 +++++++ - dwl.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++- - 2 files changed, 190 insertions(+), 3 deletions(-) + config.def.h | 23 ++++++ + dwl.c | 198 ++++++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 220 insertions(+), 1 deletion(-) diff --git a/config.def.h b/config.def.h -index 22d2171..930af12 100644 +index 8a6eda0..4adc866 100644 --- a/config.def.h +++ b/config.def.h -@@ -7,6 +7,12 @@ +@@ -6,7 +6,14 @@ + /* appearance */ static const int sloppyfocus = 1; /* focus follows mouse */ static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */ - static const unsigned int borderpx = 1; /* border pixel of windows */ ++static const int enablegaps = 1; /* 1 means gaps are enabled */ +static const int smartgaps = 0; /* 1 means no outer gap when there is only one window */ +static const int monoclegaps = 0; /* 1 means outer gaps in monocle layout */ + static const unsigned int borderpx = 1; /* border pixel of windows */ +static const unsigned int gappih = 10; /* horiz inner gap between windows */ +static const unsigned int gappiv = 10; /* vert inner gap between windows */ +static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */ @@ -25,45 +27,38 @@ index 22d2171..930af12 100644 static const float rootcolor[] = COLOR(0x222222ff); static const float bordercolor[] = COLOR(0x444444ff); static const float focuscolor[] = COLOR(0x005577ff); -@@ -133,6 +139,22 @@ static const Key keys[] = { - { MODKEY, XKB_KEY_d, incnmaster, {.i = -1} }, - { MODKEY, XKB_KEY_h, setmfact, {.f = -0.05f} }, - { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} }, -+ { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_h, incgaps, {.i = +1 } }, -+ { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_l, incgaps, {.i = -1 } }, -+ { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_SHIFT, XKB_KEY_H, incogaps, {.i = +1 } }, -+ { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_SHIFT, XKB_KEY_L, incogaps, {.i = -1 } }, -+ { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_CTRL, XKB_KEY_h, incigaps, {.i = +1 } }, -+ { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_CTRL, XKB_KEY_l, incigaps, {.i = -1 } }, -+ { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_0, togglegaps, {0} }, -+ { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_SHIFT, XKB_KEY_parenright,defaultgaps, {0} }, -+ { MODKEY, XKB_KEY_y, incihgaps, {.i = +1 } }, -+ { MODKEY, XKB_KEY_o, incihgaps, {.i = -1 } }, -+ { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_y, incivgaps, {.i = +1 } }, -+ { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_o, incivgaps, {.i = -1 } }, -+ { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_y, incohgaps, {.i = +1 } }, -+ { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_o, incohgaps, {.i = -1 } }, -+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Y, incovgaps, {.i = +1 } }, -+ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_O, incovgaps, {.i = -1 } }, - { MODKEY, XKB_KEY_Return, zoom, {0} }, - { MODKEY, XKB_KEY_Tab, view, {0} }, - { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C, killclient, {0} }, +@@ -129,6 +136,22 @@ static const Key keys[] = { + { MODKEY, XKB_KEY_d, incnmaster, {.i = -1} }, + { MODKEY, XKB_KEY_h, setmfact, {.f = -0.05f} }, + { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} }, ++ { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_h, incgaps, {.i = +1 } }, ++ { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_l, incgaps, {.i = -1 } }, ++ { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_SHIFT, XKB_KEY_H, incogaps, {.i = +1 } }, ++ { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_SHIFT, XKB_KEY_L, incogaps, {.i = -1 } }, ++ { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_CTRL, XKB_KEY_h, incigaps, {.i = +1 } }, ++ { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_CTRL, XKB_KEY_l, incigaps, {.i = -1 } }, ++ { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_0, togglegaps, {0} }, ++ { MODKEY|WLR_MODIFIER_LOGO|WLR_MODIFIER_SHIFT, XKB_KEY_parenright,defaultgaps, {0} }, ++ { MODKEY, XKB_KEY_y, incihgaps, {.i = +1 } }, ++ { MODKEY, XKB_KEY_o, incihgaps, {.i = -1 } }, ++ { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_y, incivgaps, {.i = +1 } }, ++ { MODKEY|WLR_MODIFIER_CTRL, XKB_KEY_o, incivgaps, {.i = -1 } }, ++ { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_y, incohgaps, {.i = +1 } }, ++ { MODKEY|WLR_MODIFIER_LOGO, XKB_KEY_o, incohgaps, {.i = -1 } }, ++ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Y, incovgaps, {.i = +1 } }, ++ { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_O, incovgaps, {.i = -1 } }, + { MODKEY, XKB_KEY_Return, zoom, {0} }, + { MODKEY, XKB_KEY_Tab, view, {0} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_c, killclient, {0} }, diff --git a/dwl.c b/dwl.c -index def2562..c14ae43 100644 +index 44f3ad9..a3164cb 100644 --- a/dwl.c +++ b/dwl.c -@@ -107,6 +107,7 @@ typedef struct Monitor Monitor; - typedef struct { - /* Must keep these three elements in this order */ - unsigned int type; /* XDGShell or X11* */ -+ int interact; - struct wlr_box geom; /* layout-relative, includes border */ - Monitor *mon; - struct wlr_scene_tree *scene; -@@ -200,6 +201,10 @@ struct Monitor { +@@ -197,6 +197,11 @@ struct Monitor { struct wlr_box w; /* window area, layout-relative */ struct wl_list layers[4]; /* LayerSurface.link */ const Layout *lt[2]; ++ int enablegaps; /* enable gaps, used by togglegaps */ + int gappih; /* horizontal gap between windows */ + int gappiv; /* vertical gap between windows */ + int gappoh; /* horizontal outer gaps */ @@ -71,7 +66,15 @@ index def2562..c14ae43 100644 unsigned int seltags; unsigned int sellt; uint32_t tagset[2]; -@@ -273,6 +278,7 @@ static void createpopup(struct wl_listener *listener, void *data); +@@ -243,6 +248,7 @@ typedef struct { + static void applybounds(Client *c, struct wlr_box *bbox); + static void applyrules(Client *c); + static void arrange(Monitor *m); ++void arrangegaps(Monitor *m); + static void arrangelayer(Monitor *m, struct wl_list *list, + struct wlr_box *usable_area, int exclusive); + static void arrangelayers(Monitor *m); +@@ -271,6 +277,7 @@ static void createpopup(struct wl_listener *listener, void *data); static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint); static void cursorframe(struct wl_listener *listener, void *data); static void cursorwarptohint(void); @@ -79,7 +82,7 @@ index def2562..c14ae43 100644 static void destroydecoration(struct wl_listener *listener, void *data); static void destroydragicon(struct wl_listener *listener, void *data); static void destroyidleinhibitor(struct wl_listener *listener, void *data); -@@ -293,6 +299,13 @@ static void fullscreennotify(struct wl_listener *listener, void *data); +@@ -290,6 +297,13 @@ static void fullscreennotify(struct wl_listener *listener, void *data); static void gpureset(struct wl_listener *listener, void *data); static void handlesig(int signo); static void incnmaster(const Arg *arg); @@ -93,24 +96,23 @@ index def2562..c14ae43 100644 static void inputdevice(struct wl_listener *listener, void *data); static int keybinding(uint32_t mods, xkb_keysym_t sym); static void keypress(struct wl_listener *listener, void *data); -@@ -320,13 +333,15 @@ static void rendermon(struct wl_listener *listener, void *data); - 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); --static void resize(Client *c, struct wlr_box geo, int interact); -+static void resizeapply(Client *c, struct wlr_box geo, int interact); -+static void resizenoapply(Client *c, struct wlr_box geo, int interact); - static void run(char *startup_cmd); - static void setcursor(struct wl_listener *listener, void *data); +@@ -310,6 +324,7 @@ static void outputmgrapplyortest(struct wlr_output_configuration_v1 *config, int + static void outputmgrtest(struct wl_listener *listener, void *data); + static void pointerfocus(Client *c, struct wlr_surface *surface, + double sx, double sy, uint32_t time); ++static void preparegaps(Monitor *m); + static void printstatus(void); + static void powermgrsetmode(struct wl_listener *listener, void *data); + static void quit(const Arg *arg); +@@ -323,6 +338,7 @@ static void setcursor(struct wl_listener *listener, void *data); static void setcursorshape(struct wl_listener *listener, void *data); static void setfloating(Client *c, int floating); static void setfullscreen(Client *c, int fullscreen); - static void setgamma(struct wl_listener *listener, void *data); +static void setgaps(int oh, int ov, int ih, int iv); static void setlayout(const Arg *arg); static void setmfact(const Arg *arg); static void setmon(Client *c, Monitor *m, uint32_t newtags); -@@ -340,6 +355,7 @@ static void tagmon(const Arg *arg); +@@ -336,6 +352,7 @@ static void tagmon(const Arg *arg); static void tile(Monitor *m); static void togglefloating(const Arg *arg); static void togglefullscreen(const Arg *arg); @@ -118,83 +120,82 @@ index def2562..c14ae43 100644 static void toggletag(const Arg *arg); static void toggleview(const Arg *arg); static void unlocksession(struct wl_listener *listener, void *data); -@@ -413,6 +429,9 @@ static struct wlr_box sgeom; - static struct wl_list mons; - static Monitor *selmon; +@@ -435,6 +452,7 @@ static struct wl_listener request_set_cursor_shape = {.notify = setcursorshape}; + static struct wl_listener request_start_drag = {.notify = requeststartdrag}; + static struct wl_listener start_drag = {.notify = startdrag}; + static struct wl_listener new_session_lock = {.notify = locksession}; ++static int resizelock = 0; /* do not actually resize during arrange */ -+static int enablegaps = 1; /* enables gaps, used by togglegaps */ -+static void (*resize)(Client *c, struct wlr_box geo, int interact) = resizeapply; -+ #ifdef XWAYLAND static void activatex11(struct wl_listener *listener, void *data); - static void associatex11(struct wl_listener *listener, void *data); -@@ -481,9 +500,25 @@ applyrules(Client *c) - setmon(c, mon, newtags); - } - -+void -+applygaps(Client *c) -+{ -+ struct wlr_box geom = c->geom; -+ -+ if (!c->mon) -+ return; -+ -+ geom.x += c->mon->gappih + c->mon->gappoh; -+ geom.y += c->mon->gappiv + c->mon->gappov; -+ geom.width -= c->mon->gappih; -+ geom.height -= c->mon->gappiv; -+ resize(c, geom, 0); -+} -+ - void - arrange(Monitor *m) - { -+ int save_width, save_height; - Client *c; - - if (!m->wlr_output->enabled) -@@ -515,8 +550,26 @@ arrange(Monitor *m) +@@ -537,12 +555,52 @@ arrange(Monitor *m) : c->scene->node.parent); } - if (m->lt[m->sellt]->arrange) + if (m->lt[m->sellt]->arrange) { -+ save_width = m->w.width; -+ save_height = m->w.height; -+ if (enablegaps) { -+ m->w.width -= m->gappih + 2 * m->gappoh; -+ m->w.height -= m->gappiv + 2 * m->gappov; -+ } -+ resize = resizenoapply; ++ preparegaps(m); m->lt[m->sellt]->arrange(m); -+ wl_list_for_each(c, &clients, link) { -+ if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen) -+ continue; -+ if (enablegaps) -+ applygaps(c); -+ resizeapply(c, c->geom, c->interact); -+ } -+ m->w.width = save_width; -+ m->w.height = save_height; -+ resize = resizeapply; ++ arrangegaps(m); + } motionnotify(0, NULL, 0, 0, 0, 0); checkidleinhibitor(NULL); } -@@ -993,6 +1046,11 @@ createmon(struct wl_listener *listener, void *data) - wlr_output_state_init(&state); - /* Initialize monitor state using configured rules */ ++void ++arrangegaps(Monitor *m) ++{ ++ Client *c; ++ int n, gaps; + ++ if (!m->enablegaps) ++ return; ++ ++ resizelock = 0; ++ ++ n = 0; ++ wl_list_for_each(c, &clients, link) { ++ if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen) ++ continue; ++ n++; ++ } ++ ++ gaps = !(smartgaps && n == 1) && ++ (monoclegaps || m->lt[m->sellt]->arrange != monocle); ++ if (gaps) { ++ m->w.width += m->gappih + 2 * m->gappoh; ++ m->w.height += m->gappiv + 2 * m->gappov; ++ } ++ wl_list_for_each(c, &clients, link) { ++ if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen) ++ continue; ++ if (gaps) { ++ c->geom.x += c->mon->gappih + c->mon->gappoh; ++ c->geom.y += c->mon->gappiv + c->mon->gappov; ++ c->geom.width -= c->mon->gappih; ++ c->geom.height -= c->mon->gappiv; ++ } ++ resize(c, c->geom, 0); ++ } ++} ++ + void + arrangelayer(Monitor *m, struct wl_list *list, struct wlr_box *usable_area, int exclusive) + { +@@ -1055,6 +1113,12 @@ createmon(struct wl_listener *listener, void *data) + for (i = 0; i < LENGTH(m->layers); i++) + wl_list_init(&m->layers[i]); + ++ m->enablegaps = enablegaps; + m->gappih = gappih; + m->gappiv = gappiv; + m->gappoh = gappoh; + m->gappov = gappov; ++ + wlr_output_state_init(&state); + /* Initialize monitor state using configured rules */ m->tagset[0] = m->tagset[1] = 1; - for (r = monrules; r < END(monrules); r++) { - if (!r->name || strstr(wlr_output->name, r->name)) { -@@ -1173,6 +1231,12 @@ cursorwarptohint(void) +@@ -1237,6 +1301,12 @@ cursorwarptohint(void) } } @@ -207,7 +208,7 @@ index def2562..c14ae43 100644 void destroydecoration(struct wl_listener *listener, void *data) { -@@ -1526,6 +1590,83 @@ incnmaster(const Arg *arg) +@@ -1575,6 +1645,83 @@ incnmaster(const Arg *arg) arrange(selmon); } @@ -291,31 +292,52 @@ index def2562..c14ae43 100644 void inputdevice(struct wl_listener *listener, void *data) { -@@ -2180,7 +2321,7 @@ requestmonstate(struct wl_listener *listener, void *data) - } - - void --resize(Client *c, struct wlr_box geo, int interact) -+resizeapply(Client *c, struct wlr_box geo, int interact) - { - struct wlr_box *bbox; - struct wlr_box clip; -@@ -2212,6 +2353,13 @@ resize(Client *c, struct wlr_box geo, int interact) - wlr_scene_subsurface_tree_set_clip(&c->scene_surface->node, &clip); +@@ -2085,6 +2232,31 @@ pointerfocus(Client *c, struct wlr_surface *surface, double sx, double sy, + wlr_seat_pointer_notify_motion(seat, time, sx, sy); } +void -+resizenoapply(Client *c, struct wlr_box geo, int interact) ++preparegaps(Monitor *m) +{ -+ c->geom = geo; -+ c->interact = interact; ++ Client *c; ++ int n; ++ ++ if (!m->enablegaps) ++ return; ++ ++ n = 0; ++ wl_list_for_each(c, &clients, link) { ++ if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen) ++ continue; ++ n++; ++ } ++ ++ resizelock = 1; ++ ++ if ((smartgaps && n == 1) || (!monoclegaps && m->lt[m->sellt]->arrange == monocle)) ++ return; ++ ++ m->w.width -= m->gappih + 2 * m->gappoh; ++ m->w.height -= m->gappiv + 2 * m->gappov; +} + void - run(char *startup_cmd) + printstatus(void) { -@@ -2354,6 +2502,16 @@ setgamma(struct wl_listener *listener, void *data) - wlr_output_schedule_frame(m->wlr_output); +@@ -2208,6 +2380,11 @@ resize(Client *c, struct wlr_box geo, int interact) + struct wlr_box *bbox; + struct wlr_box clip; + ++ if (resizelock) { ++ c->geom = geo; ++ return; ++ } ++ + if (!c->mon || !client_surface(c)->mapped) + return; + +@@ -2368,6 +2545,16 @@ setfullscreen(Client *c, int fullscreen) + printstatus(); } +void @@ -331,14 +353,16 @@ index def2562..c14ae43 100644 void setlayout(const Arg *arg) { -@@ -2741,6 +2899,13 @@ togglefullscreen(const Arg *arg) +@@ -2760,6 +2947,15 @@ togglefullscreen(const Arg *arg) setfullscreen(sel, !sel->isfullscreen); } +void +togglegaps(const Arg *arg) +{ -+ enablegaps = !enablegaps; ++ if (!selmon) ++ return; ++ selmon->enablegaps = !selmon->enablegaps; + arrange(selmon); +} + @@ -346,5 +370,5 @@ index def2562..c14ae43 100644 toggletag(const Arg *arg) { -- -2.47.1 +2.53.0