Makefile

@@ -20,7 +20,7 @@ dwm: ${OBJ}
 	${CC} -o $@ ${OBJ} ${LDFLAGS}
 
 clean:
-	rm -f dwm ${OBJ} config.h dwm-${VERSION}.tar.gz
+	rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz
 
 dist: clean
 	mkdir -p dwm-${VERSION}

config.def.h

@@ -1,37 +1,34 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-static const unsigned int borderpx  = 3;        /* border pixel of windows */
+static const unsigned int borderpx  = 1;        /* border pixel of 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 */
-/*static const char *fonts[]          = { "monospace:size=16" };
+static const char *fonts[]          = { "monospace:size=10" };
- */
+static const char dmenufont[]       = "monospace:size=10";
-static const char *fonts[]     = {"Mononoki Nerd Font:size=16:antialias=true:autohint=true",
+static const char col_gray1[]       = "#222222";
-                                  "Hack:size=14:antialias=true:autohint=true",
+static const char col_gray2[]       = "#444444";
-                                  "JoyPixels:size=16:antialias=true:autohint=true"};
+static const char col_gray3[]       = "#bbbbbb";
-
+static const char col_gray4[]       = "#eeeeee";
-#include "/home/moo/.config/themes/using/colors-wal-dwm.h"
+static const char col_cyan[]        = "#005577";
+static const char *colors[][3]      = {
+	/*               fg         bg         border   */
+	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+	[SchemeSel]  = { col_gray4, col_cyan,  col_cyan  },
+};
 
 /* tagging */
-/*static const char *tags[] = { "", "", "", "", "", "", "7", "8", "9" };
+static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
- */
-static const char *tags[] = { "•", "•", "•", "•", "•", "•", "•", "•", "•" };
 
 static const Rule rules[] = {
 	/* xprop(1):
 	 *	WM_CLASS(STRING) = instance, class
 	 *	WM_NAME(STRING) = title
 	 */
-	/* class      instance    title       		      tags mask     isfloating   monitor */
+	/* class      instance    title       tags mask     isfloating   monitor */
-	{ "Gimp",      NULL,       NULL,      		      1 << 6,       0,           -1 },
+	{ "Gimp",     NULL,       NULL,       0,            1,           -1 },
-        { NULL,	       NULL,       "pulsemixer",	      0,            1, 	  	 -1 },
+	{ "Firefox",  NULL,       NULL,       1 << 8,       0,           -1 },
-	{ "waterfox",  NULL,       NULL,      		      1,	    0,	         -1 },
-	{ "Element",   NULL,       NULL,      		      1 << 8,	    0,	         -1 },
-        { NULL,        NULL,       "LibreWolf",		      1 << 0,	    0,		 -1 },
-        { NULL,        NULL,       "Waterfox",		      1 << 0,	    0,		 -1 },
-	{ NULL,	       NULL,       "Discord",		      1 << 8,  	    0,	         -1 },
-	{ "mpv",       NULL,       NULL,		      1 << 5,  	    1,	         -1 },
 };
 
 /* layout(s) */
@@ -48,7 +45,7 @@ static const Layout layouts[] = {
 };
 
 /* key definitions */
-#define MODKEY Mod4Mask
+#define MODKEY Mod1Mask
 #define TAGKEYS(KEY,TAG) \
 	{ MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
 	{ MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
@@ -60,26 +57,21 @@ static const Layout layouts[] = {
 
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[]    = { "dmenu_run", "-p", "Run: ", NULL };
+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
 static const char *termcmd[]  = { "st", NULL };
-static const char *volume[] = { "st", "-e", "pulsemixer", NULL };
 
-#include "movestack.c"
 static const Key keys[] = {
 	/* modifier                     key        function        argument */
-	{ MODKEY,			XK_Return, spawn,          {.v = termcmd } },
+	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
-	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = dmenucmd } },
+	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
-	{ MODKEY|Mod1Mask,		XK_v,      spawn,          {.v = volume } },
 	{ MODKEY,                       XK_b,      togglebar,      {0} },
 	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
 	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
 	{ MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
 	{ MODKEY,                       XK_d,      incnmaster,     {.i = -1 } },
-	{ MODKEY|ShiftMask,             XK_j,      movestack,      {.i = +1 } },
-	{ MODKEY|ShiftMask,             XK_k,      movestack,      {.i = -1 } },
 	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
 	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
-	{ MODKEY,                       XK_p, zoom,           {0} },
+	{ MODKEY,                       XK_Return, zoom,           {0} },
 	{ MODKEY,                       XK_Tab,    view,           {0} },
 	{ MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
 	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },

dwm.c

@@ -146,7 +146,6 @@ static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interac
 static void arrange(Monitor *m);
 static void arrangemon(Monitor *m);
 static void attach(Client *c);
-static void attachbottom(Client *c);
 static void attachstack(Client *c);
 static void buttonpress(XEvent *e);
 static void checkotherwm(void);
@@ -408,15 +407,6 @@ attach(Client *c)
 	c->mon->clients = c;
 }
 
-void
-attachbottom(Client *c)
-{
-	Client **tc;
-	c->next = NULL;
-	for (tc = &c->mon->clients; *tc; tc = &(*tc)->next);
-	*tc = c;
-}
-
 void
 attachstack(Client *c)
 {
@@ -1077,15 +1067,13 @@ manage(Window w, XWindowAttributes *wa)
 	updatewindowtype(c);
 	updatesizehints(c);
 	updatewmhints(c);
-	c->x = c->mon->mx + (c->mon->mw - WIDTH(c)) / 2;
-	c->y = c->mon->my + (c->mon->mh - HEIGHT(c)) / 2;
 	XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
 	grabbuttons(c, 0);
 	if (!c->isfloating)
 		c->isfloating = c->oldstate = trans != None || c->isfixed;
 	if (c->isfloating)
 		XRaiseWindow(dpy, c->win);
-	attachbottom(c);
+	attach(c);
 	attachstack(c);
 	XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
 		(unsigned char *) &(c->win), 1);
@@ -1438,7 +1426,7 @@ sendmon(Client *c, Monitor *m)
 	detachstack(c);
 	c->mon = m;
 	c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
-	attachbottom(c);
+	attach(c);
 	attachstack(c);
 	focus(NULL);
 	arrange(NULL);
@@ -1926,7 +1914,7 @@ updategeom(void)
 				m->clients = c->next;
 				detachstack(c);
 				c->mon = mons;
-				attachbottom(c);
+				attach(c);
 				attachstack(c);
 			}
 			if (m == selmon)

movestack.c

@@ -1,48 +0,0 @@
-void
-movestack(const Arg *arg) {
-	Client *c = NULL, *p = NULL, *pc = NULL, *i;
-
-	if(arg->i > 0) {
-		/* find the client after selmon->sel */
-		for(c = selmon->sel->next; c && (!ISVISIBLE(c) || c->isfloating); c = c->next);
-		if(!c)
-			for(c = selmon->clients; c && (!ISVISIBLE(c) || c->isfloating); c = c->next);
-
-	}
-	else {
-		/* find the client before selmon->sel */
-		for(i = selmon->clients; i != selmon->sel; i = i->next)
-			if(ISVISIBLE(i) && !i->isfloating)
-				c = i;
-		if(!c)
-			for(; i; i = i->next)
-				if(ISVISIBLE(i) && !i->isfloating)
-					c = i;
-	}
-	/* find the client before selmon->sel and c */
-	for(i = selmon->clients; i && (!p || !pc); i = i->next) {
-		if(i->next == selmon->sel)
-			p = i;
-		if(i->next == c)
-			pc = i;
-	}
-
-	/* swap c and selmon->sel selmon->clients in the selmon->clients list */
-	if(c && c != selmon->sel) {
-		Client *temp = selmon->sel->next==c?selmon->sel:selmon->sel->next;
-		selmon->sel->next = c->next==selmon->sel?c:c->next;
-		c->next = temp;
-
-		if(p && p != c)
-			p->next = c;
-		if(pc && pc != selmon->sel)
-			pc->next = selmon->sel;
-
-		if(selmon->sel == selmon->clients)
-			selmon->clients = c;
-		else if(c == selmon->clients)
-			selmon->clients = selmon->sel;
-
-		arrange(selmon);
-	}
-}

patches/dwm-alwayscenter-20200625-f04cac6.diff

@@ -1,12 +0,0 @@
-diff -up dwm/dwm.c dwmmod/dwm.c
---- dwm/dwm.c	2020-06-25 00:21:30.383692180 -0300
-+++ dwmmod/dwm.c	2020-06-25 00:20:35.643692330 -0300
-@@ -1057,6 +1057,8 @@ manage(Window w, XWindowAttributes *wa)
- 	updatewindowtype(c);
- 	updatesizehints(c);
- 	updatewmhints(c);
-+	c->x = c->mon->mx + (c->mon->mw - WIDTH(c)) / 2;
-+	c->y = c->mon->my + (c->mon->mh - HEIGHT(c)) / 2;
- 	XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
- 	grabbuttons(c, 0);
- 	if (!c->isfloating)

patches/dwm-attachbottom-6.3.diff

@@ -1,54 +0,0 @@
-diff -up dwm-6.3/dwm.c dwm-6.3-attachbottom/dwm.c
---- dwm-6.3/dwm.c	2022-01-07 12:42:18.000000000 +0100
-+++ dwm-6.3-attachbottom/dwm.c	2022-08-17 22:14:41.813809073 +0200
-@@ -147,6 +147,7 @@ static int applysizehints(Client *c, int
- static void arrange(Monitor *m);
- static void arrangemon(Monitor *m);
- static void attach(Client *c);
-+static void attachbottom(Client *c);
- static void attachstack(Client *c);
- static void buttonpress(XEvent *e);
- static void checkotherwm(void);
-@@ -408,6 +409,15 @@ attach(Client *c)
- }
- 
- void
-+attachbottom(Client *c)
-+{
-+	Client **tc;
-+	c->next = NULL;
-+	for (tc = &c->mon->clients; *tc; tc = &(*tc)->next);
-+	*tc = c;
-+}
-+
-+void
- attachstack(Client *c)
- {
- 	c->snext = c->mon->stack;
-@@ -1066,7 +1076,7 @@ manage(Window w, XWindowAttributes *wa)
- 		c->isfloating = c->oldstate = trans != None || c->isfixed;
- 	if (c->isfloating)
- 		XRaiseWindow(dpy, c->win);
--	attach(c);
-+	attachbottom(c);
- 	attachstack(c);
- 	XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
- 		(unsigned char *) &(c->win), 1);
-@@ -1421,7 +1431,7 @@ sendmon(Client *c, Monitor *m)
- 	detachstack(c);
- 	c->mon = m;
- 	c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
--	attach(c);
-+	attachbottom(c);
- 	attachstack(c);
- 	focus(NULL);
- 	arrange(NULL);
-@@ -1903,7 +1913,7 @@ updategeom(void)
- 					m->clients = c->next;
- 					detachstack(c);
- 					c->mon = mons;
--					attach(c);
-+					attachbottom(c);
- 					attachstack(c);
- 				}
- 				if (m == selmon)

patches/dwm-movestack-20211115-a786211.diff

@@ -1,95 +0,0 @@
-From 9a4037dc0ef56f91c009317e78e9e3790dafbb58 Mon Sep 17 00:00:00 2001
-From: BrunoCooper17 <BrunoCooper17@outlook.com>
-Date: Mon, 15 Nov 2021 14:04:53 -0600
-Subject: [PATCH] MoveStack patch
-
-This plugin allows you to move clients around in the stack and swap them 
-with the master. It emulates the behavior off mod+shift+j and mod+shift+k 
-in Xmonad. movestack(+1) will swap the client with the current focus with 
-the next client. movestack(-1) will swap the client with the current focus 
-with the previous client.
----
- config.def.h |  3 +++
- movestack.c  | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 51 insertions(+)
- create mode 100644 movestack.c
-
-diff --git a/config.def.h b/config.def.h
-index a2ac963..33efa5b 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -60,6 +60,7 @@ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn()
- static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
- static const char *termcmd[]  = { "st", NULL };
- 
-+#include "movestack.c"
- static Key keys[] = {
- 	/* modifier                     key        function        argument */
- 	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
-@@ -71,6 +72,8 @@ static Key keys[] = {
- 	{ MODKEY,                       XK_d,      incnmaster,     {.i = -1 } },
- 	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
- 	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
-+	{ MODKEY|ShiftMask,             XK_j,      movestack,      {.i = +1 } },
-+	{ MODKEY|ShiftMask,             XK_k,      movestack,      {.i = -1 } },
- 	{ MODKEY,                       XK_Return, zoom,           {0} },
- 	{ MODKEY,                       XK_Tab,    view,           {0} },
- 	{ MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
-diff --git a/movestack.c b/movestack.c
-new file mode 100644
-index 0000000..520f4ae
---- /dev/null
-+++ b/movestack.c
-@@ -0,0 +1,48 @@
-+void
-+movestack(const Arg *arg) {
-+	Client *c = NULL, *p = NULL, *pc = NULL, *i;
-+
-+	if(arg->i > 0) {
-+		/* find the client after selmon->sel */
-+		for(c = selmon->sel->next; c && (!ISVISIBLE(c) || c->isfloating); c = c->next);
-+		if(!c)
-+			for(c = selmon->clients; c && (!ISVISIBLE(c) || c->isfloating); c = c->next);
-+
-+	}
-+	else {
-+		/* find the client before selmon->sel */
-+		for(i = selmon->clients; i != selmon->sel; i = i->next)
-+			if(ISVISIBLE(i) && !i->isfloating)
-+				c = i;
-+		if(!c)
-+			for(; i; i = i->next)
-+				if(ISVISIBLE(i) && !i->isfloating)
-+					c = i;
-+	}
-+	/* find the client before selmon->sel and c */
-+	for(i = selmon->clients; i && (!p || !pc); i = i->next) {
-+		if(i->next == selmon->sel)
-+			p = i;
-+		if(i->next == c)
-+			pc = i;
-+	}
-+
-+	/* swap c and selmon->sel selmon->clients in the selmon->clients list */
-+	if(c && c != selmon->sel) {
-+		Client *temp = selmon->sel->next==c?selmon->sel:selmon->sel->next;
-+		selmon->sel->next = c->next==selmon->sel?c:c->next;
-+		c->next = temp;
-+
-+		if(p && p != c)
-+			p->next = c;
-+		if(pc && pc != selmon->sel)
-+			pc->next = selmon->sel;
-+
-+		if(selmon->sel == selmon->clients)
-+			selmon->clients = c;
-+		else if(c == selmon->clients)
-+			selmon->clients = selmon->sel;
-+
-+		arrange(selmon);
-+	}
-+}
-\ No newline at end of file
--- 
-2.33.1
-