dwm

commit 4961491160f4101c1e2dd9de3731fc91b2e98cd0
parent 8060cdd3703f85d183bd68c6cb64edd256db0977
Author: AndrewLockVI <andrew@laack.co>
Date:   Sat, 15 Feb 2025 02:33:34 -0600

Updated config for columnar usage

Diffstat:
M
config.def.h
 | 
2
++
M
config.h
 | 
20
++++++++++++++------
M
dwm.c
 | 
27
+++++++++++++++++++++++++++

3 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/config.def.h b/config.def.h
@@ -42,6 +42,7 @@ static const Layout layouts[] = {
 	{ "[]=",      tile },    /* first entry is default */
 	{ "><>",      NULL },    /* no layout function means floating behavior */
 	{ "[M]",      monocle },
+	{ "|||",      col },
 };
 
 /* key definitions */
@@ -77,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,                       XK_c,      setlayout,      {.v = &layouts[3]} },
 	{ MODKEY,                       XK_space,  setlayout,      {0} },
 	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
 	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
diff --git a/config.h b/config.h
@@ -9,7 +9,7 @@ static const char *fonts[]          = { "monospace:size=10" };
 static const char dmenufont[]       = "monospace:size=10";
 static const char col_gray1[]       = "#222222";
 static const char col_gray2[]       = "#444444";
-static const char col_gray3[]       = "#ffffff";
+static const char col_gray3[]       = "#aaaaaa";
 static const char col_gray4[]       = "#ffffff";
 static const char col_cyan[]        = "#00ff00";
 static const char *colors[][3]      = {
@@ -24,7 +24,7 @@ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 static const Rule rules[] = {
 	/* xprop(1):
 	 *	WM_CLASS(STRING) = instance, class
-	 *	WM_NAME(STRING) = title
+	*	WM_NAME(STRING) = "ANDREW"
 	 */
 	/* class      instance    title       tags mask     isfloating   monitor */
 	{ "Gimp",     NULL,       NULL,       0,            1,           -1 },
@@ -42,6 +42,7 @@ static const Layout layouts[] = {
 	{ "[]=",      tile },    /* first entry is default */
 	//{ "><>",      NULL },    /* no layout function means floating behavior */
 	//{ "[M]",      monocle },
+	{ "|||",      col },
 };
 
 /* key definitions */
@@ -79,12 +80,13 @@ static const Key keys[] = {
 
 	{ MODKEY,             			XK_Return, spawn,          {.v = termcmd } },
 
-	//{ MODKEY,                       XK_b,      togglebar,      {0} },
+
+	{ MODKEY,                       XK_b,      togglebar,      {0} },
 	{ MODKEY,                       XK_Down,      focusstack,     {.i = +1 } },
 	{ MODKEY,                       XK_Up,      focusstack,     {.i = -1 } },
 
-	//{ MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
-	//{ MODKEY,                       XK_d,      incnmaster,     {.i = -1 } },
+	{ MODKEY|ShiftMask,             XK_i,      incnmaster,     {.i = +1 } },
+	{ MODKEY|ShiftMask,             XK_d,      incnmaster,     {.i = -1 } },
 
 	//{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
 	//{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
@@ -107,9 +109,15 @@ static const Key keys[] = {
 
 	{ MODKEY|ShiftMask,             XK_q,      killclient,     {0} },
 
-	//{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
+
 	//{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
 	//{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
+	//
+	
+	// stack mode
+	{ MODKEY|ShiftMask,                       XK_s,      setlayout,      {.v = &layouts[0]} },
+	// columnar mode
+	{ MODKEY|ShiftMask,                       XK_c,      setlayout,      {.v = &layouts[1]} },
 	//{ MODKEY,                       XK_space,  setlayout,      {0} },
 
 	//{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
diff --git a/dwm.c b/dwm.c
@@ -152,6 +152,7 @@ static void checkotherwm(void);
 static void cleanup(void);
 static void cleanupmon(Monitor *mon);
 static void clientmessage(XEvent *e);
+static void col(Monitor *);
 static void configure(Client *c);
 static void configurenotify(XEvent *e);
 static void configurerequest(XEvent *e);
@@ -1684,6 +1685,32 @@ tagmon(const Arg *arg)
 }
 
 void
+col(Monitor *m)
+{
+	unsigned int i, n, h, w, x, y, mw;
+	Client *c;
+
+	for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
+	if (n == 0)
+		return;
+
+	if (n > m->nmaster)
+		mw = m->nmaster ? m->ww * m->mfact : 0;
+	else
+		mw = m->ww;
+	for (i = x = y = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
+		if (i < m->nmaster) {
+			w = (mw - x) / (MIN(n, m->nmaster) - i);
+			resize(c, x + m->wx, m->wy, w - (2 * c->bw), m->wh - (2 * c->bw), 0);
+			x += WIDTH(c);
+		} else {
+			h = (m->wh - y) / (n - i);
+			resize(c, x + m->wx, m->wy + y, m->ww - x - (2 * c->bw), h - (2 * c->bw), 0);
+			y += HEIGHT(c);
+		}
+}
+
+void
 tile(Monitor *m)
 {
 	unsigned int i, n, h, mw, my, ty;