Merge lp:~cimi/overlay-scrollbar/use-gdk-flush-in-present-window into lp:overlay-scrollbar

Proposed by Andrea Cimitan
Status: Merged
Merged at revision: 182
Proposed branch: lp:~cimi/overlay-scrollbar/use-gdk-flush-in-present-window
Merge into: lp:overlay-scrollbar
Diff against target: 41 lines (+7/-8)
1 file modified
os/os-scrollbar.c (+7/-8)
To merge this branch: bzr merge lp:~cimi/overlay-scrollbar/use-gdk-flush-in-present-window
Reviewer Review Type Date Requested Status
Loïc Molinari (community) Approve
Review via email: mp+55317@code.launchpad.net

Description of the change

just use gdk_flush instead XSync

To post a comment you must log in.
Revision history for this message
Loïc Molinari (loic.molinari) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'os/os-scrollbar.c'
2--- os/os-scrollbar.c 2011-03-29 10:35:30 +0000
3+++ os/os-scrollbar.c 2011-03-29 11:16:22 +0000
4@@ -114,8 +114,7 @@
5
6 /* Present a X11 window. */
7 static void
8-os_present_window_with_timestamp (Display *default_display,
9- Screen *screen,
10+os_present_window_with_timestamp (Screen *screen,
11 gint xid,
12 guint32 timestamp)
13 {
14@@ -144,12 +143,13 @@
15 xev.xclient.data.l[4] = 0;
16
17 gdk_error_trap_push ();
18- XSendEvent (display,
19- root,
20- False,
21+
22+ XSendEvent (display, root, False,
23 SubstructureRedirectMask | SubstructureNotifyMask,
24 &xev);
25- XSync (default_display, False);
26+
27+ gdk_flush ();
28+
29 gdk_error_trap_pop ();
30 }
31
32@@ -158,8 +158,7 @@
33 os_present_gdk_window_with_timestamp (GtkWidget *widget,
34 guint32 timestamp)
35 {
36- os_present_window_with_timestamp (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
37- GDK_SCREEN_XSCREEN (gtk_widget_get_screen (widget)),
38+ os_present_window_with_timestamp (GDK_SCREEN_XSCREEN (gtk_widget_get_screen (widget)),
39 GDK_WINDOW_XID (gtk_widget_get_window (widget)),
40 timestamp);
41 }

Subscribers

People subscribed via source and target branches