M client.c → client.c

@@ -36,7 +36,7 @@ AnyModifier,
       c->parent,
       False,
       ButtonMask,
-      GrabModeAsync,
+      GrabModeSync,
       GrabModeSync,
       None,
       None);

M event.c → event.c

@@ -62,8 +62,10 @@ keyrelease(&ev.xkey);
         break;
       case ButtonPress:
         button(&ev.xbutton);
+        XAllowEvents(dpy, ReplayPointer, ev.xbutton.time);
         break;
       case ButtonRelease:
+        XAllowEvents(dpy, ReplayPointer, ev.xbutton.time);
         break;
       case MapRequest:
         mapreq(&ev.xmaprequest);
@@ -238,7 +240,7 @@ if (!manage(c, 0))
           return;
         break;
       }
-      XReparentWindow(dpy, c->window, c->parent, BORDER - 1, BORDER - 1);
+      XReparentWindow(dpy, c->window, c->parent, BORDER, BORDER);
       XAddToSaveSet(dpy, c->window);
       /* fall through... */
     case NormalState:

M manage.c → manage.c

@@ -30,6 +30,7 @@ XClassHint class;
   XWMHints* hints;
   XSetWindowAttributes attrs;
   XRRMonitorInfo monitor;
+  ScreenInfo* screen;
 
   trace("manage", c, 0);
   XSelectInput(
@@ -141,9 +142,10 @@ nwin %= 10;
     }
 
     if (c->is9term && !(fixsize ? drag(c, Button3) : sweep(c, Button3))) {
+      screen = c->screen;
       XKillClient(dpy, c->window);
       rmclient(c);
-      if (current && current->screen == c->screen)
+      if (current && current->screen == screen)
         cmapfocus(current);
       return 0;
     }

M menu.c → menu.c

@@ -146,8 +146,8 @@ return;
     case Button2:
       if (c) {
         XMapRaised(dpy, c->parent);
+        top(c);
         active(c);
-        XAllowEvents(dpy, ReplayPointer, curtime);
       } else if (
         (e->state & (ShiftMask | ControlMask)) == (ShiftMask | ControlMask)) {
         menuhit(e, &egg);
@@ -155,6 +155,12 @@ } else if (numvirtuals > 1 && (n = menuhit(e, &b2menu)) > -1)
         button2(n);
       return;
     case Button3:
+      if (c) {
+        XMapRaised(dpy, c->parent);
+        top(c);
+        active(c);
+        return;
+      }
       break;
     case Button4:
       /* scroll up changes to previous virtual screen, wraps around */