[Xfce4-commits] <xfwm4:master> Remove some XFlush() calls

[Olivier Fourdan]

Updating branch refs/heads/master
         to 29d4eaeba1abf8a79fd96aeb7c0f26655e3a39ee (commit)
       from 2a4edb8b1aad7e4cf4d3cbab3cffedd0f356fac5 (commit)

commit 29d4eaeba1abf8a79fd96aeb7c0f26655e3a39ee
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Tue Oct 25 13:47:11 2011 +0200

    Remove some XFlush() calls

 src/events.c     |    6 ++----
 src/keyboard.c   |   14 +++++++-------
 src/moveresize.c |    1 -
 src/mywindow.c   |    3 +--
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/events.c b/src/events.c
index eeb0135..f26a277 100644
--- a/src/events.c
+++ b/src/events.c
@@ -75,7 +75,7 @@
                                  (win == MYWINDOW_XWINDOW(c->buttons[SHADE_BUTTON])) || \
                                  (win == MYWINDOW_XWINDOW(c->buttons[STICK_BUTTON])))
 
-#define DOUBLE_CLICK_GRAB          (ButtonMotionMask | \
+#define DOUBLE_CLICK_GRAB       (ButtonMotionMask | \
                                  PointerMotionMask | \
                                  ButtonPressMask | \
                                  ButtonReleaseMask)
@@ -230,7 +230,6 @@ typeOfClick (ScreenInfo *screen_info, Window w, XEvent * ev, gboolean allow_doub
     g_return_val_if_fail (w != None, XFWM_BUTTON_UNDEFINED);
 
     display_info = screen_info->display_info;
-    XFlush (display_info->dpy);
     g = myScreenGrabPointer (screen_info, DOUBLE_CLICK_GRAB, None, ev->xbutton.time);
 
     if (!g)
@@ -269,7 +268,7 @@ typeOfClick (ScreenInfo *screen_info, Window w, XEvent * ev, gboolean allow_doub
     TRACE ("leaving typeOfClick loop");
 
     myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime (display_info));
-    XFlush (display_info->dpy);
+
     return (XfwmButtonClickType) passdata.clicks;
 }
 
@@ -1516,7 +1515,6 @@ handleEnterNotify (DisplayInfo *display_info, XCrossingEvent * ev)
         if (warp_pointer)
         {
             XWarpPointer (display_info->dpy, None, None, 0, 0, 0, 0, rx, ry);
-            XFlush (display_info->dpy);
         }
     }
 
diff --git a/src/keyboard.c b/src/keyboard.c
index d67b72b..ab911ec 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -141,31 +141,31 @@ grabKey (Display * dpy, MyKey * key, Window w)
         status |=
             XGrabKey (dpy, key->keycode,
                                     key->modifier | ScrollLockMask, w,
-                                    TRUE, GrabModeAsync, GrabModeAsync);
+                                    TRUE, GrabModeAsync, GrabModeSync);
         status |=
             XGrabKey (dpy, key->keycode,
                                     key->modifier | NumLockMask, w,
-                                    TRUE, GrabModeAsync, GrabModeAsync);
+                                    TRUE, GrabModeAsync, GrabModeSync);
         status |=
             XGrabKey (dpy, key->keycode,
                                     key->modifier | LockMask, w,
-                                    TRUE, GrabModeAsync, GrabModeAsync);
+                                    TRUE, GrabModeAsync, GrabModeSync);
         status |=
             XGrabKey (dpy, key->keycode,
                                     key->modifier | ScrollLockMask | NumLockMask, w,
-                                    TRUE, GrabModeAsync, GrabModeAsync);
+                                    TRUE, GrabModeAsync, GrabModeSync);
         status |=
             XGrabKey (dpy, key->keycode,
                                     key->modifier | ScrollLockMask | LockMask, w,
-                                    TRUE, GrabModeAsync, GrabModeAsync);
+                                    TRUE, GrabModeAsync, GrabModeSync);
         status |=
             XGrabKey (dpy, key->keycode,
                                     key->modifier | LockMask | NumLockMask, w,
-                                    TRUE, GrabModeAsync, GrabModeAsync);
+                                    TRUE, GrabModeAsync, GrabModeSync);
         status |=
             XGrabKey (dpy, key->keycode,
                                     key->modifier | ScrollLockMask | LockMask | NumLockMask, w,
-                                    TRUE, GrabModeAsync, GrabModeAsync);
+                                    TRUE, GrabModeAsync, GrabModeSync);
     }
 
     return (status == GrabSuccess);
diff --git a/src/moveresize.c b/src/moveresize.c
index 8b6b45c..1126357 100644
--- a/src/moveresize.c
+++ b/src/moveresize.c
@@ -837,7 +837,6 @@ clientMoveEventFilter (XEvent * xevent, gpointer data)
                 if (warp_pointer)
                 {
                     XWarpPointer (display_info->dpy, None, None, 0, 0, 0, 0, rx, ry);
-                    XFlush (display_info->dpy);
                     msx += rx;
                     msy += ry;
                 }
diff --git a/src/mywindow.c b/src/mywindow.c
index beb7407..b829a5e 100644
--- a/src/mywindow.c
+++ b/src/mywindow.c
@@ -257,9 +257,8 @@ xfwmWindowTemp (ScreenInfo *screen_info, Visual *visual,
     {
         XRaiseWindow (myScreenGetXDisplay (screen_info), win->window);
     }
-    XMapWindow (myScreenGetXDisplay (screen_info), win->window);
-    XFlush (myScreenGetXDisplay (screen_info));
 
+    XMapWindow (myScreenGetXDisplay (screen_info), win->window);
     win->map = TRUE;
     win->screen_info = screen_info;
     win->x = x;