commit ea8cdba402dbed7aae9f87682e6064860ba0b7ad
parent 07f0fdd5803a41651e615fb83b7f884c18d23815
Author: Cori Barker <coribarker2@gmail.com>
Date: Sun, 8 Feb 2026 15:17:38 +0000
Patches to dwm
Diffstat:
5 files changed, 141 insertions(+), 35 deletions(-)
diff --git a/dwm/config.def.h.orig b/dwm/config.def.h.orig
@@ -2,7 +2,6 @@
/* appearance */
static const unsigned int borderpx = 1; /* border pixel of windows */
-static const unsigned int gappx = 6; /* gaps between windows */
static const unsigned int snap = 32; /* snap pixel */
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
@@ -35,7 +34,7 @@ static const Rule rules[] = {
/* layout(s) */
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
static const int nmaster = 1; /* number of clients in master area */
-static const int resizehints = 0; /* 1 means respect size hints in tiled resizals */
+static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
static const int refreshrate = 120; /* refresh rate (per second) for client move/resize */
@@ -79,6 +78,7 @@ static const Key keys[] = {
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
+ { MODKEY|ShiftMask, XK_f, fullscreen, {0} },
{ MODKEY, XK_space, setlayout, {0} },
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
{ MODKEY, XK_0, view, {.ui = ~0 } },
diff --git a/dwm/config.h b/dwm/config.h
@@ -28,8 +28,8 @@ static const Rule rules[] = {
* WM_CLASS(STRING) = instance, class
* WM_NAME(STRING) = title
*/
- /* class instance title tags mask isfloating monitor */
- { },
+ /* class instance title tags mask isfloating monitor */
+ {},
};
/* layout(s) */
diff --git a/dwm/dwm-fullscreen-20260112-f4fdaff.diff b/dwm/dwm-fullscreen-20260112-f4fdaff.diff
@@ -0,0 +1,60 @@
+From f4fdaff5cf85287ad11272902054cdbaf44535fe Mon Sep 17 00:00:00 2001
+From: Savar <savar95x@gmail.com>
+Date: Mon, 12 Jan 2026 17:26:41 +0530
+Subject: [PATCH] fullscreen: fix toggle logic loop by checking active layout
+
+---
+ config.def.h | 1 +
+ dwm.c | 17 +++++++++++++++++
+ 2 files changed, 18 insertions(+)
+
+diff --git a/config.def.h b/config.def.h
+index 81c3fc0..ef36491 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -78,6 +78,7 @@ static const Key keys[] = {
+ { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
+ { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
+ { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
++ { MODKEY|ShiftMask, XK_f, fullscreen, {0} },
+ { MODKEY, XK_space, setlayout, {0} },
+ { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
+ { MODKEY, XK_0, view, {.ui = ~0 } },
+diff --git a/dwm.c b/dwm.c
+index 8f4fa75..a2237a9 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -199,6 +199,7 @@ static void sendmon(Client *c, Monitor *m);
+ static void setclientstate(Client *c, long state);
+ static void setfocus(Client *c);
+ static void setfullscreen(Client *c, int fullscreen);
++static void fullscreen(const Arg *arg);
+ static void setlayout(const Arg *arg);
+ static void setmfact(const Arg *arg);
+ static void setup(void);
+@@ -1507,6 +1508,22 @@ setfullscreen(Client *c, int fullscreen)
+ }
+ }
+
++Layout *last_layout;
++void
++fullscreen(const Arg *arg)
++{
++ if (selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] != &layouts[2]) {
++ for(last_layout = (Layout *)layouts; last_layout != selmon->lt[selmon->sellt]; last_layout++);
++ setlayout(&((Arg) { .v = &layouts[2] }));
++ if (selmon->showbar)
++ togglebar(arg);
++ } else {
++ setlayout(&((Arg) { .v = last_layout }));
++ if (!selmon->showbar)
++ togglebar(arg);
++ }
++}
++
+ void
+ setlayout(const Arg *arg)
+ {
+--
+2.51.2
+
diff --git a/dwm/dwm-fullscreen-6.2.diff b/dwm/dwm-fullscreen-6.2.diff
@@ -0,0 +1,56 @@
+From 54719285bd1a984e2efce6e8a8eab184fec11abf Mon Sep 17 00:00:00 2001
+From: Sermak <sermak@jarvis.com>
+Date: Mon, 8 Jul 2019 01:06:44 +0200
+Subject: [PATCH] Simulate toggleable fullscreen mode
+
+---
+ config.def.h | 1 +
+ dwm.c | 14 ++++++++++++++
+ 2 files changed, 15 insertions(+)
+
+diff --git a/config.def.h b/config.def.h
+index 1c0b587..f774cc5 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -76,6 +76,7 @@ static Key keys[] = {
+ { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
+ { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
+ { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
++ { MODKEY|ShiftMask, XK_f, fullscreen, {0} },
+ { MODKEY, XK_space, setlayout, {0} },
+ { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
+ { MODKEY, XK_0, view, {.ui = ~0 } },
+diff --git a/dwm.c b/dwm.c
+index 4465af1..04b1e06 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -199,6 +199,7 @@ static void sendmon(Client *c, Monitor *m);
+ static void setclientstate(Client *c, long state);
+ static void setfocus(Client *c);
+ static void setfullscreen(Client *c, int fullscreen);
++static void fullscreen(const Arg *arg);
+ static void setlayout(const Arg *arg);
+ static void setmfact(const Arg *arg);
+ static void setup(void);
+@@ -1497,6 +1498,19 @@ setfullscreen(Client *c, int fullscreen)
+ }
+ }
+
++Layout *last_layout;
++void
++fullscreen(const Arg *arg)
++{
++ if (selmon->showbar) {
++ for(last_layout = (Layout *)layouts; last_layout != selmon->lt[selmon->sellt]; last_layout++);
++ setlayout(&((Arg) { .v = &layouts[2] }));
++ } else {
++ setlayout(&((Arg) { .v = last_layout }));
++ }
++ togglebar(arg);
++}
++
+ void
+ setlayout(const Arg *arg)
+ {
+--
+2.22.0
diff --git a/dwm/dwm.c.orig b/dwm/dwm.c.orig
@@ -52,8 +52,8 @@
* MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
#define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]))
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
-#define WIDTH(X) ((X)->w + 2 * (X)->bw + gappx)
-#define HEIGHT(X) ((X)->h + 2 * (X)->bw + gappx)
+#define WIDTH(X) ((X)->w + 2 * (X)->bw)
+#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
#define TAGMASK ((1 << LENGTH(tags)) - 1)
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
@@ -201,6 +201,7 @@ static void sendmon(Client *c, Monitor *m);
static void setclientstate(Client *c, long state);
static void setfocus(Client *c);
static void setfullscreen(Client *c, int fullscreen);
+static void fullscreen(const Arg *arg);
static void setlayout(const Arg *arg);
static void setmfact(const Arg *arg);
static void setup(void);
@@ -1302,36 +1303,12 @@ void
resizeclient(Client *c, int x, int y, int w, int h)
{
XWindowChanges wc;
- unsigned int n;
- unsigned int gapoffset;
- unsigned int gapincr;
- Client *nbc;
+ c->oldx = c->x; c->x = wc.x = x;
+ c->oldy = c->y; c->y = wc.y = y;
+ c->oldw = c->w; c->w = wc.width = w;
+ c->oldh = c->h; c->h = wc.height = h;
wc.border_width = c->bw;
-
- /* Get number of clients for the client's monitor */
- for (n = 0, nbc = nexttiled(c->mon->clients); nbc; nbc = nexttiled(nbc->next), n++);
-
- /* Do nothing if layout is floating */
- if (c->isfloating || c->mon->lt[c->mon->sellt]->arrange == NULL) {
- gapincr = gapoffset = 0;
- } else {
- /* Remove border and gap if layout is monocle or only one client */
- if (c->mon->lt[c->mon->sellt]->arrange == monocle || n == 1) {
- gapoffset = 0;
- gapincr = -2 * borderpx;
- wc.border_width = 0;
- } else {
- gapoffset = gappx;
- gapincr = 2 * gappx;
- }
- }
-
- c->oldx = c->x; c->x = wc.x = x + gapoffset;
- c->oldy = c->y; c->y = wc.y = y + gapoffset;
- c->oldw = c->w; c->w = wc.width = w - gapincr;
- c->oldh = c->h; c->h = wc.height = h - gapincr;
-
XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
configure(c);
XSync(dpy, False);
@@ -1547,6 +1524,19 @@ setfullscreen(Client *c, int fullscreen)
}
}
+Layout *last_layout;
+void
+fullscreen(const Arg *arg)
+{
+ if (selmon->showbar) {
+ for(last_layout = (Layout *)layouts; last_layout != selmon->lt[selmon->sellt]; last_layout++);
+ setlayout(&((Arg) { .v = &layouts[2] }));
+ } else {
+ setlayout(&((Arg) { .v = last_layout }));
+ }
+ togglebar(arg);
+}
+
void
setlayout(const Arg *arg)
{
@@ -1741,7 +1731,7 @@ tile(Monitor *m)
for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
if (i < m->nmaster) {
h = (m->wh - my) / (MIN(n, m->nmaster) - i);
- resize(c, m->wx, m->wy + my, mw - (2*c->bw) + (n > 1 ? gappx : 0), h - (2*c->bw), 0);
+ resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
if (my + HEIGHT(c) < m->wh)
my += HEIGHT(c);
} else {
