Merge branch 'master' into next

diff --combined src/handlers.c
index d7f75235b4314e6b8567f5df4cb19f47bd1315d7,7a6ab8dbc620d4e997c2fccd4e35a7540bd5d8fa..1e6b634c6cfd33de2f9367525deaa8b91b5e7f04
--- 1/src/handlers.c
--- 2/src/handlers.c
+++ b/src/handlers.c
@@@ -651,18 -651,18 +651,18 @@@ static void handle_expose_event(xcb_exp
      return;
  }
  
 -#define _NET_WM_MOVERESIZE_SIZE_TOPLEFT      0
 -#define _NET_WM_MOVERESIZE_SIZE_TOP          1
 -#define _NET_WM_MOVERESIZE_SIZE_TOPRIGHT     2
 -#define _NET_WM_MOVERESIZE_SIZE_RIGHT        3
 -#define _NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT  4
 -#define _NET_WM_MOVERESIZE_SIZE_BOTTOM       5
 -#define _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT   6
 -#define _NET_WM_MOVERESIZE_SIZE_LEFT         7
 -#define _NET_WM_MOVERESIZE_MOVE              8  /* movement only */
 -#define _NET_WM_MOVERESIZE_SIZE_KEYBOARD     9  /* size via keyboard */
 -#define _NET_WM_MOVERESIZE_MOVE_KEYBOARD     10 /* move via keyboard */
 -#define _NET_WM_MOVERESIZE_CANCEL            11 /* cancel operation */
 +#define _NET_WM_MOVERESIZE_SIZE_TOPLEFT 0
 +#define _NET_WM_MOVERESIZE_SIZE_TOP 1
 +#define _NET_WM_MOVERESIZE_SIZE_TOPRIGHT 2
 +#define _NET_WM_MOVERESIZE_SIZE_RIGHT 3
 +#define _NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT 4
 +#define _NET_WM_MOVERESIZE_SIZE_BOTTOM 5
 +#define _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT 6
 +#define _NET_WM_MOVERESIZE_SIZE_LEFT 7
 +#define _NET_WM_MOVERESIZE_MOVE 8           /* movement only */
 +#define _NET_WM_MOVERESIZE_SIZE_KEYBOARD 9  /* size via keyboard */
 +#define _NET_WM_MOVERESIZE_MOVE_KEYBOARD 10 /* move via keyboard */
 +#define _NET_WM_MOVERESIZE_CANCEL 11        /* cancel operation */
  
  /*
   * Handle client messages (EWMH)
@@@ -1267,7 -1267,7 +1267,7 @@@ void handle_event(int type, xcb_generic
              /* See The XKB Extension: Library Specification, section 14.1 */
              /* We check if the current group (each group contains
               * two levels) has been changed. Mode_switch activates
-              * group XkbGroup2Index */
+              * group XCB_XKB_GROUP_2 */
              if (xkb_current_group == state->group)
                  return;
              xkb_current_group = state->group;
@@@ -1277,7 -1277,7 +1277,7 @@@
                  grab_all_keys(conn, false);
              } else {
                  DLOG("Mode_switch enabled\n");
-                 grab_all_keys(conn, false);
+                 grab_all_keys(conn, true);
              }
          }