Author: olivier
Date: 2008-05-12 19:19:42 +0000 (Mon, 12 May 2008)
New Revision: 26951
Modified:
xfwm4/trunk/src/client.c
xfwm4/trunk/src/events.c
xfwm4/trunk/src/netwm.c
xfwm4/trunk/src/screen.c
xfwm4/trunk/src/screen.h
xfwm4/trunk/src/workspaces.c
Log:
Trying to get rid of CurrentTime
Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c 2008-05-12 18:19:51 UTC (rev 26950)
+++ xfwm4/trunk/src/client.c 2008-05-12 19:19:42 UTC (rev 26951)
@@ -285,7 +285,7 @@
}
}
- myScreenUngrabPointer (screen_info);
+ myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(screen_info->display_info));
}
void
@@ -3212,7 +3212,7 @@
*/
myScreenGrabPointer (c->screen_info, EnterWindowMask, None,
myDisplayGetCurrentTime (display_info));
clientConfigure (c, &wc, CWWidth | CWHeight | CWX | CWY,
CFG_FORCE_REDRAW);
- myScreenUngrabPointer (c->screen_info);
+ myScreenUngrabPointer (c->screen_info, myDisplayGetCurrentTime
(display_info));
}
}
@@ -3438,7 +3438,7 @@
*/
myScreenGrabPointer (c->screen_info, EnterWindowMask, None,
myDisplayGetCurrentTime (display_info));
clientConfigure(c, &wc, mask, NO_CFG_FLAG);
- myScreenUngrabPointer (c->screen_info);
+ myScreenUngrabPointer (c->screen_info, myDisplayGetCurrentTime
(display_info));
}
}
@@ -3627,7 +3627,7 @@
clientConfigure (c, &wc, CWX | CWY, CFG_CONSTRAINED |
CFG_REQUEST);
}
}
- myScreenUngrabPointer (screen_info);
+ myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(screen_info->display_info));
g_list_free (list_of_windows);
}
@@ -4304,8 +4304,8 @@
TRACE ("grab failed in clientMove");
gdk_beep ();
- myScreenUngrabKeyboard (screen_info);
- myScreenUngrabPointer (screen_info);
+ myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime
(display_info));
+ myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
return;
}
@@ -4378,8 +4378,8 @@
gtk_main ();
eventFilterPop (display_info->xfilter);
}
- myScreenUngrabKeyboard (screen_info);
- myScreenUngrabPointer (screen_info);
+ myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime
(display_info));
+ myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
if (passdata.grab && screen_info->params->box_move)
{
@@ -4851,8 +4851,8 @@
TRACE ("grab failed in clientResize");
gdk_beep ();
- myScreenUngrabKeyboard (screen_info);
- myScreenUngrabPointer (screen_info);
+ myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime
(display_info));
+ myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
return;
}
@@ -4927,8 +4927,8 @@
gtk_main ();
eventFilterPop (display_info->xfilter);
}
- myScreenUngrabKeyboard (screen_info);
- myScreenUngrabPointer (screen_info);
+ myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime
(display_info));
+ myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
if (passdata.grab && screen_info->params->box_resize)
{
@@ -5089,8 +5089,8 @@
TRACE ("grab failed in clientCycle");
gdk_beep ();
- myScreenUngrabKeyboard (screen_info);
- myScreenUngrabPointer (screen_info);
+ myScreenUngrabKeyboard (screen_info, ev->time);
+ myScreenUngrabPointer (screen_info, ev->time);
return;
}
@@ -5164,8 +5164,8 @@
clientSetFocus (screen_info, c, myDisplayGetCurrentTime
(display_info), NO_FOCUS_FLAG);
}
- myScreenUngrabKeyboard (screen_info);
- myScreenUngrabPointer (screen_info);
+ myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime
(display_info));
+ myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
}
static eventFilterStatus
Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c 2008-05-12 18:19:51 UTC (rev 26950)
+++ xfwm4/trunk/src/events.c 2008-05-12 19:19:42 UTC (rev 26951)
@@ -224,7 +224,7 @@
{
TRACE ("grab failed in typeOfClick");
gdk_beep ();
- myScreenUngrabPointer (screen_info);
+ myScreenUngrabPointer (screen_info, ev->xbutton.time);
return XFWM_BUTTON_UNDEFINED;
}
@@ -248,7 +248,7 @@
eventFilterPop (display_info->xfilter);
TRACE ("leaving typeOfClick loop");
- myScreenUngrabPointer (screen_info);
+ myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
XFlush (display_info->dpy);
return (XfwmButtonClickType) passdata.clicks;
}
@@ -346,7 +346,7 @@
if (!ev_screen_info)
{
/* Release queued events */
- XAllowEvents (display_info->dpy, SyncKeyboard, CurrentTime);
+ XAllowEvents (display_info->dpy, SyncKeyboard, myDisplayGetCurrentTime
(display_info));
return EVENT_FILTER_PASS;
}
@@ -564,7 +564,7 @@
}
/* Release queued events */
- XAllowEvents (display_info->dpy, SyncKeyboard, CurrentTime);
+ XAllowEvents (display_info->dpy, SyncKeyboard, myDisplayGetCurrentTime
(display_info));
return status;
}
Modified: xfwm4/trunk/src/netwm.c
===================================================================
--- xfwm4/trunk/src/netwm.c 2008-05-12 18:19:51 UTC (rev 26950)
+++ xfwm4/trunk/src/netwm.c 2008-05-12 19:19:42 UTC (rev 26951)
@@ -741,7 +741,7 @@
*/
myScreenGrabPointer (c->screen_info, EnterWindowMask, None,
myDisplayGetCurrentTime (display_info));
clientConfigure (c, &wc, CWX | CWY | CWWidth | CWHeight,
CFG_FORCE_REDRAW);
- myScreenUngrabPointer (c->screen_info);
+ myScreenUngrabPointer (c->screen_info, myDisplayGetCurrentTime
(display_info));
}
else
{
Modified: xfwm4/trunk/src/screen.c
===================================================================
--- xfwm4/trunk/src/screen.c 2008-05-12 18:19:51 UTC (rev 26950)
+++ xfwm4/trunk/src/screen.c 2008-05-12 19:19:42 UTC (rev 26951)
@@ -435,7 +435,7 @@
}
unsigned int
-myScreenUngrabKeyboard (ScreenInfo *screen_info)
+myScreenUngrabKeyboard (ScreenInfo *screen_info, Time time)
{
g_return_val_if_fail (screen_info, 0);
TRACE ("entering myScreenUngrabKeyboard");
@@ -447,7 +447,7 @@
}
if (screen_info->key_grabs == 0)
{
- XUngrabKeyboard (myScreenGetXDisplay (screen_info), CurrentTime);
+ XUngrabKeyboard (myScreenGetXDisplay (screen_info), time);
}
TRACE ("global key grabs %i", screen_info->key_grabs);
@@ -455,7 +455,7 @@
}
unsigned int
-myScreenUngrabPointer (ScreenInfo *screen_info)
+myScreenUngrabPointer (ScreenInfo *screen_info, Time time)
{
g_return_val_if_fail (screen_info, 0);
TRACE ("entering myScreenUngrabPointer");
@@ -467,7 +467,7 @@
}
if (screen_info->pointer_grabs == 0)
{
- XUngrabPointer (myScreenGetXDisplay (screen_info), CurrentTime);
+ XUngrabPointer (myScreenGetXDisplay (screen_info), time);
}
TRACE ("global pointer grabs %i", screen_info->pointer_grabs);
Modified: xfwm4/trunk/src/screen.h
===================================================================
--- xfwm4/trunk/src/screen.h 2008-05-12 18:19:51 UTC (rev 26950)
+++ xfwm4/trunk/src/screen.h 2008-05-12 19:19:42 UTC (rev 26951)
@@ -175,8 +175,10 @@
unsigned int,
Cursor,
Time);
-unsigned int myScreenUngrabKeyboard (ScreenInfo *);
-unsigned int myScreenUngrabPointer (ScreenInfo *);
+unsigned int myScreenUngrabKeyboard (ScreenInfo *,
+ Time);
+unsigned int myScreenUngrabPointer (ScreenInfo *,
+ Time);
void myScreenGrabKeys (ScreenInfo *);
void myScreenUngrabKeys (ScreenInfo *);
Client *myScreenGetClientFromWindow (ScreenInfo *,
Modified: xfwm4/trunk/src/workspaces.c
===================================================================
--- xfwm4/trunk/src/workspaces.c 2008-05-12 18:19:51 UTC (rev 26950)
+++ xfwm4/trunk/src/workspaces.c 2008-05-12 19:19:42 UTC (rev 26951)
@@ -404,7 +404,7 @@
}
}
- myScreenUngrabPointer (screen_info);
+ myScreenUngrabPointer (screen_info, timestamp);
}
void
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
