removed some empty lines

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 5c27113..d47da3f 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -148,7 +148,7 @@ typedef struct {
 
 /* function declarations */
 static void applyrules(Client *c);
-static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h);
+static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact);
 static void arrange(void);
 static void attach(Client *c);
 static void attachstack(Client *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);
@@ -193,7 +194,7 @@ 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);
+static void resize(Client *c, int x, int y, int w, int h, Bool interact);
 static void resizemouse(const Arg *arg);
 static void restack(Monitor *m);
 static void run(void);
@@ -207,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);
@@ -231,10 +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 void tagmon(const Arg *arg);
-#endif /* XINERAMA */
 
 /* variables */
 static char stext[256];
@@ -300,7 +298,7 @@ applyrules(Client *c) {
 }
 
 Bool
-applysizehints(Client *c, int *x, int *y, int *w, int *h) {
+applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {
        Bool baseismin;
        Monitor *m = c->mon;
 
@@ -308,28 +306,37 @@ applysizehints(Client *c, int *x, int *y, int *w, int *h) {
        *w = MAX(1, *w);
        *h = MAX(1, *h);
 
-       if(*x > m->mx + m->mw)
-               *x = m->mw - WIDTH(c);
-       if(*y > m->my + m->mh)
-               *y = m->mh - HEIGHT(c);
-       if(*x + *w + 2 * c->bw < m->mx)
-               *x = m->mx;
-       if(*y + *h + 2 * c->bw < m->my)
-               *y = m->my;
+       if(interact) {
+               if(*x > sw)
+                       *x = sw - WIDTH(c);
+               if(*y > sh)
+                       *y = sh - HEIGHT(c);
+               if(*x + *w + 2 * c->bw < 0)
+                       *x = 0;
+               if(*y + *h + 2 * c->bw < 0)
+                       *y = 0;
+       }
+       else {
+               if(*x > m->mx + m->mw)
+                       *x = m->mx + m->mw - WIDTH(c);
+               if(*y > m->my + m->mh)
+                       *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)
+                       *y = m->my;
+       }
        if(*h < bh)
                *h = bh;
        if(*w < bh)
                *w = bh;
-
        if(resizehints || c->isfloating) {
                /* see last two sentences in ICCCM 4.1.2.3 */
                baseismin = c->basew == c->minw && c->baseh == c->minh;
-
                if(!baseismin) { /* temporarily remove base dimensions */
                        *w -= c->basew;
                        *h -= c->baseh;
                }
-
                /* adjust for aspect limits */
                if(c->mina > 0 && c->maxa > 0) {
                        if(c->maxa < (float)*w / *h)
@@ -337,28 +344,22 @@ applysizehints(Client *c, int *x, int *y, int *w, int *h) {
                        else if(c->mina < (float)*h / *w)
                                *h = *w * c->mina;
                }
-
                if(baseismin) { /* increment calculation requires this */
                        *w -= c->basew;
                        *h -= c->baseh;
                }
-
                /* adjust for increment value */
                if(c->incw)
                        *w -= *w % c->incw;
                if(c->inch)
                        *h -= *h % c->inch;
-
                /* restore base dimensions */
                *w += c->basew;
                *h += c->baseh;
-
                *w = MAX(*w, c->minw);
                *h = MAX(*h, c->minh);
-
                if(c->maxw)
                        *w = MIN(*w, c->maxw);
-
                if(c->maxh)
                        *h = MIN(*h, c->maxh);
        }
@@ -428,7 +429,6 @@ buttonpress(XEvent *e) {
                focus(c);
                click = ClkClientWin;
        }
-
        for(i = 0; i < LENGTH(buttons); i++)
                if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
                   && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
@@ -439,7 +439,6 @@ void
 checkotherwm(void) {
        otherwm = False;
        xerrorxlib = XSetErrorHandler(xerrorstart);
-
        /* this causes an error if some other window manager is running */
        XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
        XSync(dpy, False);
@@ -634,18 +633,12 @@ drawbar(Monitor *m) {
                if(c->isurgent)
                        urg |= c->tags;
        }
-
        dc.x = 0;
-#ifdef XINERAMA
        if(mons->next) { /* more than a single monitor */
-               char buf[2];
-               buf[0] = m->screen_number + '0';
-               buf[1] = '\0';
-               dc.w = TEXTW(buf);
-               drawtext(buf, selmon == m ? dc.sel : dc.norm, True);
+               dc.w = TEXTW(monsyms[m->screen_number]);
+               drawtext(monsyms[m->screen_number], selmon == m ? dc.sel : dc.norm, False);
                dc.x += dc.w;
        }
-#endif /* XINERAMA */
        m->btx = dc.x;
        for(i = 0; i < LENGTH(tags); i++) {
                dc.w = TEXTW(tags[i]);
@@ -671,9 +664,8 @@ drawbar(Monitor *m) {
                }
                drawtext(stext, dc.norm, False);
        }
-       else {
+       else
                dc.x = m->ww;
-       }
        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
                if(m->sel) {
@@ -803,7 +795,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 +805,6 @@ focusmon(const Arg *arg) {
        selmon = m;
        focus(NULL);
 }
-#endif /* XINERAMA */
 
 void
 focusstack(const Arg *arg) {
@@ -857,6 +847,7 @@ getrootpointer(int *x, int *y) {
        int di;
        unsigned int dui;
        Window dummy;
+
        return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui);
 }
 
@@ -928,7 +919,7 @@ grabbuttons(Client *c, Bool focused) {
 void
 grabkeys(void) {
        updatenumlockmask();
-       { /* grab keys */
+       {
                unsigned int i, j;
                unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
                KeyCode code;
@@ -1047,7 +1038,6 @@ manage(Window w, XWindowAttributes *wa) {
                die("fatal: could not malloc() %u bytes\n", sizeof(Client));
        *c = cz;
        c->win = w;
-
        if(XGetTransientForHint(dpy, w, &trans))
                t = wintoclient(trans);
        if(t) {
@@ -1058,7 +1048,6 @@ manage(Window w, XWindowAttributes *wa) {
                c->mon = selmon;
                applyrules(c);
        }
-
        /* geometry */
        c->x = wa->x + c->mon->wx;
        c->y = wa->y + c->mon->wy;
@@ -1081,7 +1070,6 @@ manage(Window w, XWindowAttributes *wa) {
                           && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
                c->bw = borderpx;
        }
-
        wc.border_width = c->bw;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
        XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
@@ -1129,7 +1117,7 @@ monocle(Monitor *m) {
        Client *c;
 
        for(c = nexttiled(m->clients); c; c = nexttiled(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, False);
 }
 
 void
@@ -1175,7 +1163,7 @@ movemouse(const Arg *arg) {
                                        togglefloating(NULL);
                        }
                        if(!lt[selmon->sellt]->arrange || c->isfloating)
-                               resize(c, nx, ny, c->w, c->h);
+                               resize(c, nx, ny, c->w, c->h, True);
                        break;
                }
        }
@@ -1201,7 +1189,7 @@ pointertomon(int x, int y) {
        for(m = mons; m; m = m->next)
                if(INRECT(x, y, m->wx, m->wy, m->ww, m->wh))
                        return m;
-       return mons;
+       return selmon;
 }
 
 void
@@ -1244,10 +1232,10 @@ quit(const Arg *arg) {
 }
 
 void
-resize(Client *c, int x, int y, int w, int h) {
+resize(Client *c, int x, int y, int w, int h, Bool interact) {
        XWindowChanges wc;
 
-       if(applysizehints(c, &x, &y, &w, &h)) {
+       if(applysizehints(c, &x, &y, &w, &h, interact)) {
                c->x = wc.x = x;
                c->y = wc.y = y;
                c->w = wc.width = w;
@@ -1287,7 +1275,6 @@ resizemouse(const Arg *arg) {
                case MotionNotify:
                        nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
                        nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
-
                        if(snap && nw >= selmon->wx && nw <= selmon->wx + selmon->ww
                                && nh >= selmon->wy && nh <= selmon->wy + selmon->wh) {
                                if(!c->isfloating && lt[selmon->sellt]->arrange
@@ -1295,7 +1282,7 @@ resizemouse(const Arg *arg) {
                                        togglefloating(NULL);
                        }
                        if(!lt[selmon->sellt]->arrange || c->isfloating)
-                               resize(c, c->x, c->y, nw, nh);
+                               resize(c, c->x, c->y, nw, nh, True);
                        break;
                }
        }
@@ -1376,6 +1363,7 @@ void
 sendmon(Client *c, Monitor *m) {
        if(c->mon == m)
                return;
+       unfocus(c);
        detach(c);
        detachstack(c);
        c->mon = m;
@@ -1436,19 +1424,16 @@ setup(void) {
        lt[0] = &layouts[0];
        lt[1] = &layouts[1 % LENGTH(layouts)];
        updategeom();
-
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
-
        /* init cursors */
        cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
-
        /* init appearance */
        dc.norm[ColBorder] = getcolor(normbordercolor);
        dc.norm[ColBG] = getcolor(normbgcolor);
@@ -1461,7 +1446,6 @@ setup(void) {
        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
        if(!dc.font.set)
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
-
        /* init bars */
        for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
                w = TEXTW(layouts[i].symbol);
@@ -1469,11 +1453,9 @@ setup(void) {
        }
        updatebars();
        updatestatus();
-
        /* EWMH support per view */
        XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
                        PropModeReplace, (unsigned char *) netatom, NetLast);
-
        /* select for events */
        wa.cursor = cursor[CurNormal];
        wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
@@ -1481,7 +1463,6 @@ setup(void) {
                        |PropertyChangeMask;
        XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
        XSelectInput(dpy, root, wa.event_mask);
-
        grabkeys();
 }
 
@@ -1492,7 +1473,7 @@ showhide(Client *c) {
        if(ISVISIBLE(c)) { /* show clients top down */
                XMoveWindow(dpy, c->win, c->x, c->y);
                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, False);
                showhide(c->snext);
        }
        else { /* hide clients bottom up */
@@ -1529,7 +1510,6 @@ tag(const Arg *arg) {
        }
 }
 
-#ifdef XINERAMA
 void
 tagmon(const Arg *arg) {
        Monitor *m;
@@ -1538,7 +1518,6 @@ tagmon(const Arg *arg) {
                return;
        sendmon(selmon->sel, m);
 }
-#endif /* XINERAMA */
 
 int
 textnw(const char *text, unsigned int len) {
@@ -1560,15 +1539,12 @@ tile(Monitor *m) {
        for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
        if(n == 0)
                return;
-
        /* master */
        c = nexttiled(m->clients);
        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, False);
        if(--n == 0)
                return;
-
        /* tile stack */
        x = (m->wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : m->wx + mw;
        y = m->wy;
@@ -1576,10 +1552,9 @@ tile(Monitor *m) {
        h = m->wh / n;
        if(h < bh)
                h = m->wh;
-
        for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
                resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
-                      ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw));
+                      ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw), False);
                if(h != m->wh)
                        y = c->y + HEIGHT(c);
        }
@@ -1599,7 +1574,8 @@ togglefloating(const Arg *arg) {
                return;
        selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
        if(selmon->sel->isfloating)
-               resize(selmon->sel, selmon->sel->x, selmon->sel->y, selmon->sel->w, selmon->sel->h);
+               resize(selmon->sel, selmon->sel->x, selmon->sel->y,
+                      selmon->sel->w, selmon->sel->h, False);
        arrange();
 }
 
@@ -1609,7 +1585,6 @@ toggletag(const Arg *arg) {
 
        if(!selmon->sel)
                return;
-       
        mask = selmon->sel->tags ^ (arg->ui & TAGMASK);
        if(mask) {
                selmon->sel->tags = mask;
@@ -1674,10 +1649,8 @@ updatebars(void) {
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask|ExposureMask;
-
        for(m = mons; m; m = m->next) {
                m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
-
                                          CopyFromParent, DefaultVisual(dpy, screen),
                                          CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
                XDefineCursor(dpy, m->barwin, cursor[CurNormal]);
@@ -1716,7 +1689,6 @@ updategeom(void) {
                m->next = newmons;
                newmons = m;
        }
-
        /* initialise monitor(s) */
 #ifdef XINERAMA
        if(XineramaIsActive(dpy)) {
@@ -1734,12 +1706,11 @@ 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;
        }
-
        /* bar geometry setup */
        for(m = newmons; m; m = m->next) {
                m->sel = m->stack = m->clients = NULL;
@@ -1751,7 +1722,6 @@ updategeom(void) {
                m->topbar = TOPBAR;
                updatebarpos(m);
        }
-
        /* reassign left over clients of disappeared monitors */
        for(tm = mons; tm; tm = tm->next)
                while(tm->clients) {
@@ -1762,10 +1732,9 @@ updategeom(void) {
                        attach(c);
                        attachstack(c);
                }
-
        /* select focused monitor */
        cleanupmons();
-       mons = newmons;
+       selmon = mons = newmons;
        selmon = wintomon(root);
 }
 
@@ -1858,7 +1827,6 @@ updatewmhints(Client *c) {
                }
                else
                        c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
-
                XFree(wmh);
        }
 }
@@ -1898,7 +1866,7 @@ wintomon(Window w) {
                        return m;
        if((c = wintoclient(w)))
                return c->mon;
-       return mons;
+       return selmon;
 }
 
 /* There's no way to check accesses to destroyed windows, thus those cases are
@@ -1938,7 +1906,9 @@ void
 zoom(const Arg *arg) {
        Client *c = selmon->sel;
 
-       if(!lt[selmon->sellt]->arrange || lt[selmon->sellt]->arrange == monocle || (selmon->sel && selmon->sel->isfloating))
+       if(!lt[selmon->sellt]->arrange
+       || lt[selmon->sellt]->arrange == monocle
+       || (selmon->sel && selmon->sel->isfloating))
                return;
        if(c == nexttiled(selmon->clients))
                if(!c || !(c = nexttiled(c->next)))
@@ -1955,19 +1925,15 @@ main(int argc, char *argv[]) {
                die("dwm-"VERSION", © 2006-2009 dwm engineers, see LICENSE for details\n");
        else if(argc != 1)
                die("usage: dwm [-v]\n");
-
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fputs("warning: no locale support\n", stderr);
-
        if(!(dpy = XOpenDisplay(NULL)))
                die("dwm: cannot open display\n");
-
        checkotherwm();
        setup();
        scan();
        run();
        cleanup();
-
        XCloseDisplay(dpy);
        return 0;
 }