summaryrefslogtreecommitdiff
path: root/src/x11/window-x11.c
diff options
context:
space:
mode:
authorArmin Krezović <krezovic.armin@gmail.com>2017-08-26 18:28:53 +0200
committerJonas Ådahl <jadahl@gmail.com>2018-07-06 19:47:16 +0200
commitc64d5ad8af0712390c1ff10795a578cb31a0bb9b (patch)
treedf4796415c390c8fd5386afdd7210107362a67bb /src/x11/window-x11.c
parentdacc041d0c0ddefa99085158dcbdeb13949b3cd0 (diff)
downloadmutter-c64d5ad8af0712390c1ff10795a578cb31a0bb9b.tar.gz
Move X11 extension queries to MetaX11Display
Also split extension queries into their own functions https://bugzilla.gnome.org/show_bug.cgi?id=759538
Diffstat (limited to 'src/x11/window-x11.c')
-rw-r--r--src/x11/window-x11.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index 0341279ae..d7910a1a8 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -650,7 +650,7 @@ meta_window_x11_unmanage (MetaWindow *window)
window->user_time_window = None;
}
- if (META_DISPLAY_HAS_SHAPE (window->display))
+ if (META_X11_DISPLAY_HAS_SHAPE (x11_display))
XShapeSelectInput (x11_display->xdisplay, window->xwindow, NoEventMask);
meta_window_ungrab_keys (window);
@@ -1797,7 +1797,7 @@ meta_window_x11_update_input_region (MetaWindow *window)
return;
}
- if (META_DISPLAY_HAS_SHAPE (window->display))
+ if (META_X11_DISPLAY_HAS_SHAPE (x11_display))
{
/* Translate the set of XShape rectangles that we
* get from the X server to a cairo_region. */
@@ -1900,7 +1900,7 @@ meta_window_x11_update_shape_region (MetaWindow *window)
MetaWindowX11Private *priv = meta_window_x11_get_instance_private (window_x11);
cairo_region_t *region = NULL;
- if (META_DISPLAY_HAS_SHAPE (window->display))
+ if (META_X11_DISPLAY_HAS_SHAPE (x11_display))
{
/* Translate the set of XShape rectangles that we
* get from the X server to a cairo_region. */
@@ -3140,7 +3140,7 @@ meta_window_x11_new (MetaDisplay *display,
XISelectEvents (x11_display->xdisplay, xwindow, &mask, 1);
}
- if (META_DISPLAY_HAS_SHAPE (display))
+ if (META_X11_DISPLAY_HAS_SHAPE (x11_display))
XShapeSelectInput (x11_display->xdisplay, xwindow, ShapeNotifyMask);
/* Get rid of any borders */