em/dwm
1
0
Fork 0
Code Releases Activity

several simplifications

Browse Source
This commit is contained in:
Anselm R Garbe 2009-06-30 19:39:59 +01:00
parent 21cd59a630
commit 1ddfc571ae
2 changed files with 83 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.def.h
View File

@ -1,6 +1,8 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
/* appearance */ /* appearance */
#define SHOWBAR True /* False means no bar */
#define TOPBAR True /* False means bottom bar */
static const char font[] = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*"; static const char font[] = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*";
static const char normbordercolor[] = "#cccccc"; static const char normbordercolor[] = "#cccccc";
static const char normbgcolor[] = "#cccccc"; static const char normbgcolor[] = "#cccccc";
@ -10,9 +12,6 @@ static const char selbgcolor[] = "#0066ff";
static const char selfgcolor[] = "#ffffff"; static const char selfgcolor[] = "#ffffff";
static unsigned int borderpx = 1; /* border pixel of windows */ static unsigned int borderpx = 1; /* border pixel of windows */
static unsigned int snap = 32; /* snap pixel */ static unsigned int snap = 32; /* snap pixel */
static Bool showbar = True; /* False means no bar */
static Bool topbar = True; /* False means bottom bar */
/* tagging */ /* tagging */
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };

187
dwm.c
View File

@ -1,4 +1,3 @@
//#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
@ -174,16 +173,13 @@ static void expose(XEvent *e);
static void focus(Client *c); static void focus(Client *c);
static void focusin(XEvent *e); static void focusin(XEvent *e);
static void focusstack(const Arg *arg); static void focusstack(const Arg *arg);
static Client *getclient(Window w);
static unsigned long getcolor(const char *colstr); static unsigned long getcolor(const char *colstr);
static Monitor *getmon(Window w);
static Monitor *getmonn(unsigned int n);
static Monitor *getmonxy(int x, int y);
static Bool getrootpointer(int *x, int *y); static Bool getrootpointer(int *x, int *y);
static long getstate(Window w); static long getstate(Window w);
static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size); static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
static void grabbuttons(Client *c, Bool focused); static void grabbuttons(Client *c, Bool focused);
static void grabkeys(void); static void grabkeys(void);
static Monitor *idxtomon(unsigned int n);
static void initfont(const char *fontstr); static void initfont(const char *fontstr);
static Bool isprotodel(Client *c); static Bool isprotodel(Client *c);
static void keypress(XEvent *e); static void keypress(XEvent *e);
@ -194,6 +190,7 @@ static void maprequest(XEvent *e);
static void monocle(Monitor *m); static void monocle(Monitor *m);
static void movemouse(const Arg *arg); static void movemouse(const Arg *arg);
static Client *nexttiled(Client *c); static Client *nexttiled(Client *c);
static Monitor *pointertomon(int x, int y);
static void propertynotify(XEvent *e); static void propertynotify(XEvent *e);
static void quit(const Arg *arg); static void quit(const Arg *arg);
static void resize(Client *c, int x, int y, int w, int h); static void resize(Client *c, int x, int y, int w, int h);
@ -228,6 +225,8 @@ static void updatestatus(void);
static void updatetitle(Client *c); static void updatetitle(Client *c);
static void updatewmhints(Client *c); static void updatewmhints(Client *c);
static void view(const Arg *arg); static void view(const Arg *arg);
static Client *wintoclient(Window w);
static Monitor *wintomon(Window w);
static int xerror(Display *dpy, XErrorEvent *ee); static int xerror(Display *dpy, XErrorEvent *ee);
static int xerrordummy(Display *dpy, XErrorEvent *ee); static int xerrordummy(Display *dpy, XErrorEvent *ee);
static int xerrorstart(Display *dpy, XErrorEvent *ee); static int xerrorstart(Display *dpy, XErrorEvent *ee);
@ -402,7 +401,7 @@ buttonpress(XEvent *e) {
click = ClkRootWin; click = ClkRootWin;
/* focus monitor if necessary */ /* focus monitor if necessary */
if((m = getmon(ev->window)) && m != selmon) { if((m = wintomon(ev->window)) && m != selmon) {
unfocus(selmon->sel); unfocus(selmon->sel);
selmon = m; selmon = m;
focus(NULL); focus(NULL);
@ -424,7 +423,7 @@ buttonpress(XEvent *e) {
else else
click = ClkWinTitle; click = ClkWinTitle;
} }
else if((c = getclient(ev->window))) { else if((c = wintoclient(ev->window))) {
focus(c); focus(c);
click = ClkClientWin; click = ClkClientWin;
} }
@ -457,8 +456,6 @@ cleanup(void) {
view(&a); view(&a);
lt[selmon->sellt] = &foo; lt[selmon->sellt] = &foo;
/* TODO: consider simplifying cleanup code of the stack, perhaps do that in cleanmons() ? */
for(m = mons; m; m = m->next) for(m = mons; m; m = m->next)
while(m->stack) while(m->stack)
unmanage(m->stack); unmanage(m->stack);
@ -546,7 +543,7 @@ configurerequest(XEvent *e) {
XConfigureRequestEvent *ev = &e->xconfigurerequest; XConfigureRequestEvent *ev = &e->xconfigurerequest;
XWindowChanges wc; XWindowChanges wc;
if((c = getclient(ev->window))) { if((c = wintoclient(ev->window))) {
if(ev->value_mask & CWBorderWidth) if(ev->value_mask & CWBorderWidth)
c->bw = ev->border_width; c->bw = ev->border_width;
else if(c->isfloating || !lt[selmon->sellt]->arrange) { else if(c->isfloating || !lt[selmon->sellt]->arrange) {
@ -589,7 +586,7 @@ destroynotify(XEvent *e) {
Client *c; Client *c;
XDestroyWindowEvent *ev = &e->xdestroywindow; XDestroyWindowEvent *ev = &e->xdestroywindow;
if((c = getclient(ev->window))) if((c = wintoclient(ev->window)))
unmanage(c); unmanage(c);
} }
@ -607,6 +604,11 @@ detachstack(Client *c) {
for(tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext); for(tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext);
*tc = c->snext; *tc = c->snext;
if(c == c->mon->sel) {
for(*tc = c->mon->stack; *tc && !ISVISIBLE((*tc)); *tc = (*tc)->snext);
c->mon->sel = *tc;
}
} }
void void
@ -750,11 +752,11 @@ enternotify(XEvent *e) {
if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root) if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
return; return;
if((m = getmon(ev->window)) && m != selmon) { if((m = wintomon(ev->window)) && m != selmon) {
unfocus(selmon->sel); unfocus(selmon->sel);
selmon = m; selmon = m;
} }
if((c = getclient(ev->window))) if((c = wintoclient(ev->window)))
focus(c); focus(c);
else else
focus(NULL); focus(NULL);
@ -765,7 +767,7 @@ expose(XEvent *e) {
Monitor *m; Monitor *m;
XExposeEvent *ev = &e->xexpose; XExposeEvent *ev = &e->xexpose;
if(ev->count == 0 && (m = getmon(ev->window))) if(ev->count == 0 && (m = wintomon(ev->window)))
drawbar(m); drawbar(m);
} }
@ -805,7 +807,7 @@ void
focusmon(const Arg *arg) { focusmon(const Arg *arg) {
Monitor *m; Monitor *m;
if(!(m = getmonn(arg->ui)) || m == selmon) if(!(m = idxtomon(arg->ui)) || m == selmon)
return; return;
unfocus(selmon->sel); unfocus(selmon->sel);
selmon = m; selmon = m;
@ -839,18 +841,6 @@ focusstack(const Arg *arg) {
} }
} }
Client *
getclient(Window w) {
Client *c;
Monitor *m;
for(m = mons; m; m = m->next)
for(c = m->clients; c; c = c->next)
if(c->win == w)
return c;
return NULL;
}
unsigned long unsigned long
getcolor(const char *colstr) { getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dpy, screen); Colormap cmap = DefaultColormap(dpy, screen);
@ -861,41 +851,6 @@ getcolor(const char *colstr) {
return color.pixel; return color.pixel;
} }
Monitor *
getmon(Window w) {
int x, y;
Client *c;
Monitor *m;
if(w == root && getrootpointer(&x, &y))
return getmonxy(x, y);
for(m = mons; m; m = m->next)
if(w == m->barwin)
return m;
if((c = getclient(w)))
return c->mon;
return mons;
}
Monitor *
getmonn(unsigned int n) {
unsigned int i;
Monitor *m;
for(m = mons, i = 0; m && i != n; m = m->next, i++);
return m;
}
Monitor *
getmonxy(int x, int y) {
Monitor *m;
for(m = mons; m; m = m->next)
if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh))
return m;
return mons;
}
Bool Bool
getrootpointer(int *x, int *y) { getrootpointer(int *x, int *y) {
int di; int di;
@ -987,6 +942,15 @@ grabkeys(void) {
} }
} }
Monitor *
idxtomon(unsigned int n) {
unsigned int i;
Monitor *m;
for(m = mons, i = 0; m && i != n; m = m->next, i++);
return m;
}
void void
initfont(const char *fontstr) { initfont(const char *fontstr) {
char *def, **missing; char *def, **missing;
@ -1116,7 +1080,7 @@ manage(Window w, XWindowAttributes *wa) {
grabbuttons(c, False); grabbuttons(c, False);
updatetitle(c); updatetitle(c);
if(XGetTransientForHint(dpy, w, &trans)) if(XGetTransientForHint(dpy, w, &trans))
t = getclient(trans); t = wintoclient(trans);
if(t) if(t)
c->tags = t->tags; c->tags = t->tags;
else else
@ -1151,7 +1115,7 @@ maprequest(XEvent *e) {
return; return;
if(wa.override_redirect) if(wa.override_redirect)
return; return;
if(!getclient(ev->window)) if(!wintoclient(ev->window))
manage(ev->window, &wa); manage(ev->window, &wa);
} }
@ -1212,7 +1176,7 @@ movemouse(const Arg *arg) {
} }
while(ev.type != ButtonRelease); while(ev.type != ButtonRelease);
XUngrabPointer(dpy, CurrentTime); XUngrabPointer(dpy, CurrentTime);
if((m = getmonxy(c->x + c->w / 2, c->y + c->h / 2)) != selmon) { if((m = pointertomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
sendmon(c, m); sendmon(c, m);
selmon = m; selmon = m;
focus(NULL); focus(NULL);
@ -1225,6 +1189,16 @@ nexttiled(Client *c) {
return c; return c;
} }
Monitor *
pointertomon(int x, int y) {
Monitor *m;
for(m = mons; m; m = m->next)
if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh))
return m;
return mons;
}
void void
propertynotify(XEvent *e) { propertynotify(XEvent *e) {
Client *c; Client *c;
@ -1235,12 +1209,12 @@ propertynotify(XEvent *e) {
updatestatus(); updatestatus();
else if(ev->state == PropertyDelete) else if(ev->state == PropertyDelete)
return; /* ignore */ return; /* ignore */
else if((c = getclient(ev->window))) { else if((c = wintoclient(ev->window))) {
switch (ev->atom) { switch (ev->atom) {
default: break; default: break;
case XA_WM_TRANSIENT_FOR: case XA_WM_TRANSIENT_FOR:
XGetTransientForHint(dpy, c->win, &trans); XGetTransientForHint(dpy, c->win, &trans);
if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL))) if(!c->isfloating && (c->isfloating = (wintoclient(trans) != NULL)))
arrange(); arrange();
break; break;
case XA_WM_NORMAL_HINTS: case XA_WM_NORMAL_HINTS:
@ -1324,7 +1298,7 @@ resizemouse(const Arg *arg) {
XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1); XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
XUngrabPointer(dpy, CurrentTime); XUngrabPointer(dpy, CurrentTime);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
if((m = getmonxy(c->x + c->w / 2, c->y + c->h / 2)) != selmon) { if((m = pointertomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
sendmon(c, m); sendmon(c, m);
selmon = m; selmon = m;
focus(NULL); focus(NULL);
@ -1557,7 +1531,7 @@ void
tagmon(const Arg *arg) { tagmon(const Arg *arg) {
Monitor *m; Monitor *m;
if(!selmon->sel || !(m = getmonn(arg->ui))) if(!selmon->sel || !(m = idxtomon(arg->ui)))
return; return;
sendmon(selmon->sel, m); sendmon(selmon->sel, m);
} }
@ -1670,19 +1644,13 @@ 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(c->mon->sel == c) {
/* TODO: consider separate the next code into a function or into detachstack? */
Client *tc;
for(tc = c->mon->stack; tc && !ISVISIBLE(tc); tc = tc->snext);
c->mon->sel = tc;
focus(NULL);
}
XUngrabButton(dpy, AnyButton, AnyModifier, c->win); XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
setclientstate(c, WithdrawnState); setclientstate(c, WithdrawnState);
free(c); free(c);
XSync(dpy, False); XSync(dpy, False);
XSetErrorHandler(xerror); XSetErrorHandler(xerror);
XUngrabServer(dpy); XUngrabServer(dpy);
focus(NULL);
arrange(); arrange();
} }
@ -1691,7 +1659,7 @@ unmapnotify(XEvent *e) {
Client *c; Client *c;
XUnmapEvent *ev = &e->xunmap; XUnmapEvent *ev = &e->xunmap;
if((c = getclient(ev->window))) if((c = wintoclient(ev->window)))
unmanage(c); unmanage(c);
} }
@ -1733,14 +1701,12 @@ updategeom(void) {
Client *c; Client *c;
Monitor *newmons = NULL, *m, *tm; Monitor *newmons = NULL, *m, *tm;
#ifdef XINULATOR #ifdef XINERAMA
n = 2;
#elif defined(XINERAMA)
XineramaScreenInfo *info = NULL; XineramaScreenInfo *info = NULL;
if(XineramaIsActive(dpy)) if(XineramaIsActive(dpy))
info = XineramaQueryScreens(dpy, &n); info = XineramaQueryScreens(dpy, &n);
#endif #endif /* XINERAMA */
/* allocate monitor(s) for the new geometry setup */ /* allocate monitor(s) for the new geometry setup */
for(i = 0; i < n; i++) { for(i = 0; i < n; i++) {
m = (Monitor *)malloc(sizeof(Monitor)); m = (Monitor *)malloc(sizeof(Monitor));
@ -1749,23 +1715,7 @@ updategeom(void) {
} }
/* initialise monitor(s) */ /* initialise monitor(s) */
#ifdef XINULATOR #ifdef XINERAMA
if(1) {
m = newmons;
m->screen_number = 0;
m->wx = sx;
m->my = m->wy = sy;
m->ww = sw;
m->mh = m->wh = sh / 2;
m = newmons->next;
m->screen_number = 1;
m->wx = sx;
m->my = m->wy = sy + sh / 2;
m->ww = sw;
m->mh = m->wh = sh / 2;
}
else
#elif defined(XINERAMA)
if(XineramaIsActive(dpy)) { if(XineramaIsActive(dpy)) {
for(i = 0, m = newmons; m; m = m->next, i++) { for(i = 0, m = newmons; m; m = m->next, i++) {
m->screen_number = info[i].screen_number; m->screen_number = info[i].screen_number;
@ -1777,7 +1727,7 @@ updategeom(void) {
XFree(info); XFree(info);
} }
else else
#endif #endif /* XINERAMA */
/* default monitor setup */ /* default monitor setup */
{ {
m->screen_number = 0; m->screen_number = 0;
@ -1789,16 +1739,13 @@ 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 */ m->sel = m->stack = m->clients = NULL;
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;
m->mfact = mfact; m->mfact = mfact;
m->showbar = showbar; m->showbar = SHOWBAR;
m->topbar = topbar; m->topbar = TOPBAR;
updatebarpos(m); updatebarpos(m);
} }
@ -1816,7 +1763,7 @@ updategeom(void) {
/* select focused monitor */ /* select focused monitor */
cleanupmons(); cleanupmons();
mons = newmons; mons = newmons;
selmon = getmon(root); selmon = wintomon(root);
} }
void void
@ -1923,6 +1870,34 @@ view(const Arg *arg) {
arrange(); arrange();
} }
Client *
wintoclient(Window w) {
Client *c;
Monitor *m;
for(m = mons; m; m = m->next)
for(c = m->clients; c; c = c->next)
if(c->win == w)
return c;
return NULL;
}
Monitor *
wintomon(Window w) {
int x, y;
Client *c;
Monitor *m;
if(w == root && getrootpointer(&x, &y))
return pointertomon(x, y);
for(m = mons; m; m = m->next)
if(w == m->barwin)
return m;
if((c = wintoclient(w)))
return c->mon;
return mons;
}
/* There's no way to check accesses to destroyed windows, thus those cases are /* There's no way to check accesses to destroyed windows, thus those cases are
* ignored (especially on UnmapNotify's). Other types of errors call Xlibs * ignored (especially on UnmapNotify's). Other types of errors call Xlibs
* default error handler, which may call exit. */ * default error handler, which may call exit. */