From b33b58db254e3701c53765cc11fff8aa995aa3c1 Mon Sep 17 00:00:00 2001
From: Soccera1 <129828376+Soccera1@users.noreply.github.com>
Date: Wed, 28 May 2025 12:48:53 +1000
Subject: Add FreeBSD installation instructions

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 4cc6100..a414fb6 100644
--- a/README.md
+++ b/README.md
@@ -226,6 +226,13 @@ sudo nixos-rebuild switch
 slackpkg install gcc make libX11 libXinerama</code></pre>
 </details>
 
+<details>
+<summary>FreeBSD</summary>
+<pre><code># If you use doas or su instead of sudo, modify the following commands accordingly.
+sudo pkg update
+sudo pkg install gcc gmake libX11 libXinerama</code></pre>
+</details>
+
 ---
 
 ## Build & Install
@@ -241,6 +248,7 @@ yay -S sxwm
 ```sh
 git clone --depth=1 https://github.com/uint23/sxwm.git
 cd sxwm/
+# Replace make with gmake on FreeBSD
 make
 sudo make clean install
 ```
-- 
cgit v1.2.3


From bcb860b6660663ba5155debeb92f0d1e6a452eb8 Mon Sep 17 00:00:00 2001
From: pb <467756+pbadeer@users.noreply.github.com>
Date: Wed, 28 May 2025 17:20:43 -0500
Subject: Add missing dependency to ubuntu install instructions

Without this, I'm getting a fatal error when running `make`. Afterwards it succeeded. Tested on debian

src/sxwm.c:33:10 `#include <X11/Xcursor/Xcursor.h>` No such file or directory.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4cc6100..d7c3553 100644
--- a/README.md
+++ b/README.md
@@ -168,7 +168,7 @@ bind : mod + shift + 5 : moveto_ws5
 <details>
 <summary>Debian / Ubuntu / Linux Mint</summary>
 <pre><code>sudo apt update
-sudo apt install libx11-dev libxinerama-dev build-essential</code></pre>
+sudo apt install libx11-dev libxcursor-dev libxinerama-dev build-essential</code></pre>
 </details>
 
 <details>
-- 
cgit v1.2.3


From a3acd99d794a387c74e72c9c5a52fcb2956b65bb Mon Sep 17 00:00:00 2001
From: Abhinav <abhinav.prsai@gmail.com>
Date: Thu, 29 May 2025 12:09:20 +0100
Subject: unmanage unmapped windows. fix for issue #46

---
 src/sxwm.c | 44 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/sxwm.c b/src/sxwm.c
index d3917c7..9d97bac 100644
--- a/src/sxwm.c
+++ b/src/sxwm.c
@@ -56,6 +56,7 @@ void hdl_keypress(XEvent *xev);
 void hdl_map_req(XEvent *xev);
 void hdl_motion(XEvent *xev);
 void hdl_root_property(XEvent *xev);
+void hdl_unmap_ntf(XEvent *xev);
 /* void inc_gaps(void); */
 void init_defaults(void);
 /* void move_master_next(void); */
@@ -591,7 +592,7 @@ void hdl_keypress(XEvent *xev)
 			switch (b->type) {
 				case TYPE_CMD:
 					spawn(b->action.cmd);
-					for (int j = 0; j < 256; j++) {						
+					for (int j = 0; j < 256; j++) {
 						Bool valid = False;
 						for (int k = 0; user_config.should_float[j] && user_config.should_float[j][k] && b->action.cmd[k]; k++) {
 							if (!strcmp(b->action.cmd[k], user_config.should_float[j][k])) {
@@ -739,7 +740,7 @@ void hdl_map_req(XEvent *xev)
 		should_float = True;
 		c->fixed = True;
 	}
-	
+
 	if (should_float || global_floating || next_should_float) {
 		c->floating = True;
 
@@ -754,7 +755,7 @@ void hdl_map_req(XEvent *xev)
 
 				XConfigureWindow(
 					dpy, c->win, CWX | CWY | CWWidth | CWHeight,
-					&(XWindowChanges){.x = c->x, .y = c->y, .width = c->w, .height = c->h});
+				                 &(XWindowChanges){.x = c->x, .y = c->y, .width = c->w, .height = c->h});
 			}
 
 			tile();
@@ -766,8 +767,7 @@ void hdl_map_req(XEvent *xev)
 			}
 			next_should_float = False;
 		}
-	} 
-		
+	}
 
 	/* center floating windows & set border */
 	if (c->floating && !c->fullscreen) {
@@ -904,6 +904,39 @@ void hdl_root_property(XEvent *xev)
 	}
 }
 
+void hdl_unmap_ntf(XEvent *xev)
+{
+	Window w = xev->xunmap.window;
+
+	for (int ws = 0; ws < NUM_WORKSPACES; ws++) {
+		Client *prev = NULL, *c = workspaces[ws];
+		while (c && c->win != w) {
+			prev = c;
+			c = c->next;
+		}
+		if (c) {
+			if (focused == c) {
+				if (c->next)
+					focused = c->next;
+				else if (prev)
+					focused = prev;
+				else
+					focused = NULL;
+			}
+			if (!prev)
+				workspaces[ws] = c->next;
+			else
+				prev->next = c->next;
+			free(c);
+			open_windows--;
+			update_net_client_list();
+			tile();
+			update_borders();
+			break;
+		}
+	}
+}
+
 void update_struts(void)
 {
 	reserve_left = reserve_right = reserve_top = reserve_bottom = 0;
@@ -1274,6 +1307,7 @@ void setup(void)
 	evtable[MapRequest] = hdl_map_req;
 	evtable[MotionNotify] = hdl_motion;
 	evtable[PropertyNotify] = hdl_root_property;
+	evtable[UnmapNotify] = hdl_unmap_ntf;
 	scan_existing_windows();
 
 	signal(SIGCHLD, SIG_IGN); /* Prevent child processes from becoming zombies */
-- 
cgit v1.2.3


From 849bdebd1336872dda37d0eb3a87aa21b18402fb Mon Sep 17 00:00:00 2001
From: Abhinav <abhinav.prsai@gmail.com>
Date: Thu, 29 May 2025 12:18:45 +0100
Subject: fix double mapping when opening window.

---
 src/sxwm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sxwm.c b/src/sxwm.c
index 9d97bac..359172a 100644
--- a/src/sxwm.c
+++ b/src/sxwm.c
@@ -784,12 +784,12 @@ void hdl_map_req(XEvent *xev)
 	}
 
 	/* map & borders */
-	XMapWindow(dpy, w);
 	update_net_client_list();
 	if (!global_floating && !c->floating)
 		tile();
 	else if (c->floating)
 		XRaiseWindow(dpy, w);
+	XMapWindow(dpy, w);
 	update_borders();
 }
 
-- 
cgit v1.2.3


From ec78d7e63c7290b1b495e8947177d52ccfdc32bb Mon Sep 17 00:00:00 2001
From: Abhinav <abhinav.prsai@gmail.com>
Date: Thu, 29 May 2025 13:31:46 +0100
Subject: added proper multi-monitor support.

---
 src/defs.h   |  3 ++-
 src/parser.c | 57 ++++++++++++++++++++++----------------------
 src/sxwm.c   | 78 +++++++++++++++++++++++++++++++++++-------------------------
 3 files changed, 77 insertions(+), 61 deletions(-)

diff --git a/src/defs.h b/src/defs.h
index d90ab61..24e9f1b 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -13,6 +13,7 @@
 #define OUT_IN (2 * BORDER_WIDTH)
 #define MF_MIN 0.05f
 #define MF_MAX 0.95f
+#define MAX_MONITORS 32
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 #define LENGTH(X) (sizeof X / sizeof X[0])
@@ -81,7 +82,7 @@ typedef struct {
 	long border_foc_col;
 	long border_ufoc_col;
 	long border_swap_col;
-	float master_width;
+	float master_width[MAX_MONITORS];
 	int motion_throttle;
 	int resize_master_amt;
 	int snap_distance;
diff --git a/src/parser.c b/src/parser.c
index 7cc59d1..0d086a2 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -143,22 +143,22 @@ int parser(Config *cfg)
 	// check $XDG_CONFIG_HOME/sxwmrc, then $XDG_CONFIG_HOME/sxwm/sxwmrc, then $HOME/.config/sxwmrc
 	const char *xdg_config_home = getenv("XDG_CONFIG_HOME");
 
-    if (xdg_config_home) {
-        snprintf(path, sizeof path, "%s/sxwmrc", xdg_config_home);
-        if (access(path, R_OK) == 0) {
-            goto found;
-        }
-
-        snprintf(path, sizeof path, "%s/sxwm/sxwmrc", xdg_config_home);
-        if (access(path, R_OK) == 0) {
-            goto found;
-        }
-    }
-
-    snprintf(path, sizeof path, "%s/.config/sxwmrc", home);
-    if (access(path, R_OK) == 0) {
-        goto found;
-    }
+	if (xdg_config_home) {
+		snprintf(path, sizeof path, "%s/sxwmrc", xdg_config_home);
+		if (access(path, R_OK) == 0) {
+			goto found;
+		}
+
+		snprintf(path, sizeof path, "%s/sxwm/sxwmrc", xdg_config_home);
+		if (access(path, R_OK) == 0) {
+			goto found;
+		}
+	}
+
+	snprintf(path, sizeof path, "%s/.config/sxwmrc", home);
+	if (access(path, R_OK) == 0) {
+		goto found;
+	}
 
 	snprintf(path, sizeof path, "/usr/local/share/sxwmrc");
 	if (access(path, R_OK) == 0) {
@@ -166,11 +166,11 @@ int parser(Config *cfg)
 	}
 
 found:
-    FILE *f = fopen(path, "r");
-    if (!f) {
-        fprintf(stderr, "sxwmrc: cannot open %s\n", path);
-        return -1;
-    }
+	FILE *f = fopen(path, "r");
+	if (!f) {
+		fprintf(stderr, "sxwmrc: cannot open %s\n", path);
+		return -1;
+	}
 
 	char line[512];
 	int lineno = 0;
@@ -221,7 +221,10 @@ found:
 			cfg->border_swap_col = parse_col(rest);
 		}
 		else if (!strcmp(key, "master_width")) {
-			cfg->master_width = atoi(rest) / 100.0f;
+			float mf = atoi(rest) / 100.0f;
+			for (int i = 0; i < MAX_MONITORS; i++) {
+				cfg->master_width[i] = mf;
+			}
 		}
 		else if (!strcmp(key, "motion_throttle")) {
 			cfg->motion_throttle = atoi(rest);
@@ -234,14 +237,14 @@ found:
 		}
 		else if (!strcmp(key, "should_float")) {
 			// should_float: binary --arg,binary2 parameter --arg,binary3
-			
+
 			if (should_floatn >= 256) {
 				fprintf(stderr, "sxwmrc:%d: too many should_float entries\n", lineno);
 				continue;
 			}
 
 			char *win = strip(rest);
-			
+
 			cfg->should_float[should_floatn] = malloc(256 * sizeof(char *));
 
 			char *comma_ptr, *space_ptr;
@@ -262,7 +265,6 @@ found:
 					char *argv = strtok_r(comma, " ", &space_ptr);
 					int i = 0;
 
-
 					while (argv) {
 						printf("argv: %s\n", argv);
 						cfg->should_float[should_floatn][i] = strdup(argv);
@@ -272,15 +274,14 @@ found:
 
 					should_floatn++;
 					cfg->should_float[should_floatn] = malloc(256 * sizeof(char *));
-
-				} else {
+				}
+				else {
 					fprintf(stderr, "sxwmrc:%d: too many should_float entries\n", lineno);
 					break;
 				}
 				comma = strtok_r(NULL, ",", &comma_ptr);
 			}
 
-
 			should_floatn++;
 		}
 		else if (!strcmp(key, "call") || !strcmp(key, "bind")) {
diff --git a/src/sxwm.c b/src/sxwm.c
index 359172a..31ae2d0 100644
--- a/src/sxwm.c
+++ b/src/sxwm.c
@@ -170,24 +170,25 @@ Client *add_client(Window w, int ws)
 	c->w = wa.width;
 	c->h = wa.height;
 
-	if (focused) {
-		c->mon = focused->mon;
-	}
-	else {
-		/* need better way to determine mon */
-		int cx = c->x + c->w / 2, cy = c->y + c->h / 2;
-		c->mon = 0;
+	/* set monitor based on pointer location */
+	Window root_ret, child_ret;
+	int root_x, root_y, win_x, win_y;
+	unsigned int mask;
+	int pointer_mon = 0;
+
+	if (XQueryPointer(dpy, root, &root_ret, &child_ret, &root_x, &root_y, &win_x, &win_y, &mask)) {
 		for (int i = 0; i < monsn; i++) {
-			if (cx >= mons[i].x && cx < mons[i].x + mons[i].w && cy >= mons[i].y && cy < mons[i].y + mons[i].h) {
-				c->mon = i;
+			if (root_x >= mons[i].x && root_x < mons[i].x + mons[i].w && root_y >= mons[i].y &&
+			    root_y < mons[i].y + mons[i].h) {
+				pointer_mon = i;
 				break;
 			}
 		}
 	}
 
+	c->mon = pointer_mon;
 	c->fixed = False;
 	c->floating = False;
-
 	c->fullscreen = False;
 
 	if (global_floating) {
@@ -594,7 +595,8 @@ void hdl_keypress(XEvent *xev)
 					spawn(b->action.cmd);
 					for (int j = 0; j < 256; j++) {
 						Bool valid = False;
-						for (int k = 0; user_config.should_float[j] && user_config.should_float[j][k] && b->action.cmd[k]; k++) {
+						for (int k = 0;
+						     user_config.should_float[j] && user_config.should_float[j][k] && b->action.cmd[k]; k++) {
 							if (!strcmp(b->action.cmd[k], user_config.should_float[j][k])) {
 								valid = True;
 								break;
@@ -724,7 +726,7 @@ void hdl_map_req(XEvent *xev)
 		return;
 	}
 
-	/* ad client to list */
+	/* add client to list */
 	Client *c = add_client(w, current_ws);
 	if (!c)
 		return;
@@ -753,8 +755,7 @@ void hdl_map_req(XEvent *xev)
 				c->w = wa.width;
 				c->h = wa.height;
 
-				XConfigureWindow(
-					dpy, c->win, CWX | CWY | CWWidth | CWHeight,
+				XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight,
 				                 &(XWindowChanges){.x = c->x, .y = c->y, .width = c->w, .height = c->h});
 			}
 
@@ -1011,7 +1012,9 @@ void init_defaults(void)
 	default_config.border_foc_col = parse_col("#c0cbff");
 	default_config.border_ufoc_col = parse_col("#555555");
 	default_config.border_swap_col = parse_col("#fff4c0");
-	default_config.master_width = 50 / 100.0f;
+	for (int i = 0; i < MAX_MONITORS; i++)
+		default_config.master_width[i] = 50 / 100.0f;
+
 	default_config.motion_throttle = 60;
 	default_config.resize_master_amt = 5;
 	default_config.snap_distance = 5;
@@ -1131,6 +1134,7 @@ long parse_col(const char *hex)
 	}
 
 	/* return col.pixel |= 0xff << 24; */
+	/* This is a fix for picom making the borders transparent. DANGEROUS */
 	return col.pixel;
 }
 
@@ -1186,8 +1190,12 @@ void reload_config(void)
 
 void resize_master_add(void)
 {
-	if (user_config.master_width < MF_MAX - 0.001f) {
-		user_config.master_width += ((float)user_config.resize_master_amt / 100);
+	/* pick the monitor of the focused window (or 0 if none) */
+	int m = focused ? focused->mon : 0;
+	float *mw = &user_config.master_width[m];
+
+	if (*mw < MF_MAX - 0.001f) {
+		*mw += ((float)user_config.resize_master_amt / 100);
 	}
 	tile();
 	update_borders();
@@ -1195,8 +1203,12 @@ void resize_master_add(void)
 
 void resize_master_sub(void)
 {
-	if (user_config.master_width > MF_MIN + 0.001f) {
-		user_config.master_width -= ((float)user_config.resize_master_amt / 100);
+	/* pick the monitor of the focused window (or 0 if none) */
+	int m = focused ? focused->mon : 0;
+	float *mw = &user_config.master_width[m];
+
+	if (*mw > MF_MIN + 0.001f) {
+		*mw -= ((float)user_config.resize_master_amt / 100);
 	}
 	tile();
 	update_borders();
@@ -1310,7 +1322,7 @@ void setup(void)
 	evtable[UnmapNotify] = hdl_unmap_ntf;
 	scan_existing_windows();
 
-	signal(SIGCHLD, SIG_IGN); /* Prevent child processes from becoming zombies */
+	signal(SIGCHLD, SIG_IGN); /* prevent child processes from becoming zombies */
 }
 
 void setup_atoms(void)
@@ -1457,7 +1469,6 @@ void tile(void)
 
 	for (Client *c = head; c; c = c->next) {
 		if (!c->floating) {
-			c->mon = get_monitor_for(c);
 			if (!c->fullscreen) {
 				total_tiled_count++;
 			}
@@ -1511,7 +1522,7 @@ void tile(void)
 		if (tile_h < 1)
 			tile_h = 1;
 
-		float mfact = user_config.master_width;
+		float mfact = user_config.master_width[m];
 		if (mfact < MF_MIN)
 			mfact = MF_MIN;
 		if (mfact > MF_MAX)
@@ -1585,22 +1596,21 @@ void toggle_floating(void)
 			focused->h = wa.height;
 
 			XConfigureWindow(
-				dpy, focused->win,
-				CWX | CWY | CWWidth | CWHeight,
-				&(XWindowChanges){
-					.x = focused->x,
-					.y = focused->y,
-					.width = focused->w,
-					.height = focused->h
-				}
-			);
+			    dpy, focused->win, CWX | CWY | CWWidth | CWHeight,
+			    &(XWindowChanges){.x = focused->x, .y = focused->y, .width = focused->w, .height = focused->h});
 		}
 	}
+	else {
+		focused->mon = get_monitor_for(focused);
+	}
 
+	if (!focused->floating) {
+		focused->mon = get_monitor_for(focused);
+	}
 	tile();
 	update_borders();
 
-	/* Raise and refocus floating window */
+	/* raise and refocus floating window */
 	if (focused->floating) {
 		XRaiseWindow(dpy, focused->win);
 		XSetInputFocus(dpy, focused->win, RevertToPointerRoot, CurrentTime);
@@ -1671,6 +1681,10 @@ void toggle_fullscreen(void)
 	else {
 		XMoveResizeWindow(dpy, focused->win, focused->orig_x, focused->orig_y, focused->orig_w, focused->orig_h);
 		XSetWindowBorderWidth(dpy, focused->win, user_config.border_width);
+
+		if (!focused->floating) {
+			focused->mon = get_monitor_for(focused);
+		}
 		tile();
 		update_borders();
 	}
-- 
cgit v1.2.3


From 243ed206e7d6144b7d2f346cb543827fd49124cf Mon Sep 17 00:00:00 2001
From: Abhinav <abhinav.prsai@gmail.com>
Date: Thu, 29 May 2025 13:51:40 +0100
Subject: fix random space under second monitor if reajusted y-position

---
 src/sxwm.c | 97 +++++++++++++++++---------------------------------------------
 1 file changed, 26 insertions(+), 71 deletions(-)

diff --git a/src/sxwm.c b/src/sxwm.c
index 31ae2d0..aa2df69 100644
--- a/src/sxwm.c
+++ b/src/sxwm.c
@@ -1436,55 +1436,22 @@ void spawn(const char **argv)
 
 void tile(void)
 {
-	long *wa_prop = NULL;
-	Atom actual;
-	int fmt;
-	unsigned long n, after;
-	int wa_x = 0, wa_y = 0, wa_w = scr_width, wa_h = scr_height;
-
 	update_struts();
-	/* read workarea */
-	if (XGetWindowProperty(dpy, root, atom_net_workarea, 0, 4, False, XA_CARDINAL, &actual, &fmt, &n, &after,
-	                       (unsigned char **)&wa_prop) == Success &&
-	    wa_prop && n >= 4) {
-		wa_x = wa_prop[0];
-		wa_y = wa_prop[1];
-		wa_w = wa_prop[2];
-		wa_h = wa_prop[3];
-		XFree(wa_prop);
-	}
-
-	/* subtract any docks */
-	wa_x += reserve_left;
-	wa_y += reserve_top;
-	wa_w -= reserve_left + reserve_right;
-	wa_h -= reserve_top + reserve_bottom;
-	if (wa_w < 1)
-		wa_w = 1;
-	if (wa_h < 1)
-		wa_h = 1;
 
 	Client *head = workspaces[current_ws];
-	int total_tiled_count = 0;
 
+	/* count total non-floating, non-fullscreen windows */
+	int total_tiled_count = 0;
 	for (Client *c = head; c; c = c->next) {
-		if (!c->floating) {
-			if (!c->fullscreen) {
-				total_tiled_count++;
-			}
-		}
+		if (!c->floating && !c->fullscreen)
+			total_tiled_count++;
 	}
 
+	/* If exactly one tiled window and it's fullscreen, do nothing */
 	if (total_tiled_count == 1) {
-		Client *single = NULL;
 		for (Client *c = head; c; c = c->next) {
-			if (!c->floating) {
-				single = c;
-				break;
-			}
-		}
-		if (single && single->fullscreen) {
-			return;
+			if (!c->floating && c->fullscreen)
+				return;
 		}
 	}
 
@@ -1494,34 +1461,24 @@ void tile(void)
 		int mon_w = mons[m].w;
 		int mon_h = mons[m].h;
 
-		int usable_x = MAX(mon_x, wa_x);
-		int usable_y = MAX(mon_y, wa_y);
-		int usable_r = MIN(mon_x + mon_w, wa_x + wa_w);
-		int usable_b = MIN(mon_y + mon_h, wa_y + wa_h);
-
-		int usable_w = usable_r - usable_x;
-		int usable_h = usable_b - usable_y;
-
 		int mon_tiled_count = 0;
 		for (Client *c = head; c; c = c->next) {
-			if (!c->floating && !c->fullscreen && c->mon == m) {
+			if (!c->floating && !c->fullscreen && c->mon == m)
 				mon_tiled_count++;
-			}
 		}
-
-		if (mon_tiled_count == 0 || usable_w <= 0 || usable_h <= 0) {
+		if (mon_tiled_count == 0)
 			continue;
-		}
 
-		int tile_x = usable_x + user_config.gaps;
-		int tile_y = usable_y + user_config.gaps;
-		int tile_w = usable_w - 2 * user_config.gaps;
-		int tile_h = usable_h - 2 * user_config.gaps;
+		int tile_x = mon_x + user_config.gaps;
+		int tile_y = mon_y + user_config.gaps;
+		int tile_w = mon_w - 2 * user_config.gaps;
+		int tile_h = mon_h - 2 * user_config.gaps;
 		if (tile_w < 1)
 			tile_w = 1;
 		if (tile_h < 1)
 			tile_h = 1;
 
+		/* master-stack split */
 		float mfact = user_config.master_width[m];
 		if (mfact < MF_MIN)
 			mfact = MF_MIN;
@@ -1530,43 +1487,41 @@ void tile(void)
 
 		int master_w = (mon_tiled_count > 1) ? (int)(tile_w * mfact) : tile_w;
 		int stack_w = tile_w - master_w - ((mon_tiled_count > 1) ? user_config.gaps : 0);
-		int stack_h = ((mon_tiled_count - 1) > 0)
-		                  ? (tile_h - ((mon_tiled_count - 1) * user_config.gaps)) / (mon_tiled_count - 1)
-		                  : 0;
+		int stack_h =
+		    (mon_tiled_count > 1) ? (tile_h - ((mon_tiled_count - 1) * user_config.gaps)) / (mon_tiled_count - 1) : 0;
 
-		int i = 0, stack_y = tile_y;
+		int i = 0;
+		int stack_y = tile_y;
 		for (Client *c = head; c; c = c->next) {
 			if (c->floating || c->fullscreen || c->mon != m)
 				continue;
 
 			XWindowChanges wc = {.border_width = user_config.border_width};
-			int adj = 2 * user_config.border_width;
+			int bw2 = 2 * user_config.border_width;
 
 			if (i == 0) {
+				/* master */
 				wc.x = tile_x;
 				wc.y = tile_y;
-				wc.width = (master_w > adj) ? master_w - adj : 1;
-				wc.height = (tile_h > adj) ? tile_h - adj : 1;
+				wc.width = MAX(1, master_w - bw2);
+				wc.height = MAX(1, tile_h - bw2);
 			}
 			else {
+				/* stack */
 				wc.x = tile_x + master_w + user_config.gaps;
 				wc.y = stack_y;
 				int this_h = (i == mon_tiled_count - 1) ? (tile_y + tile_h - stack_y) : stack_h;
-				wc.width = (stack_w > adj) ? stack_w - adj : 1;
-				wc.height = (this_h > adj) ? this_h - adj : 1;
+				wc.width = MAX(1, stack_w - bw2);
+				wc.height = MAX(1, this_h - bw2);
 				stack_y += this_h + user_config.gaps;
 			}
 
-			if (wc.width < 1)
-				wc.width = 1;
-			if (wc.height < 1)
-				wc.height = 1;
-
 			XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
 			c->x = wc.x;
 			c->y = wc.y;
 			c->w = wc.width;
 			c->h = wc.height;
+
 			i++;
 		}
 	}
-- 
cgit v1.2.3


From 957d76be32fb7fc5c35eebb1cef82ccb148b8f50 Mon Sep 17 00:00:00 2001
From: Abhinav <abhinav.prsai@gmail.com>
Date: Thu, 29 May 2025 13:57:22 +0100
Subject: fix workspace windows staying unmapepd

---
 src/sxwm.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/sxwm.c b/src/sxwm.c
index aa2df69..9dea9f2 100644
--- a/src/sxwm.c
+++ b/src/sxwm.c
@@ -119,6 +119,7 @@ Window wm_check_win;
 Monitor *mons = NULL;
 int monsn = 0;
 Bool global_floating = False;
+Bool in_ws_switch = False;
 
 long last_motion_time = 0;
 int scr_width;
@@ -209,6 +210,7 @@ void change_workspace(int ws)
 		return;
 	}
 
+	in_ws_switch = True;
 	XGrabServer(dpy);
 
 	for (Client *c = workspaces[current_ws]; c; c = c->next) {
@@ -231,6 +233,7 @@ void change_workspace(int ws)
 	                (unsigned char *)&cd, 1);
 
 	XUngrabServer(dpy);
+	in_ws_switch = False;
 }
 
 int clean_mask(int mask)
@@ -907,6 +910,10 @@ void hdl_root_property(XEvent *xev)
 
 void hdl_unmap_ntf(XEvent *xev)
 {
+	if (in_ws_switch) {
+		return;
+	}
+
 	Window w = xev->xunmap.window;
 
 	for (int ws = 0; ws < NUM_WORKSPACES; ws++) {
-- 
cgit v1.2.3


From f377fdec4fe4d8e6dd81a77fb6c19104bf4fa7e4 Mon Sep 17 00:00:00 2001
From: Abhinav <abhinav.prsai@gmail.com>
Date: Thu, 29 May 2025 15:01:47 +0100
Subject: fix workspace windows staying unmapepd.

---
 src/defs.h |   2 +
 src/sxwm.c | 139 +++++++++++++++++++++++++++++--------------------------------
 2 files changed, 68 insertions(+), 73 deletions(-)

diff --git a/src/defs.h b/src/defs.h
index 24e9f1b..0a71029 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -18,6 +18,7 @@
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 #define LENGTH(X) (sizeof X / sizeof X[0])
 #define UDIST(a,b) abs((int)(a) - (int)(b))
+# define CLAMP(x, lo, hi) (( (x) < (lo) ) ? (lo) : ( (x) > (hi) ) ? (hi) : (x))
 #define MAXCLIENTS	99
 #define BIND(mod, key, cmdstr) { (mod), XK_##key, { cmdstr }, False }
 #define CALL(mod, key, fnptr) { (mod), XK_##key, { .fn = fnptr }, True }
@@ -72,6 +73,7 @@ typedef struct Client{
 	Bool fixed;
 	Bool floating;
 	Bool fullscreen;
+	Bool mapped;
 	struct Client *next;
 } Client;
 
diff --git a/src/sxwm.c b/src/sxwm.c
index 9dea9f2..c7d041d 100644
--- a/src/sxwm.c
+++ b/src/sxwm.c
@@ -191,6 +191,7 @@ Client *add_client(Window w, int ws)
 	c->fixed = False;
 	c->floating = False;
 	c->fullscreen = False;
+	c->mapped = True;
 
 	if (global_floating) {
 		c->floating = True;
@@ -206,20 +207,24 @@ Client *add_client(Window w, int ws)
 
 void change_workspace(int ws)
 {
-	if (ws >= NUM_WORKSPACES || ws == current_ws) {
+	if (ws >= NUM_WORKSPACES || ws == current_ws)
 		return;
-	}
 
 	in_ws_switch = True;
 	XGrabServer(dpy);
 
+	/* unmap those still marked mapped */
 	for (Client *c = workspaces[current_ws]; c; c = c->next) {
-		XUnmapWindow(dpy, c->win);
+		if (c->mapped)
+			XUnmapWindow(dpy, c->win);
 	}
 
 	current_ws = ws;
+
+	/* map those still marked mapped */
 	for (Client *c = workspaces[current_ws]; c; c = c->next) {
-		XMapWindow(dpy, c->win);
+		if (c->mapped)
+			XMapWindow(dpy, c->win);
 	}
 
 	tile();
@@ -233,6 +238,7 @@ void change_workspace(int ws)
 	                (unsigned char *)&cd, 1);
 
 	XUngrabServer(dpy);
+	XSync(dpy, False);
 	in_ws_switch = False;
 }
 
@@ -674,16 +680,21 @@ void hdl_map_req(XEvent *xev)
 	XMapRequestEvent *me = &xev->xmaprequest;
 	Window w = me->window;
 
-	/* only manage if on current ws */
+	/* existing clients get remapped and marked as mapped */
 	for (int ws = 0; ws < NUM_WORKSPACES; ws++) {
 		for (Client *c = workspaces[ws]; c; c = c->next) {
 			if (c->win == w) {
+				c->mapped = True;
 				if (c->ws == current_ws)
 					XMapWindow(dpy, w);
+				update_net_client_list();
+				tile();
+				update_borders();
 				return;
 			}
 		}
 	}
+
 	XWindowAttributes wa;
 	if (!XGetWindowAttributes(dpy, w, &wa))
 		return;
@@ -794,6 +805,9 @@ void hdl_map_req(XEvent *xev)
 	else if (c->floating)
 		XRaiseWindow(dpy, w);
 	XMapWindow(dpy, w);
+	for (Client *c = workspaces[current_ws]; c; c = c->next)
+		if (c->win == w)
+			c->mapped = True;
 	update_borders();
 }
 
@@ -910,39 +924,19 @@ void hdl_root_property(XEvent *xev)
 
 void hdl_unmap_ntf(XEvent *xev)
 {
-	if (in_ws_switch) {
-		return;
-	}
-
-	Window w = xev->xunmap.window;
-
-	for (int ws = 0; ws < NUM_WORKSPACES; ws++) {
-		Client *prev = NULL, *c = workspaces[ws];
-		while (c && c->win != w) {
-			prev = c;
-			c = c->next;
-		}
-		if (c) {
-			if (focused == c) {
-				if (c->next)
-					focused = c->next;
-				else if (prev)
-					focused = prev;
-				else
-					focused = NULL;
+	if (!in_ws_switch) {
+		Window w = xev->xunmap.window;
+		for (Client *c = workspaces[current_ws]; c; c = c->next) {
+			if (c->win == w) {
+				c->mapped = False;
+				break;
 			}
-			if (!prev)
-				workspaces[ws] = c->next;
-			else
-				prev->next = c->next;
-			free(c);
-			open_windows--;
-			update_net_client_list();
-			tile();
-			update_borders();
-			break;
 		}
 	}
+
+	update_net_client_list();
+	tile();
+	update_borders();
 }
 
 void update_struts(void)
@@ -1443,19 +1437,18 @@ void spawn(const char **argv)
 
 void tile(void)
 {
-	update_struts();
+	update_struts(); /* fills reserve_top, reserve_bottom */
 
 	Client *head = workspaces[current_ws];
 
-	/* count total non-floating, non-fullscreen windows */
-	int total_tiled_count = 0;
+	int total = 0;
 	for (Client *c = head; c; c = c->next) {
-		if (!c->floating && !c->fullscreen)
-			total_tiled_count++;
+		if (!c->mapped || c->floating || c->fullscreen)
+			continue;
+		total++;
 	}
 
-	/* If exactly one tiled window and it's fullscreen, do nothing */
-	if (total_tiled_count == 1) {
+	if (total == 1) {
 		for (Client *c = head; c; c = c->next) {
 			if (!c->floating && c->fullscreen)
 				return;
@@ -1464,43 +1457,43 @@ void tile(void)
 
 	for (int m = 0; m < monsn; m++) {
 		int mon_x = mons[m].x;
-		int mon_y = mons[m].y;
+		int mon_y = mons[m].y + reserve_top;
 		int mon_w = mons[m].w;
-		int mon_h = mons[m].h;
+		int mon_h = mons[m].h - reserve_top - reserve_bottom;
 
-		int mon_tiled_count = 0;
+		int cnt = 0;
 		for (Client *c = head; c; c = c->next) {
-			if (!c->floating && !c->fullscreen && c->mon == m)
-				mon_tiled_count++;
+			if (!c->mapped || c->floating || c->fullscreen || c->mon != m)
+				continue;
+			cnt++;
 		}
-		if (mon_tiled_count == 0)
+		if (!cnt)
 			continue;
 
-		int tile_x = mon_x + user_config.gaps;
-		int tile_y = mon_y + user_config.gaps;
-		int tile_w = mon_w - 2 * user_config.gaps;
-		int tile_h = mon_h - 2 * user_config.gaps;
+		int gx = user_config.gaps;
+		int gy = user_config.gaps;
+		int tile_x = mon_x + gx;
+		int tile_y = mon_y + gy;
+		int tile_w = mon_w - 2 * gx;
+		int tile_h = mon_h - 2 * gy;
 		if (tile_w < 1)
 			tile_w = 1;
 		if (tile_h < 1)
 			tile_h = 1;
 
-		/* master-stack split */
-		float mfact = user_config.master_width[m];
-		if (mfact < MF_MIN)
-			mfact = MF_MIN;
-		if (mfact > MF_MAX)
-			mfact = MF_MAX;
-
-		int master_w = (mon_tiled_count > 1) ? (int)(tile_w * mfact) : tile_w;
-		int stack_w = tile_w - master_w - ((mon_tiled_count > 1) ? user_config.gaps : 0);
-		int stack_h =
-		    (mon_tiled_count > 1) ? (tile_h - ((mon_tiled_count - 1) * user_config.gaps)) / (mon_tiled_count - 1) : 0;
-
-		int i = 0;
-		int stack_y = tile_y;
+		/* master‐stack split */
+		float mf = user_config.master_width[m];
+		if (mf < MF_MIN)
+			mf = MF_MIN;
+		if (mf > MF_MAX)
+			mf = MF_MAX;
+		int master_w = (cnt > 1) ? (int)(tile_w * mf) : tile_w;
+		int stack_w = tile_w - master_w - ((cnt > 1) ? gx : 0);
+		int stack_h = (cnt > 1) ? (tile_h - (cnt - 1) * gy) / (cnt - 1) : 0;
+
+		int i = 0, sy = tile_y;
 		for (Client *c = head; c; c = c->next) {
-			if (c->floating || c->fullscreen || c->mon != m)
+			if (!c->mapped || c->floating || c->fullscreen || c->mon != m)
 				continue;
 
 			XWindowChanges wc = {.border_width = user_config.border_width};
@@ -1515,12 +1508,12 @@ void tile(void)
 			}
 			else {
 				/* stack */
-				wc.x = tile_x + master_w + user_config.gaps;
-				wc.y = stack_y;
-				int this_h = (i == mon_tiled_count - 1) ? (tile_y + tile_h - stack_y) : stack_h;
+				wc.x = tile_x + master_w + gx;
+				wc.y = sy;
+				int h = (i == cnt - 1) ? (tile_y + tile_h - sy) : stack_h;
 				wc.width = MAX(1, stack_w - bw2);
-				wc.height = MAX(1, this_h - bw2);
-				stack_y += this_h + user_config.gaps;
+				wc.height = MAX(1, h - bw2);
+				sy += h + gy;
 			}
 
 			XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
@@ -1528,10 +1521,10 @@ void tile(void)
 			c->y = wc.y;
 			c->w = wc.width;
 			c->h = wc.height;
-
 			i++;
 		}
 	}
+
 	update_borders();
 }
 
-- 
cgit v1.2.3


From fe66c602b5d540f2e20ef346b5acfa64ef611ca7 Mon Sep 17 00:00:00 2001
From: Abhinav <abhinav.prsai@gmail.com>
Date: Thu, 29 May 2025 15:18:07 +0100
Subject: update changelog

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e5a064..1db9d69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+#### v1.6 (current)
+- **NEW**: True multi-monitor support
+- **FIXED**: Invisible windows of minimized programs
+- **FIXED**: Zombie processes spawned from apps
+- **FIXED**: Invalid sample config
+- **FIXED**: Undefined behaviour in `parse_col`
+
 #### v1.5
 - **NEW**: Using XCursor instead of cursor font && new logo.
 - **FIXED**: Proper bind resetting on refresh config. && Multi-arg binds now work due to new and improved spawn function
-- 
cgit v1.2.3


From 50fb82ec80847c7dca113d3f848b0bf75be6df92 Mon Sep 17 00:00:00 2001
From: Abhinav <abhinav.prsai@gmail.com>
Date: Thu, 29 May 2025 15:42:35 +0100
Subject: allow mod + alt

---
 default_sxrc   | 72 ----------------------------------------------------------
 default_sxwmrc | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/parser.c   |  8 -------
 src/sxwm.c     | 72 ++++++++++++++++++++++++++++++++++------------------------
 4 files changed, 114 insertions(+), 110 deletions(-)
 delete mode 100644 default_sxrc
 create mode 100644 default_sxwmrc

diff --git a/default_sxrc b/default_sxrc
deleted file mode 100644
index c318190..0000000
--- a/default_sxrc
+++ /dev/null
@@ -1,72 +0,0 @@
-# Colour Themes:
-focused_border_colour    : #c0cbff
-unfocused_border_colour  : #555555
-swap_border_colour       : #fff4c0
-
-# General Options:
-gaps                    : 10
-border_width            : 1
-master_width            : 60 # Percentage of screen width
-resize_master_amount    : 1
-snap_distance           : 5
-motion_throttle         : 60 # Set to screen refresh rate for smoothest motions
-should_float            : st
-
-# Keybinds:
-# Commands must be surrounded with ""
-# Function calls don't need this
-
-mod_key : super
-
-# Application Launchers:
-bind : mod + Return : "st"
-bind : mod + b : "firefox"
-bind : mod + p : "dmenu_run"
-
-# Window Management:
-call : mod + shift + q : close_window
-call : mod + shift + e : quit
-
-# Focus Movement:
-call : mod + j : focus_next
-call : mod + k : focus_prev
-
-# Master/Stack Movement
-call : mod + shift + j : master_next
-call : mod + shift + k : master_previous
-
-# Master Area Resize
-call : mod + l : master_increase
-call : mod + h : master_decrease
-
-# Gaps 
-call : mod + equal : increase_gaps
-call : mod + minus : decrease_gaps
-
-# Floating/Fullscreen
-call : mod + space : toggle_floating
-call : mod + shift + space : global_floating
-call : mod + shift + f : fullscreen
-
-# Reload Config
-call : mod + r : reload_config
-
-# Workspaces (1-9)
-workspace : mod + 1          : move 1
-workspace : mod + shift + 1  : swap 1
-workspace : mod + 2          : move 2
-workspace : mod + shift + 2  : swap 2
-workspace : mod + 3          : move 3
-workspace : mod + shift + 3  : swap 3
-workspace : mod + 4          : move 4
-workspace : mod + shift + 4  : swap 4
-workspace : mod + 5          : move 5
-workspace : mod + shift + 5  : swap 5
-workspace : mod + 6          : move 6
-workspace : mod + shift + 6  : swap 6
-workspace : mod + 7          : move 7
-workspace : mod + shift + 7  : swap 7
-workspace : mod + 8          : move 8
-workspace : mod + shift + 8  : swap 8
-workspace : mod + 9          : move 9
-workspace : mod + shift + 9  : swap 9
diff --git a/default_sxwmrc b/default_sxwmrc
new file mode 100644
index 0000000..c318190
--- /dev/null
+++ b/default_sxwmrc
@@ -0,0 +1,72 @@
+# Colour Themes:
+focused_border_colour    : #c0cbff
+unfocused_border_colour  : #555555
+swap_border_colour       : #fff4c0
+
+# General Options:
+gaps                    : 10
+border_width            : 1
+master_width            : 60 # Percentage of screen width
+resize_master_amount    : 1
+snap_distance           : 5
+motion_throttle         : 60 # Set to screen refresh rate for smoothest motions
+should_float            : st
+
+# Keybinds:
+# Commands must be surrounded with ""
+# Function calls don't need this
+
+mod_key : super
+
+# Application Launchers:
+bind : mod + Return : "st"
+bind : mod + b : "firefox"
+bind : mod + p : "dmenu_run"
+
+# Window Management:
+call : mod + shift + q : close_window
+call : mod + shift + e : quit
+
+# Focus Movement:
+call : mod + j : focus_next
+call : mod + k : focus_prev
+
+# Master/Stack Movement
+call : mod + shift + j : master_next
+call : mod + shift + k : master_previous
+
+# Master Area Resize
+call : mod + l : master_increase
+call : mod + h : master_decrease
+
+# Gaps 
+call : mod + equal : increase_gaps
+call : mod + minus : decrease_gaps
+
+# Floating/Fullscreen
+call : mod + space : toggle_floating
+call : mod + shift + space : global_floating
+call : mod + shift + f : fullscreen
+
+# Reload Config
+call : mod + r : reload_config
+
+# Workspaces (1-9)
+workspace : mod + 1          : move 1
+workspace : mod + shift + 1  : swap 1
+workspace : mod + 2          : move 2
+workspace : mod + shift + 2  : swap 2
+workspace : mod + 3          : move 3
+workspace : mod + shift + 3  : swap 3
+workspace : mod + 4          : move 4
+workspace : mod + shift + 4  : swap 4
+workspace : mod + 5          : move 5
+workspace : mod + shift + 5  : swap 5
+workspace : mod + 6          : move 6
+workspace : mod + shift + 6  : swap 6
+workspace : mod + 7          : move 7
+workspace : mod + shift + 7  : swap 7
+workspace : mod + 8          : move 8
+workspace : mod + shift + 8  : swap 8
+workspace : mod + 9          : move 9
+workspace : mod + shift + 9  : swap 9
diff --git a/src/parser.c b/src/parser.c
index 0d086a2..eb6ba21 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -32,14 +32,6 @@ static const struct {
 
 static void remap_and_dedupe_binds(Config *cfg)
 {
-	for (int i = 0; i < cfg->bindsn; i++) {
-		Binding *b = &cfg->binds[i];
-		if (b->mods & (Mod1Mask | Mod4Mask)) {
-			unsigned others = b->mods & ~(Mod1Mask | Mod4Mask);
-			b->mods = others | cfg->modkey;
-		}
-	}
-
 	for (int i = 0; i < cfg->bindsn; i++) {
 		for (int j = i + 1; j < cfg->bindsn; j++) {
 			if (cfg->binds[i].mods == cfg->binds[j].mods && cfg->binds[i].keysym == cfg->binds[j].keysym) {
diff --git a/src/sxwm.c b/src/sxwm.c
index c7d041d..91c0839 100644
--- a/src/sxwm.c
+++ b/src/sxwm.c
@@ -537,42 +537,54 @@ void hdl_destroy_ntf(XEvent *xev)
 {
 	Window w = xev->xdestroywindow.window;
 
-	Client *prev = NULL, *c = workspaces[current_ws];
-	while (c && c->win != w) {
-		prev = c;
-		c = c->next;
-	}
-	if (c) {
-		if (focused == c) {
-			if (c->next) {
-				focused = c->next;
+	// Search all workspaces, not just current one
+	for (int ws = 0; ws < NUM_WORKSPACES; ws++) {
+		Client *prev = NULL, *c = workspaces[ws];
+		while (c && c->win != w) {
+			prev = c;
+			c = c->next;
+		}
+		if (c) {
+			// Update focused if this was the focused client
+			if (focused == c) {
+				if (c->next) {
+					focused = c->next;
+				}
+				else if (prev) {
+					focused = prev;
+				}
+				else {
+					// If this was the only client in current workspace, find next client
+					if (ws == current_ws) {
+						focused = NULL;
+					}
+				}
 			}
-			else if (prev) {
-				focused = prev;
+
+			// Remove from linked list
+			if (!prev) {
+				workspaces[ws] = c->next;
 			}
 			else {
-				focused = NULL;
+				prev->next = c->next;
 			}
-		}
 
-		if (!prev) {
-			workspaces[current_ws] = c->next;
-		}
-		else {
-			prev->next = c->next;
-		}
+			free(c);
+			update_net_client_list();
+			open_windows--;
 
-		free(c);
-		update_net_client_list();
-		open_windows--;
-	}
-
-	tile();
-	update_borders();
+			// Only tile and update borders if we're dealing with current workspace
+			if (ws == current_ws) {
+				tile();
+				update_borders();
 
-	if (focused) {
-		XSetInputFocus(dpy, focused->win, RevertToPointerRoot, CurrentTime);
-		XRaiseWindow(dpy, focused->win);
+				if (focused) {
+					XSetInputFocus(dpy, focused->win, RevertToPointerRoot, CurrentTime);
+					XRaiseWindow(dpy, focused->win);
+				}
+			}
+			return; // Found and removed the client, we're done
+		}
 	}
 }
 
@@ -1754,4 +1766,4 @@ int main(int ac, char **av)
 	printf("sxwm: starting...\n");
 	run();
 	return 0;
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3