Merge branch 'main' into main

3 files changed, 180 insertions, 156 deletions

diff --git a/src/defs.h b/src/defs.h
index d90ab61..0a71029 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -13,10 +13,12 @@
 #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])
 #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 }
@@ -71,6 +73,7 @@ typedef struct Client{
 	Bool fixed;
 	Bool floating;
 	Bool fullscreen;
+	Bool mapped;
 	struct Client *next;
 } Client;
 
@@ -81,7 +84,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 85b6d20..c2c6e23 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -33,14 +33,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) {
 				memmove(&cfg->binds[j], &cfg->binds[j + 1], sizeof(Binding) * (cfg->bindsn - j - 1));
@@ -168,6 +160,7 @@ int parser(Config *cfg)
 found:
 	if (0) {
 	} // label followed by declaration is a C23 extension
+
 	FILE *f = fopen(path, "r");
 	if (!f) {
 		fprintf(stderr, "sxwmrc: cannot open %s\n", path);
@@ -223,7 +216,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);
diff --git a/src/sxwm.c b/src/sxwm.c
index eb90d8a..3140412 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); */
@@ -118,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;
@@ -169,25 +171,27 @@ 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;
+	c->mapped = True;
 
 	if (global_floating) {
 		c->floating = True;
@@ -203,19 +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();
@@ -229,6 +238,8 @@ void change_workspace(int ws)
 	                (unsigned char *)&cd, 1);
 
 	XUngrabServer(dpy);
+	XSync(dpy, False);
+	in_ws_switch = False;
 }
 
 int clean_mask(int mask)
@@ -526,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
+		}
 	}
 }
 
@@ -591,6 +614,7 @@ void hdl_keypress(XEvent *xev)
 			switch (b->type) {
 				case TYPE_CMD:
 					spawn(b->action.cmd);
+
 					next_should_float = False;
 					for (int j = 0; j < 256; j++) {
 						Bool all_matching = True;
@@ -610,6 +634,7 @@ void hdl_keypress(XEvent *xev)
                             }
                         }
 						if (all_matching) {
+
 							next_should_float = True;
 							break;
 						}
@@ -680,16 +705,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;
@@ -735,7 +765,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;
@@ -794,12 +824,15 @@ 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);
+	for (Client *c = workspaces[current_ws]; c; c = c->next)
+		if (c->win == w)
+			c->mapped = True;
 	update_borders();
 }
 
@@ -914,6 +947,23 @@ void hdl_root_property(XEvent *xev)
 	}
 }
 
+void hdl_unmap_ntf(XEvent *xev)
+{
+	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;
+			}
+		}
+	}
+
+	update_net_client_list();
+	tile();
+	update_borders();
+}
+
 void update_struts(void)
 {
 	reserve_left = reserve_right = reserve_top = reserve_bottom = 0;
@@ -988,7 +1038,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;
@@ -1108,6 +1160,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;
 }
 
@@ -1163,8 +1216,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();
@@ -1172,8 +1229,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();
@@ -1284,9 +1345,10 @@ 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 */
+	signal(SIGCHLD, SIG_IGN); /* prevent child processes from becoming zombies */
 }
 
 void setup_atoms(void)
@@ -1400,133 +1462,85 @@ 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;
+	update_struts(); /* fills reserve_top, reserve_bottom */
 
 	Client *head = workspaces[current_ws];
-	int total_tiled_count = 0;
 
+	int total = 0;
 	for (Client *c = head; c; c = c->next) {
-		if (!c->floating) {
-			c->mon = get_monitor_for(c);
-			if (!c->fullscreen) {
-				total_tiled_count++;
-			}
-		}
+		if (!c->mapped || c->floating || c->fullscreen)
+			continue;
+		total++;
 	}
 
-	if (total_tiled_count == 1) {
-		Client *single = NULL;
+	if (total == 1) {
 		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;
 		}
 	}
 
 	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 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_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 || usable_w <= 0 || usable_h <= 0) {
+		if (!cnt)
 			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 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;
 
-		float mfact = user_config.master_width;
-		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) > 0)
-		                  ? (tile_h - ((mon_tiled_count - 1) * user_config.gaps)) / (mon_tiled_count - 1)
-		                  : 0;
-
-		int i = 0, 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};
-			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 {
-				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;
-				stack_y += this_h + user_config.gaps;
+				/* stack */
+				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, h - bw2);
+				sy += h + gy;
 			}
 
-			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;
@@ -1535,6 +1549,7 @@ void tile(void)
 			i++;
 		}
 	}
+
 	update_borders();
 }
 
@@ -1565,11 +1580,17 @@ void toggle_floating(void)
 			    &(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);
@@ -1640,6 +1661,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();
 	}
@@ -1754,4 +1779,4 @@ int main(int ac, char **av)
 	printf("sxwm: starting...\n");
 	run();
 	return 0;
-}
+}
\ No newline at end of file