Added tag 5.9 for changeset dd74622a4785

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index ba00afe..01e8d1f 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -827,13 +827,14 @@ enternotify(XEvent *e) {
        if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
                return;
        c = wintoclient(ev->window);
        if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
                return;
        c = wintoclient(ev->window);

-       if((m = wintomon(ev->window)) && m != selmon) {
+       m = c ? c->mon : wintomon(ev->window);
+       if(m != selmon) {

                unfocus(selmon->sel, True);
                selmon = m;
        }
                unfocus(selmon->sel, True);
                selmon = m;
        }

-       else if(c == selmon->sel || c == NULL)
+       else if(!c || c == selmon->sel)

                return;
                return;

-       focus((wintoclient(ev->window)));
+       focus(c);

 }
 
 void
 }
 
 void


@@ -1112,8 +1113,8 @@ manage(Window w, XWindowAttributes *wa) {
                applyrules(c);
        }
        /* geometry */
                applyrules(c);
        }
        /* geometry */

-       c->x = c->oldx = wa->x + c->mon->wx;
-       c->y = c->oldy = wa->y + c->mon->wy;
+       c->x = c->oldx = wa->x;
+       c->y = c->oldy = wa->y;

        c->w = c->oldw = wa->width;
        c->h = c->oldh = wa->height;
        c->oldbw = wa->border_width;
        c->w = c->oldw = wa->width;
        c->h = c->oldh = wa->height;
        c->oldbw = wa->border_width;