diff --git a/patches/singlemaster/README.md b/patches/singlemaster/README.md index 46756a3..99cb1e6 100644 --- a/patches/singlemaster/README.md +++ b/patches/singlemaster/README.md @@ -3,7 +3,7 @@ Restricts layout to only having one client in the master area. ### Download - [git branch](https://codeberg.org/bencc/dwl/src/branch/singlemaster) -- [2023-01-06](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/singlemaster/singlemaster.patch) +- [v0.6](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/singlemaster/singlemaster.patch) ### Authors -- [Ben Collerson](https://codeberg.org/bencc) \ No newline at end of file +- [Ben Collerson](https://codeberg.org/bencc) diff --git a/patches/singlemaster/singlemaster.patch b/patches/singlemaster/singlemaster.patch index 174d5eb..ffa6045 100644 --- a/patches/singlemaster/singlemaster.patch +++ b/patches/singlemaster/singlemaster.patch @@ -1,19 +1,19 @@ -From bd10c646153c7a337b89c88c9572148c59e456ef Mon Sep 17 00:00:00 2001 +From 610362d2f38260ad2a06ffbd91d089ba738429e9 Mon Sep 17 00:00:00 2001 From: Ben Collerson -Date: Sat, 30 Dec 2023 13:39:31 +1000 +Date: Thu, 18 Jul 2024 11:03:46 +1000 Subject: [PATCH] singlemaster --- config.def.h | 8 +++----- - dwl.c | 50 ++++++++++++++++++++++++-------------------------- - 2 files changed, 27 insertions(+), 31 deletions(-) + dwl.c | 49 ++++++++++++++++++++++--------------------------- + 2 files changed, 25 insertions(+), 32 deletions(-) diff --git a/config.def.h b/config.def.h -index a784eb4f..6f09c212 100644 +index 22d2171d..0ba9ddb8 100644 --- a/config.def.h +++ b/config.def.h -@@ -40,12 +40,12 @@ static const Layout layouts[] = { - /* WARNING: negative values other than (-1, -1) cause problems with xwayland clients' menus */ +@@ -43,12 +43,12 @@ static const Layout layouts[] = { + */ /* NOTE: ALWAYS add a fallback rule, even if you are completely sure it won't be used */ static const MonitorRule monrules[] = { - /* name mfact nmaster scale layout rotate/reflect x y */ @@ -28,7 +28,7 @@ index a784eb4f..6f09c212 100644 }; /* keyboard */ -@@ -126,8 +126,6 @@ static const Key keys[] = { +@@ -129,8 +129,6 @@ static const Key keys[] = { { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Return, spawn, {.v = termcmd} }, { MODKEY, XKB_KEY_j, focusstack, {.i = +1} }, { MODKEY, XKB_KEY_k, focusstack, {.i = -1} }, @@ -38,25 +38,26 @@ index a784eb4f..6f09c212 100644 { MODKEY, XKB_KEY_l, setmfact, {.f = +0.05f} }, { MODKEY, XKB_KEY_Return, zoom, {0} }, diff --git a/dwl.c b/dwl.c -index 6f041a0d..3f8789da 100644 +index 145fd018..6a3c84a7 100644 --- a/dwl.c +++ b/dwl.c -@@ -68,7 +68,6 @@ +@@ -70,7 +70,6 @@ /* macros */ #define MAX(A, B) ((A) > (B) ? (A) : (B)) -#define MIN(A, B) ((A) < (B) ? (A) : (B)) - #define ROUND(X) ((int)((X < 0) ? (X - 0.5) : (X + 0.5))) #define CLEANMASK(mask) (mask & ~WLR_MODIFIER_CAPS) #define VISIBLEON(C, M) ((M) && (C)->mon == (M) && ((C)->tags & (M)->tagset[(M)->seltags])) -@@ -204,14 +203,12 @@ struct Monitor { + #define LENGTH(X) (sizeof X / sizeof X[0]) +@@ -204,7 +203,6 @@ struct Monitor { uint32_t tagset[2]; float mfact; int gamma_lut_changed; - int nmaster; char ltsymbol[16]; + int asleep; }; - +@@ -212,7 +210,6 @@ struct Monitor { typedef struct { const char *name; float mfact; @@ -64,7 +65,7 @@ index 6f041a0d..3f8789da 100644 float scale; const Layout *lt; enum wl_output_transform rr; -@@ -287,7 +284,6 @@ static void focusstack(const Arg *arg); +@@ -288,7 +285,6 @@ static void focusstack(const Arg *arg); static Client *focustop(Monitor *m); static void fullscreennotify(struct wl_listener *listener, void *data); static void handlesig(int signo); @@ -72,7 +73,7 @@ index 6f041a0d..3f8789da 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); -@@ -938,7 +934,6 @@ createmon(struct wl_listener *listener, void *data) +@@ -955,7 +951,6 @@ createmon(struct wl_listener *listener, void *data) m->m.x = r->x; m->m.y = r->y; m->mfact = r->mfact; @@ -80,7 +81,7 @@ index 6f041a0d..3f8789da 100644 m->lt[0] = r->lt; m->lt[1] = &layouts[LENGTH(layouts) > 1 && r->lt != &layouts[1]]; strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, LENGTH(m->ltsymbol)); -@@ -1451,15 +1446,6 @@ handlesig(int signo) +@@ -1467,15 +1462,6 @@ handlesig(int signo) } } @@ -96,7 +97,7 @@ index 6f041a0d..3f8789da 100644 void inputdevice(struct wl_listener *listener, void *data) { -@@ -2589,8 +2575,7 @@ tagmon(const Arg *arg) +@@ -2635,8 +2621,7 @@ tagmon(const Arg *arg) void tile(Monitor *m) { @@ -106,18 +107,16 @@ index 6f041a0d..3f8789da 100644 Client *c; wl_list_for_each(c, &clients, link) -@@ -2599,21 +2584,34 @@ tile(Monitor *m) +@@ -2645,21 +2630,31 @@ tile(Monitor *m) if (n == 0) return; - if (n > m->nmaster) -- mw = m->nmaster ? ROUND(m->w.width * m->mfact) : 0; +- mw = m->nmaster ? (int)roundf(m->w.width * m->mfact) : 0; - else -+ if (n == 1) - mw = m->w.width; +- mw = m->w.width; - i = my = ty = 0; -+ else -+ mw = ROUND(m->w.width * m->mfact); ++ mw = (n == 1) ? m->w.width : (int)roundf(m->w.width * m->mfact); + i = ty = 0; wl_list_for_each(c, &clients, link) { if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen) @@ -152,5 +151,5 @@ index 6f041a0d..3f8789da 100644 } i++; -- -2.45.1 +2.45.2