dwm

dynamic window manager - with my changes
git clone https://pi.duncano.de/git/dwm.git
Log | Files | Refs | README | LICENSE

commit 1d729384d12d289951504b130b8804ab85c0b12b
parent 25c1eb28f955adf241226596335f5d73b28620a0
Author: Anselm R Garbe <anselm@garbe.us>
Date:   Wed,  1 Jul 2009 19:15:20 +0100

several bugfixes
Diffstat:
config.def.h | 2--
config.mk | 4++--
dwm.c | 25++++++++-----------------
3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/config.def.h b/config.def.h @@ -68,12 +68,10 @@ static Key keys[] = { { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, { MODKEY, XK_0, view, {.ui = ~0 } }, { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, -#ifdef XINERAMA { MODKEY, XK_w, focusmon, {.ui = 0 } }, { MODKEY, XK_e, focusmon, {.ui = 1 } }, { MODKEY|ShiftMask, XK_w, tagmon, {.ui = 0 } }, { MODKEY|ShiftMask, XK_e, tagmon, {.ui = 1 } }, -#endif /* XINERAMA */ TAGKEYS( XK_1, 0) TAGKEYS( XK_2, 1) TAGKEYS( XK_3, 2) diff --git a/config.mk b/config.mk @@ -11,8 +11,8 @@ X11INC = /usr/X11R6/include X11LIB = /usr/X11R6/lib # Xinerama, un-comment if you want it -#XINERAMALIBS = -L${X11LIB} -lXinerama -#XINERAMAFLAGS = -DXINERAMA +XINERAMALIBS = -L${X11LIB} -lXinerama +XINERAMAFLAGS = -DXINERAMA # includes and libs INCS = -I. -I/usr/include -I${X11INC} diff --git a/dwm.c b/dwm.c @@ -172,6 +172,7 @@ static void enternotify(XEvent *e); static void expose(XEvent *e); static void focus(Client *c); static void focusin(XEvent *e); +static void focusmon(const Arg *arg); static void focusstack(const Arg *arg); static unsigned long getcolor(const char *colstr); static Bool getrootpointer(int *x, int *y); @@ -179,6 +180,7 @@ 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); @@ -206,6 +208,7 @@ static void showhide(Client *c); static void sigchld(int signal); static void spawn(const Arg *arg); static void tag(const Arg *arg); +static void tagmon(const Arg *arg); static int textnw(const char *text, unsigned int len); static void tile(Monitor *); static void togglebar(const Arg *arg); @@ -230,11 +233,6 @@ static int xerror(Display *dpy, XErrorEvent *ee); static int xerrordummy(Display *dpy, XErrorEvent *ee); static int xerrorstart(Display *dpy, XErrorEvent *ee); static void zoom(const Arg *arg); -#ifdef XINERAMA -static void focusmon(const Arg *arg); -static Monitor *idxtomon(unsigned int n); -static void tagmon(const Arg *arg); -#endif /* XINERAMA */ /* variables */ static char stext[256]; @@ -309,9 +307,9 @@ applysizehints(Client *c, int *x, int *y, int *w, int *h) { *h = MAX(1, *h); if(*x > m->mx + m->mw) - *x = m->mw - WIDTH(c); + *x = m->mx + m->mw - WIDTH(c); if(*y > m->my + m->mh) - *y = m->mh - HEIGHT(c); + *y = m->my + m->mh - HEIGHT(c); if(*x + *w + 2 * c->bw < m->mx) *x = m->mx; if(*y + *h + 2 * c->bw < m->my) @@ -636,7 +634,6 @@ drawbar(Monitor *m) { } dc.x = 0; -#ifdef XINERAMA if(mons->next) { /* more than a single monitor */ char buf[2]; buf[0] = m->screen_number + '0'; @@ -645,7 +642,6 @@ drawbar(Monitor *m) { drawtext(buf, selmon == m ? dc.sel : dc.norm, True); dc.x += dc.w; } -#endif /* XINERAMA */ m->btx = dc.x; for(i = 0; i < LENGTH(tags); i++) { dc.w = TEXTW(tags[i]); @@ -803,7 +799,6 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */ XSetInputFocus(dpy, selmon->sel->win, RevertToPointerRoot, CurrentTime); } -#ifdef XINERAMA void focusmon(const Arg *arg) { Monitor *m; @@ -814,7 +809,6 @@ focusmon(const Arg *arg) { selmon = m; focus(NULL); } -#endif /* XINERAMA */ void focusstack(const Arg *arg) { @@ -943,7 +937,6 @@ grabkeys(void) { } } -#ifdef XINERAMA Monitor * idxtomon(unsigned int n) { unsigned int i; @@ -952,7 +945,6 @@ idxtomon(unsigned int n) { for(m = mons, i = 0; m && i != n; m = m->next, i++); return m; } -#endif /* XINERAMA */ void initfont(const char *fontstr) { @@ -1378,6 +1370,7 @@ void sendmon(Client *c, Monitor *m) { if(c->mon == m) return; + unfocus(c); detach(c); detachstack(c); c->mon = m; @@ -1531,7 +1524,6 @@ tag(const Arg *arg) { } } -#ifdef XINERAMA void tagmon(const Arg *arg) { Monitor *m; @@ -1540,7 +1532,6 @@ tagmon(const Arg *arg) { return; sendmon(selmon->sel, m); } -#endif /* XINERAMA */ int textnw(const char *text, unsigned int len) { @@ -1736,9 +1727,9 @@ updategeom(void) { /* default monitor setup */ { m->screen_number = 0; - m->wx = 0; + m->mx = m->wx = 0; m->my = m->wy = 0; - m->ww = sw; + m->mw = m->ww = sw; m->mh = m->wh = sh; }