Chewing_Bever
/
dwm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

moved clients/stack/sel to Monitor, that's a per monitor structure from now on

master
Anselm R Garbe 2009-06-23 17:17:25 +01:00
parent 0d8671a5ad
commit d702f39274
1 changed files with 111 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

194
dwm.c
View File

@ -1,3 +1,4 @@
/* TODO: cleanup nexttiled, ISVISIBLE, etc */
/* 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
@ -44,7 +45,7 @@
#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) #define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask)) #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH)) #define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
#define ISVISIBLE(M, C) ((M) == (C->m) && (C->tags & M->tagset[M->seltags])) #define ISVISIBLE(M, C) ((M) == (C->mon) && (C->tags & M->tagset[M->seltags]))
#define LENGTH(X) (sizeof X / sizeof X[0]) #define LENGTH(X) (sizeof X / sizeof X[0])
#define MAX(A, B) ((A) > (B) ? (A) : (B)) #define MAX(A, B) ((A) > (B) ? (A) : (B))
#define MIN(A, B) ((A) < (B) ? (A) : (B)) #define MIN(A, B) ((A) < (B) ? (A) : (B))
@ -89,7 +90,7 @@ struct Client {
Bool isfixed, isfloating, isurgent; Bool isfixed, isfloating, isurgent;
Client *next; Client *next;
Client *snext; Client *snext;
Monitor *m; Monitor *mon;
Window win; Window win;
}; };
@ -131,8 +132,11 @@ struct Monitor {
unsigned int tagset[2]; unsigned int tagset[2];
Bool showbar; Bool showbar;
Bool topbar; Bool topbar;
Window barwin; Client *clients;
Client *sel;
Client *stack;
Monitor *next; Monitor *next;
Window barwin;
}; };
typedef struct { typedef struct {
@ -251,9 +255,6 @@ static void (*handler[LASTEvent]) (XEvent *) = {
static Atom wmatom[WMLast], netatom[NetLast]; static Atom wmatom[WMLast], netatom[NetLast];
static Bool otherwm; static Bool otherwm;
static Bool running = True; static Bool running = True;
static Client *clients = NULL;
static Client *sel = NULL;
static Client *stack = NULL;
static Cursor cursor[CurLast]; static Cursor cursor[CurLast];
static Display *dpy; static Display *dpy;
static DC dc; static DC dc;
@ -290,7 +291,7 @@ applyrules(Client *c) {
if(ch.res_name) if(ch.res_name)
XFree(ch.res_name); XFree(ch.res_name);
} }
c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->m->tagset[c->m->seltags]; c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
} }
Bool Bool
@ -362,7 +363,9 @@ void
arrange(void) { arrange(void) {
Monitor *m; Monitor *m;
showhide(stack); /* optimise two loops into one, check focus(NULL) */
for(m = mons; m; m = m->next)
showhide(m->stack);
focus(NULL); focus(NULL);
for(m = mons; m; m = m->next) { for(m = mons; m; m = m->next) {
if(lt[m->sellt]->arrange) if(lt[m->sellt]->arrange)
@ -373,14 +376,14 @@ arrange(void) {
void void
attach(Client *c) { attach(Client *c) {
c->next = clients; c->next = selmon->clients;
clients = c; selmon->clients = c;
} }
void void
attachstack(Client *c) { attachstack(Client *c) {
c->snext = stack; c->snext = selmon->stack;
stack = c; selmon->stack = c;
} }
void void
@ -437,11 +440,15 @@ void
cleanup(void) { cleanup(void) {
Arg a = {.ui = ~0}; Arg a = {.ui = ~0};
Layout foo = { "", NULL }; Layout foo = { "", NULL };
Monitor *m;
view(&a); view(&a);
lt[selmon->sellt] = &foo; lt[selmon->sellt] = &foo;
while(stack)
unmanage(stack); /* TODO: consider simplifying cleanup code of the stack, perhaps do that in cleanmons() ? */
for(m = mons; m; m = m->next)
while(m->stack)
unmanage(m->stack);
if(dc.font.set) if(dc.font.set)
XFreeFontSet(dpy, dc.font.set); XFreeFontSet(dpy, dc.font.set);
else else
@ -543,7 +550,7 @@ configurerequest(XEvent *e) {
c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */ c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight))) if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
configure(c); configure(c);
if(ISVISIBLE((c->m), c)) if(ISVISIBLE((c->mon), c))
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
} }
else else
@ -575,7 +582,7 @@ void
detach(Client *c) { detach(Client *c) {
Client **tc; Client **tc;
for(tc = &clients; *tc && *tc != c; tc = &(*tc)->next); for(tc = &c->mon->clients; *tc && *tc != c; tc = &(*tc)->next);
*tc = c->next; *tc = c->next;
} }
@ -583,7 +590,7 @@ void
detachstack(Client *c) { detachstack(Client *c) {
Client **tc; Client **tc;
for(tc = &stack; *tc && *tc != c; tc = &(*tc)->snext); for(tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext);
*tc = c->snext; *tc = c->snext;
} }
@ -604,12 +611,10 @@ drawbar(Monitor *m) {
unsigned long *col; unsigned long *col;
Client *c; Client *c;
for(c = clients; c; c = c->next) { for(c = m->clients; c; c = c->next) {
if(m == c->m) { occ |= c->tags;
occ |= c->tags; if(c->isurgent)
if(c->isurgent) urg |= c->tags;
urg |= c->tags;
}
} }
dc.x = 0; dc.x = 0;
@ -628,7 +633,7 @@ drawbar(Monitor *m) {
dc.w = TEXTW(tags[i]); dc.w = TEXTW(tags[i]);
col = m->tagset[m->seltags] & 1 << i ? dc.sel : dc.norm; col = m->tagset[m->seltags] & 1 << i ? dc.sel : dc.norm;
drawtext(tags[i], col, urg & 1 << i); drawtext(tags[i], col, urg & 1 << i);
drawsquare(m == selmon && sel && sel->tags & 1 << i, drawsquare(m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
occ & 1 << i, urg & 1 << i, col); occ & 1 << i, urg & 1 << i, col);
dc.x += dc.w; dc.x += dc.w;
} }
@ -649,9 +654,9 @@ drawbar(Monitor *m) {
drawtext(stext, dc.norm, False); drawtext(stext, dc.norm, False);
if((dc.w = dc.x - x) > bh) { if((dc.w = dc.x - x) > bh) {
dc.x = x; dc.x = x;
if(sel) { if(selmon->sel) {
drawtext(sel->name, dc.sel, False); drawtext(selmon->sel->name, dc.sel, False);
drawsquare(sel->isfixed, sel->isfloating, False, dc.sel); drawsquare(selmon->sel->isfixed, selmon->sel->isfloating, False, dc.sel);
} }
else else
drawtext(NULL, dc.norm, False); drawtext(NULL, dc.norm, False);
@ -751,11 +756,11 @@ expose(XEvent *e) {
void void
focus(Client *c) { focus(Client *c) {
if(!c || !ISVISIBLE((c->m), c)) if(!c || !ISVISIBLE((c->mon), c))
for(c = stack; c && !ISVISIBLE(selmon, c); c = c->snext); for(c = selmon->stack; c && !ISVISIBLE(selmon, c); c = c->snext);
if(sel && sel != c) { if(selmon->sel && selmon->sel != c) {
grabbuttons(sel, False); grabbuttons(selmon->sel, False);
XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]); XSetWindowBorder(dpy, selmon->sel->win, dc.norm[ColBorder]);
} }
if(c) { if(c) {
if(c->isurgent) if(c->isurgent)
@ -768,7 +773,7 @@ focus(Client *c) {
} }
else else
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
sel = c; selmon->sel = c;
drawbars(); drawbars();
} }
@ -776,8 +781,8 @@ void
focusin(XEvent *e) { /* there are some broken focus acquiring clients */ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
XFocusChangeEvent *ev = &e->xfocus; XFocusChangeEvent *ev = &e->xfocus;
if(sel && ev->window != sel->win) if(selmon->sel && ev->window != selmon->sel->win)
XSetInputFocus(dpy, sel->win, RevertToPointerRoot, CurrentTime); XSetInputFocus(dpy, selmon->sel->win, RevertToPointerRoot, CurrentTime);
} }
#ifdef XINERAMA #ifdef XINERAMA
@ -800,15 +805,15 @@ void
focusstack(const Arg *arg) { focusstack(const Arg *arg) {
Client *c = NULL, *i; Client *c = NULL, *i;
if(!sel) if(!selmon->sel)
return; return;
if(arg->i > 0) { if(arg->i > 0) {
for(c = sel->next; c && !ISVISIBLE(selmon, c); c = c->next); for(c = selmon->sel->next; c && !ISVISIBLE(selmon, c); c = c->next);
if(!c) if(!c)
for(c = clients; c && !ISVISIBLE(selmon, c); c = c->next); for(c = selmon->clients; c && !ISVISIBLE(selmon, c); c = c->next);
} }
else { else {
for(i = clients; i != sel; i = i->next) for(i = selmon->clients; i != selmon->sel; i = i->next)
if(ISVISIBLE(selmon, i)) if(ISVISIBLE(selmon, i))
c = i; c = i;
if(!c) if(!c)
@ -824,9 +829,11 @@ focusstack(const Arg *arg) {
Client * Client *
getclient(Window w) { getclient(Window w) {
Client *c; Client *c = NULL;
Monitor *m;
for(c = clients; c && c->win != w; c = c->next); for(m = mons; m; m = m->next)
for(c = m->clients; c && c->win != w; c = c->next);
return c; return c;
} }
@ -992,19 +999,19 @@ void
killclient(const Arg *arg) { killclient(const Arg *arg) {
XEvent ev; XEvent ev;
if(!sel) if(!selmon->sel)
return; return;
if(isprotodel(sel)) { if(isprotodel(selmon->sel)) {
ev.type = ClientMessage; ev.type = ClientMessage;
ev.xclient.window = sel->win; ev.xclient.window = selmon->sel->win;
ev.xclient.message_type = wmatom[WMProtocols]; ev.xclient.message_type = wmatom[WMProtocols];
ev.xclient.format = 32; ev.xclient.format = 32;
ev.xclient.data.l[0] = wmatom[WMDelete]; ev.xclient.data.l[0] = wmatom[WMDelete];
ev.xclient.data.l[1] = CurrentTime; ev.xclient.data.l[1] = CurrentTime;
XSendEvent(dpy, sel->win, False, NoEventMask, &ev); XSendEvent(dpy, selmon->sel->win, False, NoEventMask, &ev);
} }
else else
XKillClient(dpy, sel->win); XKillClient(dpy, selmon->sel->win);
} }
void void
@ -1018,7 +1025,7 @@ manage(Window w, XWindowAttributes *wa) {
die("fatal: could not malloc() %u bytes\n", sizeof(Client)); die("fatal: could not malloc() %u bytes\n", sizeof(Client));
*c = cz; *c = cz;
c->win = w; c->win = w;
c->m = selmon; c->mon = selmon;
/* geometry */ /* geometry */
c->x = wa->x; c->x = wa->x;
@ -1095,7 +1102,7 @@ void
monocle(Monitor *m) { monocle(Monitor *m) {
Client *c; Client *c;
for(c = nexttiled(m, clients); c; c = nexttiled(m, c->next)) for(c = nexttiled(m, selmon->clients); c; c = nexttiled(m, c->next))
resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw); resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw);
} }
@ -1107,7 +1114,7 @@ movemouse(const Arg *arg) {
Window dummy; Window dummy;
XEvent ev; XEvent ev;
if(!(c = sel)) if(!(c = selmon->sel))
return; return;
restack(selmon); restack(selmon);
ocx = c->x; ocx = c->x;
@ -1185,7 +1192,7 @@ propertynotify(XEvent *e) {
} }
if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) { if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
updatetitle(c); updatetitle(c);
if(c == sel) if(c == selmon->sel)
drawbars(); drawbars();
} }
} }
@ -1220,7 +1227,7 @@ resizemouse(const Arg *arg) {
Client *c; Client *c;
XEvent ev; XEvent ev;
if(!(c = sel)) if(!(c = selmon->sel))
return; return;
restack(selmon); restack(selmon);
ocx = c->x; ocx = c->x;
@ -1265,14 +1272,14 @@ restack(Monitor *m) {
XWindowChanges wc; XWindowChanges wc;
drawbars(); drawbars();
if(!sel) if(!selmon->sel)
return; return;
if(m == selmon && (sel->isfloating || !lt[m->sellt]->arrange)) if(m == selmon && (selmon->sel->isfloating || !lt[m->sellt]->arrange))
XRaiseWindow(dpy, sel->win); XRaiseWindow(dpy, selmon->sel->win);
if(lt[m->sellt]->arrange) { if(lt[m->sellt]->arrange) {
wc.stack_mode = Below; wc.stack_mode = Below;
wc.sibling = m->barwin; wc.sibling = m->barwin;
for(c = stack; c; c = c->snext) for(c = m->stack; c; c = c->snext)
if(!c->isfloating && ISVISIBLE(m, c)) { if(!c->isfloating && ISVISIBLE(m, c)) {
XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc); XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
wc.sibling = c->win; wc.sibling = c->win;
@ -1334,7 +1341,7 @@ setlayout(const Arg *arg) {
selmon->sellt ^= 1; selmon->sellt ^= 1;
if(arg && arg->v) if(arg && arg->v)
lt[selmon->sellt] = (Layout *)arg->v; lt[selmon->sellt] = (Layout *)arg->v;
if(sel) if(selmon->sel)
arrange(); arrange();
else else
drawbars(); drawbars();
@ -1425,9 +1432,9 @@ void
showhide(Client *c) { showhide(Client *c) {
if(!c) if(!c)
return; return;
if(ISVISIBLE((c->m), c)) { /* show clients top down */ if(ISVISIBLE((c->mon), c)) { /* show clients top down */
XMoveWindow(dpy, c->win, c->x, c->y); XMoveWindow(dpy, c->win, c->x, c->y);
if(!lt[c->m->sellt]->arrange || c->isfloating) if(!lt[c->mon->sellt]->arrange || c->isfloating)
resize(c, c->x, c->y, c->w, c->h); resize(c, c->x, c->y, c->w, c->h);
showhide(c->snext); showhide(c->snext);
} }
@ -1459,8 +1466,8 @@ spawn(const Arg *arg) {
void void
tag(const Arg *arg) { tag(const Arg *arg) {
if(sel && arg->ui & TAGMASK) { if(selmon->sel && arg->ui & TAGMASK) {
sel->tags = arg->ui & TAGMASK; selmon->sel->tags = arg->ui & TAGMASK;
arrange(); arrange();
} }
} }
@ -1473,7 +1480,7 @@ tagmon(const Arg *arg) {
for(i = 0, m = mons; m; m = m->next, i++) for(i = 0, m = mons; m; m = m->next, i++)
if(i == arg->ui) { if(i == arg->ui) {
sel->m = m; selmon->sel->m = m;
arrange(); arrange();
break; break;
} }
@ -1497,12 +1504,12 @@ tile(Monitor *m) {
unsigned int i, n; unsigned int i, n;
Client *c; Client *c;
for(n = 0, c = nexttiled(m, clients); c; c = nexttiled(m, c->next), n++); for(n = 0, c = nexttiled(m, m->clients); c; c = nexttiled(m, c->next), n++);
if(n == 0) if(n == 0)
return; return;
/* master */ /* master */
c = nexttiled(m, clients); c = nexttiled(m, m->clients);
mw = m->mfact * m->ww; mw = m->mfact * m->ww;
resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw); resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw);
@ -1535,11 +1542,11 @@ togglebar(const Arg *arg) {
void void
togglefloating(const Arg *arg) { togglefloating(const Arg *arg) {
if(!sel) if(!selmon->sel)
return; return;
sel->isfloating = !sel->isfloating || sel->isfixed; selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
if(sel->isfloating) if(selmon->sel->isfloating)
resize(sel, sel->x, sel->y, sel->w, sel->h); resize(selmon->sel, selmon->sel->x, selmon->sel->y, selmon->sel->w, selmon->sel->h);
arrange(); arrange();
} }
@ -1547,12 +1554,12 @@ void
toggletag(const Arg *arg) { toggletag(const Arg *arg) {
unsigned int mask; unsigned int mask;
if(!sel) if(!selmon->sel)
return; return;
mask = sel->tags ^ (arg->ui & TAGMASK); mask = selmon->sel->tags ^ (arg->ui & TAGMASK);
if(mask) { if(mask) {
sel->tags = mask; selmon->sel->tags = mask;
arrange(); arrange();
} }
} }
@ -1578,7 +1585,7 @@ unmanage(Client *c) {
XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */ XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
detach(c); detach(c);
detachstack(c); detachstack(c);
if(sel == c) if(selmon->sel == c)
focus(NULL); focus(NULL);
XUngrabButton(dpy, AnyButton, AnyModifier, c->win); XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
setclientstate(c, WithdrawnState); setclientstate(c, WithdrawnState);
@ -1634,7 +1641,7 @@ void
updategeom(void) { updategeom(void) {
int i, n = 1; int i, n = 1;
Client *c; Client *c;
Monitor *newmons = NULL, *m; Monitor *newmons = NULL, *m, *tm;
#ifdef XINERAMA #ifdef XINERAMA
XineramaScreenInfo *info = NULL; XineramaScreenInfo *info = NULL;
@ -1675,6 +1682,9 @@ updategeom(void) {
/* bar geometry setup */ /* bar geometry setup */
for(m = newmons; m; m = m->next) { for(m = newmons; m; m = m->next) {
/* TODO: consider removing the following values from config.h */ /* TODO: consider removing the following values from config.h */
m->clients = NULL;
m->sel = NULL;
m->stack = NULL;
m->seltags = 0; m->seltags = 0;
m->sellt = 0; m->sellt = 0;
m->tagset[0] = m->tagset[1] = 1; m->tagset[0] = m->tagset[1] = 1;
@ -1683,15 +1693,33 @@ updategeom(void) {
m->topbar = topbar; m->topbar = topbar;
updatebarpos(m); updatebarpos(m);
/* reassign all clients with same screen number */ /* reassign all clients with same screen number */
for(c = clients; c; c = c->next) for(tm = mons; tm; tm = tm->next)
if(c->m->screen_number == m->screen_number) if(tm->screen_number == m->screen_number) {
c->m = m; m->clients = tm->clients;
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 with disappeared screen number */ /* reassign left over clients of disappeared monitors */
for(c = clients; c; c = c->next) for(tm = mons; tm; tm = tm->next) {
if(c->m->screen_number >= n) while(tm->clients) {
c->m = newmons; c = tm->clients->next;
tm->clients->next = newmons->clients;
tm->clients->mon = newmons;
newmons->clients = tm->clients;
tm->clients = c;
}
while(tm->stack) {
c = tm->stack->snext;
tm->stack->snext = newmons->stack;
newmons->stack = tm->stack;
tm->stack = c;
}
}
/* select focused monitor */ /* select focused monitor */
if(!selmon) { if(!selmon) {
@ -1795,7 +1823,7 @@ updatewmhints(Client *c) {
XWMHints *wmh; XWMHints *wmh;
if((wmh = XGetWMHints(dpy, c->win))) { if((wmh = XGetWMHints(dpy, c->win))) {
if(c == sel && wmh->flags & XUrgencyHint) { if(c == selmon->sel && wmh->flags & XUrgencyHint) {
wmh->flags &= ~XUrgencyHint; wmh->flags &= ~XUrgencyHint;
XSetWMHints(dpy, c->win, wmh); XSetWMHints(dpy, c->win, wmh);
} }
@ -1851,11 +1879,11 @@ xerrorstart(Display *dpy, XErrorEvent *ee) {
void void
zoom(const Arg *arg) { zoom(const Arg *arg) {
Client *c = sel; Client *c = selmon->sel;
if(!lt[selmon->sellt]->arrange || lt[selmon->sellt]->arrange == monocle || (sel && sel->isfloating)) if(!lt[selmon->sellt]->arrange || lt[selmon->sellt]->arrange == monocle || (selmon->sel && selmon->sel->isfloating))
return; return;
if(c == nexttiled(selmon, clients)) if(c == nexttiled(selmon, selmon->clients))
if(!c || !(c = nexttiled(selmon, c->next))) if(!c || !(c = nexttiled(selmon, c->next)))
return; return;
detach(c); detach(c);