diff --git a/src/client.c b/src/client.c index 732c0ade4a7c65bb510acae1f30ee0bcc1d82a13..9c5ec142895784dc39847217fb6c3766c152beaf 100644 --- a/src/client.c +++ b/src/client.c @@ -197,8 +197,6 @@ clientUpdateAllFrames (ScreenInfo *screen_info, int mask) g_return_if_fail (screen_info != NULL); TRACE ("entering clientRedrawAllFrames"); - myScreenGrabPointer (screen_info, EnterWindowMask, None, myDisplayGetCurrentTime (screen_info->display_info)); - for (c = screen_info->clients, i = 0; i < screen_info->client_count; c = c->next, i++) { unsigned long configure_flags = 0L; @@ -260,7 +258,6 @@ clientUpdateAllFrames (ScreenInfo *screen_info, int mask) } } - myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (screen_info->display_info)); } void @@ -2903,15 +2900,7 @@ clientToggleMaximized (Client * c, int mode, gboolean restore_position) if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MANAGED) && (restore_position)) { - /* - For some reason, the configure can generate EnterNotify events - on lower windows, causing a nasty race cond with apps trying to - grab focus in focus follow mouse mode. Grab the pointer to - avoid these effects - */ - myScreenGrabPointer (c->screen_info, EnterWindowMask, None, myDisplayGetCurrentTime (display_info)); clientConfigure (c, &wc, CWWidth | CWHeight | CWX | CWY, CFG_FORCE_REDRAW); - myScreenUngrabPointer (c->screen_info, myDisplayGetCurrentTime (display_info)); } } @@ -3129,15 +3118,7 @@ clientFill (Client * c, int fill_type) TRACE ("Fill size request: (%d,%d) %dx%d", wc.x, wc.y, wc.width, wc.height); if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MANAGED)) { - /* - For some reason, the configure can generate EnterNotify events - on lower windows, causing a nasty race cond with apps trying to - grab focus in focus follow mouse mode. Grab the pointer to - avoid these effects - */ - myScreenGrabPointer (c->screen_info, EnterWindowMask, None, myDisplayGetCurrentTime (display_info)); clientConfigure(c, &wc, mask, NO_CFG_FLAG); - myScreenUngrabPointer (c->screen_info, myDisplayGetCurrentTime (display_info)); } } @@ -3289,7 +3270,6 @@ clientScreenResize(ScreenInfo *screen_info) } } - myScreenGrabPointer (screen_info, EnterWindowMask, None, myDisplayGetCurrentTime (screen_info->display_info)); for (index = list_of_windows; index; index = g_list_next (index)) { unsigned long maximization_flags = 0L; @@ -3326,7 +3306,6 @@ clientScreenResize(ScreenInfo *screen_info) clientConfigure (c, &wc, CWX | CWY, CFG_CONSTRAINED | CFG_REQUEST); } } - myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (screen_info->display_info)); g_list_free (list_of_windows); } diff --git a/src/netwm.c b/src/netwm.c index a51a842854356b11e333ece323a9f81e4c0f9a54..03350636a5fe7b97c7681d26fae35d0930dd040a 100644 --- a/src/netwm.c +++ b/src/netwm.c @@ -736,15 +736,7 @@ clientUpdateFullscreenState (Client * c) clientSetNetState (c); if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MANAGED)) { - /* - For some reason, the configure can generate EnterNotify events - on lower windows, causing a nasty race cond with apps trying to - grab focus in focus follow mouse mode. Grab the pointer to - avoid these effects - */ - myScreenGrabPointer (c->screen_info, EnterWindowMask, None, myDisplayGetCurrentTime (display_info)); clientConfigure (c, &wc, CWX | CWY | CWWidth | CWHeight, CFG_FORCE_REDRAW); - myScreenUngrabPointer (c->screen_info, myDisplayGetCurrentTime (display_info)); } else { diff --git a/src/workspaces.c b/src/workspaces.c index ff0fcae4fa0570f66e25c2a00aea69d0fc2df701..ece65c93d2385f17534cf2addc1639bee891cb22 100644 --- a/src/workspaces.c +++ b/src/workspaces.c @@ -278,8 +278,6 @@ workspaceSwitch (ScreenInfo *screen_info, int new_ws, Client * c2, gboolean upda return; } - myScreenGrabPointer (screen_info, EnterWindowMask, None, timestamp); - screen_info->previous_ws = screen_info->current_ws; screen_info->current_ws = new_ws; @@ -405,8 +403,6 @@ workspaceSwitch (ScreenInfo *screen_info, int new_ws, Client * c2, gboolean upda clientFocusTop (screen_info, WIN_LAYER_NORMAL, timestamp); } } - - myScreenUngrabPointer (screen_info, timestamp); } void