Author: olivier
Date: 2008-06-16 21:17:09 + (Mon, 16 Jun 2008)
New Revision: 27077
Modified:
xfwm4/trunk/src/client.c
xfwm4/trunk/src/netwm.c
xfwm4/trunk/src/workspaces.c
Log:
Remove workarounds for older bugs, fixes side effects with Tk apps stealing
focus on pointer ungrab (Bug #4154)
Modified: xfwm4/trunk/src/client.c
===
--- xfwm4/trunk/src/client.c2008-06-16 12:13:21 UTC (rev 27076)
+++ xfwm4/trunk/src/client.c2008-06-16 21:17:09 UTC (rev 27077)
@@ -197,8 +197,6 @@
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 @@
}
}
-myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(screen_info-display_info));
}
void
@@ -2903,15 +2900,7 @@
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 @@
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 @@
}
}
-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 @@
clientConfigure (c, wc, CWX | CWY, CFG_CONSTRAINED |
CFG_REQUEST);
}
}
-myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(screen_info-display_info));
g_list_free (list_of_windows);
}
Modified: xfwm4/trunk/src/netwm.c
===
--- xfwm4/trunk/src/netwm.c 2008-06-16 12:13:21 UTC (rev 27076)
+++ xfwm4/trunk/src/netwm.c 2008-06-16 21:17:09 UTC (rev 27077)
@@ -736,15 +736,7 @@
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
{
Modified: xfwm4/trunk/src/workspaces.c
===
--- xfwm4/trunk/src/workspaces.c2008-06-16 12:13:21 UTC (rev 27076)
+++ xfwm4/trunk/src/workspaces.c2008-06-16 21:17:09 UTC (rev 27077)
@@ -278,8 +278,6 @@
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 @@
clientFocusTop (screen_info, WIN_LAYER_NORMAL, timestamp);
}
}
-
-myScreenUngrabPointer (screen_info, timestamp);
}
void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
