Faris
/
dwm
mirror of git://git.suckless.org/dwm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some hotfix cleanup related to wild selmon-> destruction

This commit is contained in:
Anselm R Garbe 2009-06-24 11:14:51 +01:00
parent 5c4913e983
commit cdb8e27453
1 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dwm.c
View File

@ -1,4 +1,4 @@
#define XINULATOR /* debug, simulates dual head */ //#define XINULATOR /* debug, simulates dual head */
/* See LICENSE file for copyright and license details. /* See LICENSE file for copyright and license details.
* *
* dynamic window manager is designed like any other X client as well. It is * dynamic window manager is designed like any other X client as well. It is
@ -1649,9 +1649,11 @@ updatebarpos(Monitor *m) {
void void
updategeom(void) { updategeom(void) {
int i, n = 1; int i, di, n = 1, x, y;
unsigned int dui;
Client *c; Client *c;
Monitor *newmons = NULL, *m, *tm; Monitor *newmons = NULL, *m, *tm;
Window dummy;
#ifdef XINULATOR #ifdef XINULATOR
n = 2; n = 2;
@ -1720,16 +1722,6 @@ updategeom(void) {
m->showbar = showbar; m->showbar = showbar;
m->topbar = topbar; m->topbar = topbar;
updatebarpos(m); 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 */ /* reassign left over clients of disappeared monitors */
@ -1744,18 +1736,13 @@ updategeom(void) {
} }
/* select focused monitor */ /* select focused monitor */
if(!selmon) {
selmon = newmons; selmon = newmons;
int di, x, y;
unsigned int dui;
Window dummy;
if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui)) if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui))
for(m = newmons; m; m = m->next) for(m = newmons; m; m = m->next)
if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh)) { if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh)) {
selmon = m; selmon = m;
break; break;
} }
}
/* final assignment of new monitors */ /* final assignment of new monitors */
cleanupmons(); cleanupmons();