mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2025-11-04 05:54:20 +00:00
90 lines
2.6 KiB
Diff
90 lines
2.6 KiB
Diff
diff --git a/config.def.h b/config.def.h
|
|
index 22d2171..014a909 100644
|
|
--- a/config.def.h
|
|
+++ b/config.def.h
|
|
@@ -34,6 +34,7 @@ static const Layout layouts[] = {
|
|
{ "[]=", tile },
|
|
{ "><>", NULL }, /* no layout function means floating behavior */
|
|
{ "[M]", monocle },
|
|
+ { "###", gaplessgrid },
|
|
};
|
|
|
|
/* monitors */
|
|
@@ -139,6 +140,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_g, 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 145fd01..dae1d1a 100644
|
|
--- a/dwl.c
|
|
+++ b/dwl.c
|
|
@@ -287,6 +287,7 @@ static void focusmon(const Arg *arg);
|
|
static void focusstack(const Arg *arg);
|
|
static Client *focustop(Monitor *m);
|
|
static void fullscreennotify(struct wl_listener *listener, void *data);
|
|
+static void gaplessgrid(Monitor *m);
|
|
static void handlesig(int signo);
|
|
static void incnmaster(const Arg *arg);
|
|
static void inputdevice(struct wl_listener *listener, void *data);
|
|
@@ -1467,6 +1468,56 @@ handlesig(int signo)
|
|
}
|
|
}
|
|
|
|
+void
|
|
+gaplessgrid(Monitor *m)
|
|
+{
|
|
+ unsigned int n = 0, i = 0, ch, cw, cn, rn, rows, cols;
|
|
+ Client *c;
|
|
+
|
|
+ wl_list_for_each(c, &clients, link)
|
|
+ if (VISIBLEON(c, m) && !c->isfloating)
|
|
+ n++;
|
|
+ if (n == 0)
|
|
+ return;
|
|
+
|
|
+ /* grid dimensions */
|
|
+ for (cols = 0; cols <= (n / 2); cols++)
|
|
+ if ((cols * cols) >= n)
|
|
+ break;
|
|
+
|
|
+ if (n == 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */
|
|
+ cols = 2;
|
|
+
|
|
+ /* widescreen is better if 3 columns */
|
|
+ if (n >= 3 && n <= 6 && (m->w.width / m->w.height) > 1)
|
|
+ cols = 3;
|
|
+
|
|
+ rows = n / cols;
|
|
+
|
|
+ /* window geometries */
|
|
+ cw = cols ? m->w.width / cols : m->w.width;
|
|
+ cn = 0; /* current column number */
|
|
+ rn = 0; /* current row number */
|
|
+ wl_list_for_each(c, &clients, link) {
|
|
+ unsigned int cx, cy;
|
|
+ if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
|
|
+ continue;
|
|
+
|
|
+ if ((i / rows + 1) > (cols - n % cols))
|
|
+ rows = n / cols + 1;
|
|
+ ch = rows ? m->w.height / rows : m->w.height;
|
|
+ cx = m->w.x + cn * cw;
|
|
+ cy = m->w.y + rn * ch;
|
|
+ resize(c, (struct wlr_box) { cx, cy, cw, ch}, 0);
|
|
+ rn++;
|
|
+ if (rn >= rows) {
|
|
+ rn = 0;
|
|
+ cn++;
|
|
+ }
|
|
+ i++;
|
|
+ }
|
|
+}
|
|
+
|
|
void
|
|
incnmaster(const Arg *arg)
|
|
{
|