git.stevedylan.dev

some hotfix cleanup related to wild selmon-> destruction cdb8e274

Anselm R Garbe · 2009-06-24 11:14 1 file(s) · +11 −24

dwm.c +11 −24

#define XINULATOR /* debug, simulates dual head */
//#define XINULATOR /* debug, simulates dual head */
/* See LICENSE file for copyright and license details.
 *
 * dynamic window manager is designed like any other X client as well. It is


void
updategeom(void) {
	int i, n = 1;
	int i, di, n = 1, x, y;
	unsigned int dui;
	Client *c;
	Monitor *newmons = NULL, *m, *tm;
	Window dummy;

#ifdef XINULATOR
	n = 2;

		m->showbar = showbar;
		m->topbar = topbar;
		updatebarpos(m);
		/* reassign all clients with same screen number */
		for(tm = mons; tm; tm = tm->next)
			if(tm->screen_number == m->screen_number) {
				m->clients = tm->clients;
				m->sel = m->stack = tm->stack;
				tm->clients = NULL;
				tm->stack = NULL;
				for(c = m->clients; c; c = c->next)
					c->mon = m;
			}
	}

	/* reassign left over clients of disappeared monitors */

	}

	/* select focused monitor */
	if(!selmon) {
		selmon = newmons;
		int di, x, y;
		unsigned int dui;
		Window dummy;
		if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui)) 
			for(m = newmons; m; m = m->next)
				if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh)) {
					selmon = m;
					break;
				}
	}
	selmon = newmons;
	if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui)) 
		for(m = newmons; m; m = m->next)
			if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh)) {
				selmon = m;
				break;
			}

	/* final assignment of new monitors */
	cleanupmons();

1		-	#define XINULATOR /* debug, simulates dual head */
	1	+	//#define XINULATOR /* debug, simulates dual head */
2	2		/* See LICENSE file for copyright and license details.
3	3		*
4	4		* dynamic window manager is designed like any other X client as well. It is

1649	1649
1650	1650		void
1651	1651		updategeom(void) {
1652		-	int i, n = 1;
	1652	+	int i, di, n = 1, x, y;
	1653	+	unsigned int dui;
1653	1654		Client *c;
1654	1655		Monitor newmons = NULL, m, *tm;
	1656	+	Window dummy;
1655	1657
1656	1658		#ifdef XINULATOR
1657	1659		n = 2;

1720	1722		m->showbar = showbar;
1721	1723		m->topbar = topbar;
1722	1724		updatebarpos(m);
1723		-	/* reassign all clients with same screen number */
1724		-	for(tm = mons; tm; tm = tm->next)
1725		-	if(tm->screen_number == m->screen_number) {
1726		-	m->clients = tm->clients;
1727		-	m->sel = m->stack = tm->stack;
1728		-	tm->clients = NULL;
1729		-	tm->stack = NULL;
1730		-	for(c = m->clients; c; c = c->next)
1731		-	c->mon = m;
1732		-	}
1733	1725		}
1734	1726
1735	1727		/* reassign left over clients of disappeared monitors */

1744	1736		}
1745	1737
1746	1738		/* select focused monitor */
1747		-	if(!selmon) {
1748		-	selmon = newmons;
1749		-	int di, x, y;
1750		-	unsigned int dui;
1751		-	Window dummy;
1752		-	if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
1753		-	for(m = newmons; m; m = m->next)
1754		-	if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh)) {
1755		-	selmon = m;
1756		-	break;
1757		-	}
1758		-	}
	1739	+	selmon = newmons;
	1740	+	if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
	1741	+	for(m = newmons; m; m = m->next)
	1742	+	if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh)) {
	1743	+	selmon = m;
	1744	+	break;
	1745	+	}
1759	1746
1760	1747		/* final assignment of new monitors */
1761	1748		cleanupmons();