mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2025-09-08 12:14:50 +00:00
351 lines
11 KiB
Diff
351 lines
11 KiB
Diff
From f2a1b84369266d252fbea57c6f1eb64253617452 Mon Sep 17 00:00:00 2001
|
|
From: Nikita Ivanov <nikita.vyach.ivanov@gmail.com>
|
|
Date: Thu, 12 Dec 2024 22:44:53 +0100
|
|
Subject: [PATCH] Add genericgaps
|
|
|
|
---
|
|
config.def.h | 22 +++++++
|
|
dwl.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++-
|
|
2 files changed, 190 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/config.def.h b/config.def.h
|
|
index 22d2171..930af12 100644
|
|
--- a/config.def.h
|
|
+++ b/config.def.h
|
|
@@ -7,6 +7,12 @@
|
|
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 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 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 */
|
|
+static const unsigned int gappov = 10; /* vert outer gap between windows and screen edge */
|
|
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} },
|
|
diff --git a/dwl.c b/dwl.c
|
|
index def2562..c14ae43 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 {
|
|
struct wlr_box w; /* window area, layout-relative */
|
|
struct wl_list layers[4]; /* LayerSurface.link */
|
|
const Layout *lt[2];
|
|
+ int gappih; /* horizontal gap between windows */
|
|
+ int gappiv; /* vertical gap between windows */
|
|
+ int gappoh; /* horizontal outer gaps */
|
|
+ int gappov; /* vertical outer gaps */
|
|
unsigned int seltags;
|
|
unsigned int sellt;
|
|
uint32_t tagset[2];
|
|
@@ -273,6 +278,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);
|
|
+static void defaultgaps(const Arg *arg);
|
|
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);
|
|
static void gpureset(struct wl_listener *listener, void *data);
|
|
static void handlesig(int signo);
|
|
static void incnmaster(const Arg *arg);
|
|
+static void incgaps(const Arg *arg);
|
|
+static void incigaps(const Arg *arg);
|
|
+static void incihgaps(const Arg *arg);
|
|
+static void incivgaps(const Arg *arg);
|
|
+static void incogaps(const Arg *arg);
|
|
+static void incohgaps(const Arg *arg);
|
|
+static void incovgaps(const Arg *arg);
|
|
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);
|
|
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);
|
|
static void tile(Monitor *m);
|
|
static void togglefloating(const Arg *arg);
|
|
static void togglefullscreen(const Arg *arg);
|
|
+static void togglegaps(const Arg *arg);
|
|
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;
|
|
|
|
+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)
|
|
: 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;
|
|
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;
|
|
+ }
|
|
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 */
|
|
+
|
|
+ m->gappih = gappih;
|
|
+ m->gappiv = gappiv;
|
|
+ m->gappoh = gappoh;
|
|
+ m->gappov = gappov;
|
|
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)
|
|
}
|
|
}
|
|
|
|
+void
|
|
+defaultgaps(const Arg *arg)
|
|
+{
|
|
+ setgaps(gappoh, gappov, gappih, gappiv);
|
|
+}
|
|
+
|
|
void
|
|
destroydecoration(struct wl_listener *listener, void *data)
|
|
{
|
|
@@ -1526,6 +1590,83 @@ incnmaster(const Arg *arg)
|
|
arrange(selmon);
|
|
}
|
|
|
|
+void
|
|
+incgaps(const Arg *arg)
|
|
+{
|
|
+ setgaps(
|
|
+ selmon->gappoh + arg->i,
|
|
+ selmon->gappov + arg->i,
|
|
+ selmon->gappih + arg->i,
|
|
+ selmon->gappiv + arg->i
|
|
+ );
|
|
+}
|
|
+
|
|
+void
|
|
+incigaps(const Arg *arg)
|
|
+{
|
|
+ setgaps(
|
|
+ selmon->gappoh,
|
|
+ selmon->gappov,
|
|
+ selmon->gappih + arg->i,
|
|
+ selmon->gappiv + arg->i
|
|
+ );
|
|
+}
|
|
+
|
|
+void
|
|
+incihgaps(const Arg *arg)
|
|
+{
|
|
+ setgaps(
|
|
+ selmon->gappoh,
|
|
+ selmon->gappov,
|
|
+ selmon->gappih + arg->i,
|
|
+ selmon->gappiv
|
|
+ );
|
|
+}
|
|
+
|
|
+void
|
|
+incivgaps(const Arg *arg)
|
|
+{
|
|
+ setgaps(
|
|
+ selmon->gappoh,
|
|
+ selmon->gappov,
|
|
+ selmon->gappih,
|
|
+ selmon->gappiv + arg->i
|
|
+ );
|
|
+}
|
|
+
|
|
+void
|
|
+incogaps(const Arg *arg)
|
|
+{
|
|
+ setgaps(
|
|
+ selmon->gappoh + arg->i,
|
|
+ selmon->gappov + arg->i,
|
|
+ selmon->gappih,
|
|
+ selmon->gappiv
|
|
+ );
|
|
+}
|
|
+
|
|
+void
|
|
+incohgaps(const Arg *arg)
|
|
+{
|
|
+ setgaps(
|
|
+ selmon->gappoh + arg->i,
|
|
+ selmon->gappov,
|
|
+ selmon->gappih,
|
|
+ selmon->gappiv
|
|
+ );
|
|
+}
|
|
+
|
|
+void
|
|
+incovgaps(const Arg *arg)
|
|
+{
|
|
+ setgaps(
|
|
+ selmon->gappoh,
|
|
+ selmon->gappov + arg->i,
|
|
+ selmon->gappih,
|
|
+ selmon->gappiv
|
|
+ );
|
|
+}
|
|
+
|
|
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);
|
|
}
|
|
|
|
+void
|
|
+resizenoapply(Client *c, struct wlr_box geo, int interact)
|
|
+{
|
|
+ c->geom = geo;
|
|
+ c->interact = interact;
|
|
+}
|
|
+
|
|
void
|
|
run(char *startup_cmd)
|
|
{
|
|
@@ -2354,6 +2502,16 @@ setgamma(struct wl_listener *listener, void *data)
|
|
wlr_output_schedule_frame(m->wlr_output);
|
|
}
|
|
|
|
+void
|
|
+setgaps(int oh, int ov, int ih, int iv)
|
|
+{
|
|
+ selmon->gappoh = MAX(oh, 0);
|
|
+ selmon->gappov = MAX(ov, 0);
|
|
+ selmon->gappih = MAX(ih, 0);
|
|
+ selmon->gappiv = MAX(iv, 0);
|
|
+ arrange(selmon);
|
|
+}
|
|
+
|
|
void
|
|
setlayout(const Arg *arg)
|
|
{
|
|
@@ -2741,6 +2899,13 @@ togglefullscreen(const Arg *arg)
|
|
setfullscreen(sel, !sel->isfullscreen);
|
|
}
|
|
|
|
+void
|
|
+togglegaps(const Arg *arg)
|
|
+{
|
|
+ enablegaps = !enablegaps;
|
|
+ arrange(selmon);
|
|
+}
|
|
+
|
|
void
|
|
toggletag(const Arg *arg)
|
|
{
|
|
--
|
|
2.47.1
|
|
|