From 68829dae1de6a72ed45d6746df8b404f389618f2 Mon Sep 17 00:00:00 2001 From: wochap Date: Fri, 8 Mar 2024 13:22:04 -0500 Subject: [PATCH] reintroduce centeredmaster --- _STALE_PATCHES/centeredmaster.md | 30 -------- centeredmaster/centeredmaster.patch | 114 ++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 30 deletions(-) delete mode 100644 _STALE_PATCHES/centeredmaster.md create mode 100644 centeredmaster/centeredmaster.patch diff --git a/_STALE_PATCHES/centeredmaster.md b/_STALE_PATCHES/centeredmaster.md deleted file mode 100644 index 9a3ae5c..0000000 --- a/_STALE_PATCHES/centeredmaster.md +++ /dev/null @@ -1,30 +0,0 @@ -### Description - -This is a port of centeredmaster patch for dwm: - -centeredmaster centers the nmaster area on screen, using mfact * monitor -width & height, with the stacked windows distributed to the left and -right. It can be selected with `Alt+c`. - -With one and two clients in master respectively this results in: - -``` -+------------------------------+ +------------------------------+ -|+--------++--------++--------+| |+--------++--------++--------+| -|| || || || || || || || -|| || || || || || M1 || || -|| || || || || || || || -|| S2 || M || S1 || || |+--------+| || -|| || || || || |+--------+| || -|| || || || || || || || -|| || || || || || M2 || || -|| || || || || || || || -|+--------++--------++--------+| |+--------++--------++--------+| -+------------------------------+ +------------------------------+ -``` - -### Download -- [2023-05-20](https://github.com/djpohly/dwl/compare/main...NikitaIvanovV:centeredmaster.patch) - -### Authors -- [Nikita Ivanov](https://github.com/NikitaIvanovV) \ No newline at end of file diff --git a/centeredmaster/centeredmaster.patch b/centeredmaster/centeredmaster.patch new file mode 100644 index 0000000..9694dd9 --- /dev/null +++ b/centeredmaster/centeredmaster.patch @@ -0,0 +1,114 @@ +From 9f8c11325b14939e325e48995fb5a62d51d66fa4 Mon Sep 17 00:00:00 2001 +From: wochap +Date: Tue, 5 Mar 2024 21:58:19 -0500 +Subject: [PATCH] apply nikita centeredmaster patch + +source: https://github.com/djpohly/dwl/wiki/centeredmaster +--- + config.def.h | 2 ++ + dwl.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 65 insertions(+) + +diff --git a/config.def.h b/config.def.h +index db0babc..95611ef 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -33,6 +33,7 @@ static const Layout layouts[] = { + { "[]=", tile }, + { "><>", NULL }, /* no layout function means floating behavior */ + { "[M]", monocle }, ++ { "|M|", centeredmaster }, + }; + + /* monitors */ +@@ -132,6 +133,7 @@ static const Key keys[] = { + { MODKEY, XKB_KEY_t, setlayout, {.v = &layouts[0]} }, + { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, + { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, ++ { MODKEY, XKB_KEY_c, setlayout, {.v = &layouts[3]} }, + { MODKEY, XKB_KEY_space, setlayout, {0} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, + { MODKEY, XKB_KEY_e, togglefullscreen, {0} }, +diff --git a/dwl.c b/dwl.c +index ef27a1d..0ab3789 100644 +--- a/dwl.c ++++ b/dwl.c +@@ -235,6 +235,7 @@ static void arrangelayer(Monitor *m, struct wl_list *list, + static void arrangelayers(Monitor *m); + static void axisnotify(struct wl_listener *listener, void *data); + static void buttonpress(struct wl_listener *listener, void *data); ++static void centeredmaster(Monitor *m); + static void chvt(const Arg *arg); + static void checkidleinhibitor(struct wlr_surface *exclude); + static void cleanup(void); +@@ -597,6 +598,68 @@ buttonpress(struct wl_listener *listener, void *data) + event->time_msec, event->button, event->state); + } + ++void ++centeredmaster(Monitor *m) ++{ ++ unsigned int i, n, h, mw, mx, my, oty, ety, tw; ++ Client *c; ++ ++ n = 0; ++ wl_list_for_each(c, &clients, link) ++ if (VISIBLEON(c, m) && !c->isfloating && !c->isfullscreen) ++ n++; ++ if (n == 0) ++ return; ++ ++ /* initialize areas */ ++ mw = m->w.width; ++ mx = 0; ++ my = 0; ++ tw = mw; ++ ++ if (n > m->nmaster) { ++ /* go mfact box in the center if more than nmaster clients */ ++ mw = m->nmaster ? m->w.width * m->mfact : 0; ++ tw = m->w.width - mw; ++ ++ if (n - m->nmaster > 1) { ++ /* only one client */ ++ mx = (m->w.width - mw) / 2; ++ tw = (m->w.width - mw) / 2; ++ } ++ } ++ ++ i = 0; ++ oty = 0; ++ ety = 0; ++ wl_list_for_each(c, &clients, link) { ++ if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen) ++ continue; ++ if (i < m->nmaster) { ++ /* nmaster clients are stacked vertically, in the center ++ * of the screen */ ++ h = (m->w.height - my) / (MIN(n, m->nmaster) - i); ++ resize(c, (struct wlr_box){.x = m->w.x + mx, .y = m->w.y + my, .width = mw, ++ .height = h}, 0); ++ my += c->geom.height; ++ } else { ++ /* stack clients are stacked vertically */ ++ if ((i - m->nmaster) % 2) { ++ h = (m->w.height - ety) / ( (1 + n - i) / 2); ++ resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + ety, .width = tw, ++ .height = h}, 0); ++ ety += c->geom.height; ++ } else { ++ h = (m->w.height - oty) / ((1 + n - i) / 2); ++ resize(c, (struct wlr_box){.x = m->w.x + mx + mw, .y = m->w.y + oty, .width = tw, ++ .height = h}, 0); ++ oty += c->geom.height; ++ } ++ } ++ i++; ++ } ++} ++ + void + chvt(const Arg *arg) + { +-- +2.42.0