tseveral simplifications - dwm - [fork] customized build of dwm, the dynamic wi… | |
git clone git://src.adamsgaard.dk/dwm | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 1ddfc571ae90b842446b0524f2a38c74868bb326 | |
parent 21cd59a6307ae041ed91098e06d49b3e9036cbea | |
Author: Anselm R Garbe <[email protected]> | |
Date: Tue, 30 Jun 2009 19:39:59 +0100 | |
several simplifications | |
Diffstat: | |
M config.def.h | 5 ++--- | |
M dwm.c | 187 +++++++++++++----------------… | |
2 files changed, 83 insertions(+), 109 deletions(-) | |
--- | |
diff --git a/config.def.h b/config.def.h | |
t@@ -1,6 +1,8 @@ | |
/* See LICENSE file for copyright and license details. */ | |
/* appearance */ | |
+#define SHOWBAR True /* False means no bar */ | |
+#define TOPBAR True /* False means bottom bar */ | |
static const char font[] = "-*-*-medium-*-*-*-14-*-*-*-*-*-*-*"; | |
static const char normbordercolor[] = "#cccccc"; | |
static const char normbgcolor[] = "#cccccc"; | |
t@@ -10,9 +12,6 @@ static const char selbgcolor[] = "#0066ff"; | |
static const char selfgcolor[] = "#ffffff"; | |
static unsigned int borderpx = 1; /* border pixel of windows */ | |
static unsigned int snap = 32; /* snap pixel */ | |
-static Bool showbar = True; /* False means no bar */ | |
-static Bool topbar = True; /* False means bottom bar */ | |
- | |
/* tagging */ | |
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; | |
diff --git a/dwm.c b/dwm.c | |
t@@ -1,4 +1,3 @@ | |
-//#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 | |
t@@ -174,16 +173,13 @@ static void expose(XEvent *e); | |
static void focus(Client *c); | |
static void focusin(XEvent *e); | |
static void focusstack(const Arg *arg); | |
-static Client *getclient(Window w); | |
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 long getstate(Window w); | |
static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size); | |
static void grabbuttons(Client *c, Bool focused); | |
static void grabkeys(void); | |
+static Monitor *idxtomon(unsigned int n); | |
static void initfont(const char *fontstr); | |
static Bool isprotodel(Client *c); | |
static void keypress(XEvent *e); | |
t@@ -194,6 +190,7 @@ static void maprequest(XEvent *e); | |
static void monocle(Monitor *m); | |
static void movemouse(const Arg *arg); | |
static Client *nexttiled(Client *c); | |
+static Monitor *pointertomon(int x, int y); | |
static void propertynotify(XEvent *e); | |
static void quit(const Arg *arg); | |
static void resize(Client *c, int x, int y, int w, int h); | |
t@@ -228,6 +225,8 @@ static void updatestatus(void); | |
static void updatetitle(Client *c); | |
static void updatewmhints(Client *c); | |
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 xerrordummy(Display *dpy, XErrorEvent *ee); | |
static int xerrorstart(Display *dpy, XErrorEvent *ee); | |
t@@ -402,7 +401,7 @@ buttonpress(XEvent *e) { | |
click = ClkRootWin; | |
/* focus monitor if necessary */ | |
- if((m = getmon(ev->window)) && m != selmon) { | |
+ if((m = wintomon(ev->window)) && m != selmon) { | |
unfocus(selmon->sel); | |
selmon = m; | |
focus(NULL); | |
t@@ -424,7 +423,7 @@ buttonpress(XEvent *e) { | |
else | |
click = ClkWinTitle; | |
} | |
- else if((c = getclient(ev->window))) { | |
+ else if((c = wintoclient(ev->window))) { | |
focus(c); | |
click = ClkClientWin; | |
} | |
t@@ -457,8 +456,6 @@ cleanup(void) { | |
view(&a); | |
lt[selmon->sellt] = &foo; | |
- | |
- /* TODO: consider simplifying cleanup code of the stack, perhaps do th… | |
for(m = mons; m; m = m->next) | |
while(m->stack) | |
unmanage(m->stack); | |
t@@ -546,7 +543,7 @@ configurerequest(XEvent *e) { | |
XConfigureRequestEvent *ev = &e->xconfigurerequest; | |
XWindowChanges wc; | |
- if((c = getclient(ev->window))) { | |
+ if((c = wintoclient(ev->window))) { | |
if(ev->value_mask & CWBorderWidth) | |
c->bw = ev->border_width; | |
else if(c->isfloating || !lt[selmon->sellt]->arrange) { | |
t@@ -589,7 +586,7 @@ destroynotify(XEvent *e) { | |
Client *c; | |
XDestroyWindowEvent *ev = &e->xdestroywindow; | |
- if((c = getclient(ev->window))) | |
+ if((c = wintoclient(ev->window))) | |
unmanage(c); | |
} | |
t@@ -607,6 +604,11 @@ detachstack(Client *c) { | |
for(tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext); | |
*tc = c->snext; | |
+ | |
+ if(c == c->mon->sel) { | |
+ for(*tc = c->mon->stack; *tc && !ISVISIBLE((*tc)); *tc = (*tc)… | |
+ c->mon->sel = *tc; | |
+ } | |
} | |
void | |
t@@ -750,11 +752,11 @@ enternotify(XEvent *e) { | |
if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->w… | |
return; | |
- if((m = getmon(ev->window)) && m != selmon) { | |
+ if((m = wintomon(ev->window)) && m != selmon) { | |
unfocus(selmon->sel); | |
selmon = m; | |
} | |
- if((c = getclient(ev->window))) | |
+ if((c = wintoclient(ev->window))) | |
focus(c); | |
else | |
focus(NULL); | |
t@@ -765,7 +767,7 @@ expose(XEvent *e) { | |
Monitor *m; | |
XExposeEvent *ev = &e->xexpose; | |
- if(ev->count == 0 && (m = getmon(ev->window))) | |
+ if(ev->count == 0 && (m = wintomon(ev->window))) | |
drawbar(m); | |
} | |
t@@ -805,7 +807,7 @@ void | |
focusmon(const Arg *arg) { | |
Monitor *m; | |
- if(!(m = getmonn(arg->ui)) || m == selmon) | |
+ if(!(m = idxtomon(arg->ui)) || m == selmon) | |
return; | |
unfocus(selmon->sel); | |
selmon = m; | |
t@@ -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 | |
getcolor(const char *colstr) { | |
Colormap cmap = DefaultColormap(dpy, screen); | |
t@@ -861,41 +851,6 @@ getcolor(const char *colstr) { | |
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 | |
getrootpointer(int *x, int *y) { | |
int di; | |
t@@ -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 | |
initfont(const char *fontstr) { | |
char *def, **missing; | |
t@@ -1116,7 +1080,7 @@ manage(Window w, XWindowAttributes *wa) { | |
grabbuttons(c, False); | |
updatetitle(c); | |
if(XGetTransientForHint(dpy, w, &trans)) | |
- t = getclient(trans); | |
+ t = wintoclient(trans); | |
if(t) | |
c->tags = t->tags; | |
else | |
t@@ -1151,7 +1115,7 @@ maprequest(XEvent *e) { | |
return; | |
if(wa.override_redirect) | |
return; | |
- if(!getclient(ev->window)) | |
+ if(!wintoclient(ev->window)) | |
manage(ev->window, &wa); | |
} | |
t@@ -1212,7 +1176,7 @@ movemouse(const Arg *arg) { | |
} | |
while(ev.type != ButtonRelease); | |
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); | |
selmon = m; | |
focus(NULL); | |
t@@ -1225,6 +1189,16 @@ nexttiled(Client *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 | |
propertynotify(XEvent *e) { | |
Client *c; | |
t@@ -1235,12 +1209,12 @@ propertynotify(XEvent *e) { | |
updatestatus(); | |
else if(ev->state == PropertyDelete) | |
return; /* ignore */ | |
- else if((c = getclient(ev->window))) { | |
+ else if((c = wintoclient(ev->window))) { | |
switch (ev->atom) { | |
default: break; | |
case XA_WM_TRANSIENT_FOR: | |
XGetTransientForHint(dpy, c->win, &trans); | |
- if(!c->isfloating && (c->isfloating = (getclient(trans… | |
+ if(!c->isfloating && (c->isfloating = (wintoclient(tra… | |
arrange(); | |
break; | |
case XA_WM_NORMAL_HINTS: | |
t@@ -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… | |
XUngrabPointer(dpy, CurrentTime); | |
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); | |
selmon = m; | |
focus(NULL); | |
t@@ -1557,7 +1531,7 @@ void | |
tagmon(const Arg *arg) { | |
Monitor *m; | |
- if(!selmon->sel || !(m = getmonn(arg->ui))) | |
+ if(!selmon->sel || !(m = idxtomon(arg->ui))) | |
return; | |
sendmon(selmon->sel, m); | |
} | |
t@@ -1670,19 +1644,13 @@ unmanage(Client *c) { | |
XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */ | |
detach(c); | |
detachstack(c); | |
- if(c->mon->sel == c) { | |
- /* TODO: consider separate the next code into a function or in… | |
- 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); | |
setclientstate(c, WithdrawnState); | |
free(c); | |
XSync(dpy, False); | |
XSetErrorHandler(xerror); | |
XUngrabServer(dpy); | |
+ focus(NULL); | |
arrange(); | |
} | |
t@@ -1691,7 +1659,7 @@ unmapnotify(XEvent *e) { | |
Client *c; | |
XUnmapEvent *ev = &e->xunmap; | |
- if((c = getclient(ev->window))) | |
+ if((c = wintoclient(ev->window))) | |
unmanage(c); | |
} | |
t@@ -1733,14 +1701,12 @@ updategeom(void) { | |
Client *c; | |
Monitor *newmons = NULL, *m, *tm; | |
-#ifdef XINULATOR | |
- n = 2; | |
-#elif defined(XINERAMA) | |
+#ifdef XINERAMA | |
XineramaScreenInfo *info = NULL; | |
if(XineramaIsActive(dpy)) | |
info = XineramaQueryScreens(dpy, &n); | |
-#endif | |
+#endif /* XINERAMA */ | |
/* allocate monitor(s) for the new geometry setup */ | |
for(i = 0; i < n; i++) { | |
m = (Monitor *)malloc(sizeof(Monitor)); | |
t@@ -1749,23 +1715,7 @@ updategeom(void) { | |
} | |
/* initialise monitor(s) */ | |
-#ifdef XINULATOR | |
- 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) | |
+#ifdef XINERAMA | |
if(XineramaIsActive(dpy)) { | |
for(i = 0, m = newmons; m; m = m->next, i++) { | |
m->screen_number = info[i].screen_number; | |
t@@ -1777,7 +1727,7 @@ updategeom(void) { | |
XFree(info); | |
} | |
else | |
-#endif | |
+#endif /* XINERAMA */ | |
/* default monitor setup */ | |
{ | |
m->screen_number = 0; | |
t@@ -1789,16 +1739,13 @@ updategeom(void) { | |
/* bar geometry setup */ | |
for(m = newmons; m; m = m->next) { | |
- /* TODO: consider removing the following values from config.h … | |
- m->clients = NULL; | |
- m->sel = NULL; | |
- m->stack = NULL; | |
+ m->sel = m->stack = m->clients = NULL; | |
m->seltags = 0; | |
m->sellt = 0; | |
m->tagset[0] = m->tagset[1] = 1; | |
m->mfact = mfact; | |
- m->showbar = showbar; | |
- m->topbar = topbar; | |
+ m->showbar = SHOWBAR; | |
+ m->topbar = TOPBAR; | |
updatebarpos(m); | |
} | |
t@@ -1816,7 +1763,7 @@ updategeom(void) { | |
/* select focused monitor */ | |
cleanupmons(); | |
mons = newmons; | |
- selmon = getmon(root); | |
+ selmon = wintomon(root); | |
} | |
void | |
t@@ -1923,6 +1870,34 @@ view(const Arg *arg) { | |
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 | |
* ignored (especially on UnmapNotify's). Other types of errors call Xlibs | |
* default error handler, which may call exit. */ |