removed unneeded offset recalculation, thanks Jukka, let's see if this breaks some...

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 8c1adeb..a0ab126 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -42,7 +42,7 @@
 
 /* macros */
 #define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
-#define CLEANMASK(mask)         (mask & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
+#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])
@@ -442,7 +442,7 @@ buttonpress(XEvent *e) {
                }
                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;
@@ -529,7 +529,7 @@ clientmessage(XEvent *e) {
        if(!c)
                return;
        if(cme->message_type == netatom[NetWMState] && cme->data.l[1] == netatom[NetWMFullscreen]) {
-               if(cme->data.l[0]) {
+               if(cme->data.l[0] && !c->isfullscreen) {
                        XChangeProperty(dpy, cme->window, netatom[NetWMState], XA_ATOM, 32,
                                        PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
                        c->isfullscreen = True;
@@ -1112,8 +1112,8 @@ manage(Window w, XWindowAttributes *wa) {
                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;