applied Nicolas Capit's patch as interim solution until the multiscreen support is...

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 7846be0..f842b41 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -42,7 +42,7 @@
 
 /* macros */
 #define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
 
 /* macros */
 #define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)

-#define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask))
+#define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))

 #define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
 #define ISVISIBLE(C)            ((C->tags & C->mon->tagset[C->mon->seltags]))
 #define LENGTH(X)               (sizeof X / sizeof X[0])
 #define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH))
 #define ISVISIBLE(C)            ((C->tags & C->mon->tagset[C->mon->seltags]))
 #define LENGTH(X)               (sizeof X / sizeof X[0])


@@ -442,7 +442,7 @@ buttonpress(XEvent *e) {
                }
                else if(ev->x < x + blw)
                        click = ClkLtSymbol;
                }
                else if(ev->x < x + blw)
                        click = ClkLtSymbol;

-               else if(ev->x > selmon->wx + selmon->ww - TEXTW(stext))
+               else if(ev->x > selmon->ww - TEXTW(stext))

                        click = ClkStatusText;
                else
                        click = ClkWinTitle;
                        click = ClkStatusText;
                else
                        click = ClkWinTitle;


@@ -585,11 +585,13 @@ void
 configurenotify(XEvent *e) {
        Monitor *m;
        XConfigureEvent *ev = &e->xconfigure;
 configurenotify(XEvent *e) {
        Monitor *m;
        XConfigureEvent *ev = &e->xconfigure;

+       Bool dirty;

 
        if(ev->window == root) {
 
        if(ev->window == root) {

+               dirty = (sw != ev->width);

                sw = ev->width;
                sh = ev->height;
                sw = ev->width;
                sh = ev->height;

-               if(updategeom()) {
+               if(updategeom() || dirty) {

                        if(dc.drawable != 0)
                                XFreePixmap(dpy, dc.drawable);
                        dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
                        if(dc.drawable != 0)
                                XFreePixmap(dpy, dc.drawable);
                        dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));


@@ -818,15 +820,19 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
 
 void
 enternotify(XEvent *e) {
 
 void
 enternotify(XEvent *e) {

+       Client *c;

        Monitor *m;
        XCrossingEvent *ev = &e->xcrossing;
 
        if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
                return;
        Monitor *m;
        XCrossingEvent *ev = &e->xcrossing;
 
        if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
                return;

+       c = wintoclient(ev->window);

        if((m = wintomon(ev->window)) && m != selmon) {
                unfocus(selmon->sel, True);
                selmon = m;
        }
        if((m = wintomon(ev->window)) && m != selmon) {
                unfocus(selmon->sel, True);
                selmon = m;
        }

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

        focus((wintoclient(ev->window)));
 }
 
        focus((wintoclient(ev->window)));
 }