Commit 1926dbc1 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Flush after ungrabbing the server.

Mon Apr  7 19:43:15 2003  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkdisplay-x11.c (gdk_x11_display_ungrab): Flush
        after ungrabbing the server.

        * gdk/x11/gdkimage-x11.c: Remove some no-longer-needed
        calls to XFlush().

        * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer):
        Use gdk_x11_display_grab/ungrab.
parent ade1ae83
Mon Apr 7 19:43:15 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdisplay-x11.c (gdk_x11_display_ungrab): Flush
after ungrabbing the server.
* gdk/x11/gdkimage-x11.c: Remove some no-longer-needed
calls to XFlush().
* gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer):
Use gdk_x11_display_grab/ungrab.
2003-04-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextlayout.c (set_para_values):
......
Mon Apr 7 19:43:15 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdisplay-x11.c (gdk_x11_display_ungrab): Flush
after ungrabbing the server.
* gdk/x11/gdkimage-x11.c: Remove some no-longer-needed
calls to XFlush().
* gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer):
Use gdk_x11_display_grab/ungrab.
2003-04-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextlayout.c (set_para_values):
......
Mon Apr 7 19:43:15 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdisplay-x11.c (gdk_x11_display_ungrab): Flush
after ungrabbing the server.
* gdk/x11/gdkimage-x11.c: Remove some no-longer-needed
calls to XFlush().
* gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer):
Use gdk_x11_display_grab/ungrab.
2003-04-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextlayout.c (set_para_values):
......
Mon Apr 7 19:43:15 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdisplay-x11.c (gdk_x11_display_ungrab): Flush
after ungrabbing the server.
* gdk/x11/gdkimage-x11.c: Remove some no-longer-needed
calls to XFlush().
* gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer):
Use gdk_x11_display_grab/ungrab.
2003-04-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextlayout.c (set_para_values):
......
Mon Apr 7 19:43:15 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkdisplay-x11.c (gdk_x11_display_ungrab): Flush
after ungrabbing the server.
* gdk/x11/gdkimage-x11.c: Remove some no-longer-needed
calls to XFlush().
* gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer):
Use gdk_x11_display_grab/ungrab.
2003-04-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextlayout.c (set_para_values):
......
......@@ -127,6 +127,7 @@ gdk_display_open (const gchar *display_name)
display_x11 = GDK_DISPLAY_X11 (display);
display_x11->use_xft = -1;
display_x11->use_xshm = TRUE;
display_x11->xdisplay = xdisplay;
/* Set up handlers for Xlib internal connections */
......@@ -535,7 +536,10 @@ gdk_x11_display_ungrab (GdkDisplay * display)
display_x11->grab_count--;
if (display_x11->grab_count == 0)
XUngrabServer (display_x11->xdisplay);
{
XUngrabServer (display_x11->xdisplay);
XFlush (display_x11->xdisplay);
}
}
static void
......
......@@ -533,7 +533,6 @@ _gdk_x11_copy_to_image (GdkDrawable *drawable,
#define UNGRAB() G_STMT_START { \
if (have_grab) { \
gdk_x11_display_ungrab (display); \
XFlush (xdisplay); \
have_grab = FALSE; } \
} G_STMT_END
......@@ -671,7 +670,6 @@ _gdk_x11_copy_to_image (GdkDrawable *drawable,
if (have_grab)
{
gdk_x11_display_ungrab (display);
XFlush (xdisplay);
have_grab = FALSE;
}
......
......@@ -2774,7 +2774,7 @@ _gdk_windowing_window_at_pointer (GdkDisplay *display,
* than we'll end up with inaccurate values for win_x, win_y
* and the result.
*/
XGrabServer (xdisplay);
gdk_x11_display_grab (display);
XQueryPointer (xdisplay, xwindow,
&root, &child, &rootx, &rooty, &winx, &winy, &xmask);
......@@ -2789,7 +2789,7 @@ _gdk_windowing_window_at_pointer (GdkDisplay *display,
XQueryPointer (xdisplay, xwindow,
&root, &xwindow, &rootx, &rooty, &winx, &winy, &xmask);
}
XUngrabServer (xdisplay);
gdk_x11_display_ungrab (display);
window = gdk_window_lookup_for_display (GDK_SCREEN_DISPLAY(screen),
xwindow_last);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment