isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-08-06 08:34:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch meta_error_trap functions to MetaX11Display

Browse Source 
They are X11 specific functions, used for X11 code. They have been
improved per jadahl's suggestion to use gdk_x11_lookup_xdisplay and
gdk_x11_display_error_trap_* functions, instead of current code.

https://bugzilla.gnome.org/show_bug.cgi?id=759538
This commit is contained in:
Armin Krezović
2017-08-26 18:27:50 +02:00
committed by Jonas Ådahl
parent 18779109de
commit dacc041d0c
21 changed files with 185 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/display.c
View File

@@ -1534,7 +1534,7 @@ request_xserver_input_focus_change (MetaDisplay *display,
if (meta_display_timestamp_too_old (display, &timestamp))
return;
meta_error_trap_push (display);
meta_error_trap_push (display->x11_display);
/* In order for mutter to know that the focus request succeeded, we track
* the serial of the "focus request" we made, but if we take the serial
@@ -1567,7 +1567,7 @@ request_xserver_input_focus_change (MetaDisplay *display,
serial,
TRUE);
meta_error_trap_pop (display);
meta_error_trap_pop (display->x11_display);
display->last_focus_time = timestamp;
@@ -2091,13 +2091,13 @@ meta_display_update_active_window_hint (MetaDisplay *display)
else
data[0] = None;
meta_error_trap_push (display);
meta_error_trap_push (display->x11_display);
XChangeProperty (display->x11_display->xdisplay,
display->x11_display->xroot,
display->x11_display->atom__NET_ACTIVE_WINDOW,
XA_WINDOW,
32, PropModeReplace, (guchar*) data, 1);
meta_error_trap_pop (display);
meta_error_trap_pop (display->x11_display);
}
void