Author: olivier
Date: 2006-07-08 16:57:14 +0000 (Sat, 08 Jul 2006)
New Revision: 22296
Modified:
xfwm4/trunk/src/client.c
xfwm4/trunk/src/display.c
xfwm4/trunk/src/display.h
xfwm4/trunk/src/events.c
Log:
Not sure why the tab window sometimes misses the key release.
Modified: xfwm4/trunk/src/client.c
===================================================================
--- xfwm4/trunk/src/client.c 2006-07-08 15:55:39 UTC (rev 22295)
+++ xfwm4/trunk/src/client.c 2006-07-08 16:57:14 UTC (rev 22296)
@@ -3256,11 +3256,17 @@
display_info = screen_info->display_info;
/* Update the display time */
- myDisplayUpdateCurentTime (display_info, xevent);
+ myDisplayUpdateCurrentTime (display_info, xevent);
if (xevent->type == KeyPress)
{
+ while (XCheckMaskEvent (display_info->dpy, KeyPressMask, xevent))
+ {
+ /* Update the display time */
+ myDisplayUpdateCurrentTime (display_info, xevent);
+ }
+
if (passdata->use_keys)
{
int key_move = 16;
@@ -3374,7 +3380,7 @@
while (XCheckMaskEvent (display_info->dpy, ButtonMotionMask, xevent))
{
/* Update the display time */
- myDisplayUpdateCurentTime (display_info, xevent);
+ myDisplayUpdateCurrentTime (display_info, xevent);
}
if (!passdata->grab && screen_info->params->box_move)
{
@@ -3656,16 +3662,16 @@
cursor = myDisplayGetCursorMove(display_info);
getMouseXY (screen_info, screen_info->xroot, &passdata.mx,
&passdata.my);
}
- g1 = myScreenGrabKeyboard (screen_info, myDisplayGetCurrentTime
(display_info));
+ g1 = myScreenGrabKeyboard (screen_info, CurrentTime);
g2 = myScreenGrabPointer (screen_info, ButtonMotionMask |
ButtonReleaseMask,
- cursor, myDisplayGetCurrentTime (display_info));
+ cursor, CurrentTime);
if (!g1 || !g2)
{
TRACE ("grab failed in clientMove");
gdk_beep ();
- myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime
(display_info));
- myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
+ myScreenUngrabKeyboard (screen_info, CurrentTime);
+ myScreenUngrabPointer (screen_info, CurrentTime);
return;
}
@@ -3810,14 +3816,14 @@
disp_max_y = rect.y + rect.height;
/* Update the display time */
- myDisplayUpdateCurentTime (display_info, xevent);
+ myDisplayUpdateCurrentTime (display_info, xevent);
if (xevent->type == KeyPress)
{
while (XCheckMaskEvent (display_info->dpy, KeyPressMask, xevent))
{
/* Update the display time */
- myDisplayUpdateCurentTime (display_info, xevent);
+ myDisplayUpdateCurrentTime (display_info, xevent);
}
if (passdata->use_keys)
@@ -3961,7 +3967,7 @@
while (XCheckMaskEvent (display_info->dpy, ButtonMotionMask |
PointerMotionMask, xevent))
{
/* Update the display time */
- myDisplayUpdateCurentTime (display_info, xevent);
+ myDisplayUpdateCurrentTime (display_info, xevent);
}
if (xevent->type == ButtonRelease)
@@ -4165,18 +4171,18 @@
getMouseXY (screen_info, screen_info->xroot, &passdata.mx,
&passdata.my);
}
- g1 = myScreenGrabKeyboard (screen_info, myDisplayGetCurrentTime
(display_info));
+ g1 = myScreenGrabKeyboard (screen_info, CurrentTime);
g2 = myScreenGrabPointer (screen_info, ButtonMotionMask |
ButtonReleaseMask,
myDisplayGetCursorResize(display_info,
passdata.corner),
- myDisplayGetCurrentTime (display_info));
+ CurrentTime);
if (!g1 || !g2)
{
TRACE ("grab failed in clientResize");
gdk_beep ();
- myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime
(display_info));
- myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
+ myScreenUngrabKeyboard (screen_info, CurrentTime);
+ myScreenUngrabPointer (screen_info, CurrentTime);
return;
}
@@ -4286,7 +4292,7 @@
gone = FALSE;
/* Update the display time */
- myDisplayUpdateCurentTime (display_info, xevent);
+ myDisplayUpdateCurrentTime (display_info, xevent);
switch (xevent->type)
{
@@ -4382,17 +4388,16 @@
screen_info = c->screen_info;
display_info = screen_info->display_info;
- g1 = myScreenGrabKeyboard (screen_info, myDisplayGetCurrentTime
(display_info));
- g2 = myScreenGrabPointer (screen_info, NoEventMask, None,
- myDisplayGetCurrentTime (display_info));
+ g1 = myScreenGrabKeyboard (screen_info, CurrentTime);
+ g2 = myScreenGrabPointer (screen_info, NoEventMask, None, CurrentTime);
if (!g1 || !g2)
{
TRACE ("grab failed in clientCycle");
gdk_beep ();
- myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime
(display_info));
- myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
+ myScreenUngrabKeyboard (screen_info, CurrentTime);
+ myScreenUngrabPointer (screen_info, CurrentTime);
return;
}
@@ -4488,7 +4493,7 @@
display_info = screen_info->display_info;
/* Update the display time */
- myDisplayUpdateCurentTime (display_info, xevent);
+ myDisplayUpdateCurrentTime (display_info, xevent);
status = EVENT_FILTER_STOP;
pressed = TRUE;
Modified: xfwm4/trunk/src/display.c
===================================================================
--- xfwm4/trunk/src/display.c 2006-07-08 15:55:39 UTC (rev 22295)
+++ xfwm4/trunk/src/display.c 2006-07-08 16:57:14 UTC (rev 22296)
@@ -605,7 +605,7 @@
}
Time
-myDisplayUpdateCurentTime (DisplayInfo *display, XEvent *ev)
+myDisplayUpdateCurrentTime (DisplayInfo *display, XEvent *ev)
{
g_return_val_if_fail (display != NULL, (Time) CurrentTime);
Modified: xfwm4/trunk/src/display.h
===================================================================
--- xfwm4/trunk/src/display.h 2006-07-08 15:55:39 UTC (rev 22295)
+++ xfwm4/trunk/src/display.h 2006-07-08 16:57:14 UTC (rev 22296)
@@ -282,7 +282,7 @@
Window);
#endif
ScreenInfo * myDisplayGetDefaultScreen (DisplayInfo *);
-Time myDisplayUpdateCurentTime (DisplayInfo *,
+Time myDisplayUpdateCurrentTime (DisplayInfo *,
XEvent *);
Time myDisplayGetCurrentTime (DisplayInfo *);
Time myDisplayGetLastUserTime (DisplayInfo *);
Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c 2006-07-08 15:55:39 UTC (rev 22295)
+++ xfwm4/trunk/src/events.c 2006-07-08 16:57:14 UTC (rev 22296)
@@ -143,7 +143,7 @@
status = EVENT_FILTER_STOP;
/* Update the display time */
- myDisplayUpdateCurentTime (passdata->display_info, xevent);
+ myDisplayUpdateCurrentTime (passdata->display_info, xevent);
if ((xevent->type == ButtonRelease) || (xevent->type == ButtonPress))
{
@@ -1280,7 +1280,7 @@
while (XCheckTypedWindowEvent (display_info->dpy, ev->window,
ConfigureRequest, &otherEvent))
{
/* Update the display time */
- myDisplayUpdateCurentTime (display_info, &otherEvent);
+ myDisplayUpdateCurrentTime (display_info, &otherEvent);
if (otherEvent.xconfigurerequest.value_mask == ev->value_mask)
{
@@ -2159,7 +2159,7 @@
TRACE ("entering handleEvent");
/* Update the display time */
- myDisplayUpdateCurentTime (display_info, ev);
+ myDisplayUpdateCurrentTime (display_info, ev);
sn_process_event (ev);
compositorHandleEvent (display_info, ev);
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
