minor fix

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index c47887b..32b7fc8 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -124,7 +124,7 @@ struct Monitor {
        int screen_number;
        float mfact;
        int by, btx;          /* bar geometry */
-       int mx, my, mw, mh;           /* screen size */
+       int mx, my, mw, mh;   /* screen size */
        int wx, wy, ww, wh;   /* window area  */
        unsigned int seltags;
        unsigned int sellt;
@@ -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);
@@ -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,15 +233,11 @@ 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];
 static int screen;
-static int sx, sy, sw, sh;   /* X display screen geometry x, y, width, height */
+static int sw, sh;   /* X display screen geometry x, y, width, height */
 static int bh, blw = 0;      /* bar geometry */
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;
@@ -302,19 +300,20 @@ applyrules(Client *c) {
 Bool
 applysizehints(Client *c, int *x, int *y, int *w, int *h) {
        Bool baseismin;
+       Monitor *m = c->mon;
 
        /* set minimum possible */
        *w = MAX(1, *w);
        *h = MAX(1, *h);
 
-       if(*x > sx + sw)
-               *x = sw - WIDTH(c);
-       if(*y > sy + sh)
-               *y = sh - HEIGHT(c);
-       if(*x + *w + 2 * c->bw < sx)
-               *x = sx;
-       if(*y + *h + 2 * c->bw < sy)
-               *y = sy;
+       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)
@@ -635,8 +634,7 @@ 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';
                buf[1] = '\0';
@@ -644,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]);
@@ -802,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;
@@ -813,7 +809,6 @@ focusmon(const Arg *arg) {
        selmon = m;
        focus(NULL);
 }
-#endif /* XINERAMA */
 
 void
 focusstack(const Arg *arg) {
@@ -1046,28 +1041,38 @@ manage(Window w, XWindowAttributes *wa) {
                die("fatal: could not malloc() %u bytes\n", sizeof(Client));
        *c = cz;
        c->win = w;
-       c->mon = selmon;
+
+       if(XGetTransientForHint(dpy, w, &trans))
+               t = wintoclient(trans);
+       if(t) {
+               c->mon = t->mon;
+               c->tags = t->tags;
+       }
+       else {
+               c->mon = selmon;
+               applyrules(c);
+       }
 
        /* geometry */
-       c->x = wa->x + selmon->wx;
-       c->y = wa->y + selmon->wy;
+       c->x = wa->x + c->mon->wx;
+       c->y = wa->y + c->mon->wy;
        c->w = wa->width;
        c->h = wa->height;
        c->oldbw = wa->border_width;
-       if(c->w == selmon->mw && c->h == selmon->mh) {
-               c->x = selmon->mx;
-               c->y = selmon->my;
+       if(c->w == c->mon->mw && c->h == c->mon->mh) {
+               c->x = c->mon->mx;
+               c->y = c->mon->my;
                c->bw = 0;
        }
        else {
-               if(c->x + WIDTH(c) > selmon->mx + selmon->mw)
-                       c->x = selmon->mx + selmon->mw - WIDTH(c);
-               if(c->y + HEIGHT(c) > selmon->my + selmon->mh)
-                       c->y = selmon->my + selmon->mh - HEIGHT(c);
-               c->x = MAX(c->x, selmon->mx);
+               if(c->x + WIDTH(c) > c->mon->mx + c->mon->mw)
+                       c->x = c->mon->mx + c->mon->mw - WIDTH(c);
+               if(c->y + HEIGHT(c) > c->mon->my + c->mon->mh)
+                       c->y = c->mon->my + c->mon->mh - HEIGHT(c);
+               c->x = MAX(c->x, c->mon->mx);
                /* only fix client y-offset, if the client center might cover the bar */
                c->y = MAX(c->y, ((c->mon->by == 0) && (c->x + (c->w / 2) >= c->mon->wx)
-                          && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : selmon->my);
+                          && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
                c->bw = borderpx;
        }
 
@@ -1079,12 +1084,6 @@ manage(Window w, XWindowAttributes *wa) {
        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
        grabbuttons(c, False);
        updatetitle(c);
-       if(XGetTransientForHint(dpy, w, &trans))
-               t = wintoclient(trans);
-       if(t)
-               c->tags = t->tags;
-       else
-               applyrules(c);
        if(!c->isfloating)
                c->isfloating = trans != None || c->isfixed;
        if(c->isfloating)
@@ -1196,7 +1195,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
@@ -1371,6 +1370,7 @@ void
 sendmon(Client *c, Monitor *m) {
        if(c->mon == m)
                return;
+       unfocus(c);
        detach(c);
        detachstack(c);
        c->mon = m;
@@ -1425,8 +1425,6 @@ setup(void) {
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
        initfont(font);
-       sx = 0;
-       sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        bh = dc.h = dc.font.height + 2;
@@ -1526,7 +1524,6 @@ tag(const Arg *arg) {
        }
 }
 
-#ifdef XINERAMA
 void
 tagmon(const Arg *arg) {
        Monitor *m;
@@ -1535,7 +1532,6 @@ tagmon(const Arg *arg) {
                return;
        sendmon(selmon->sel, m);
 }
-#endif /* XINERAMA */
 
 int
 textnw(const char *text, unsigned int len) {
@@ -1731,9 +1727,9 @@ updategeom(void) {
        /* default monitor setup */
        {
                m->screen_number = 0;
-               m->wx = sx;
-               m->my = m->wy = sy;
-               m->ww = sw;
+               m->mx = m->wx = 0;
+               m->my = m->wy = 0;
+               m->mw = m->ww = sw;
                m->mh = m->wh = sh;
        }
 
@@ -1762,7 +1758,7 @@ updategeom(void) {
 
        /* select focused monitor */
        cleanupmons();
-       mons = newmons;
+       selmon = mons = newmons;
        selmon = wintomon(root);
 }
 
@@ -1895,7 +1891,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