diff options
| author | Armin Krezović <krezovic.armin@gmail.com> | 2017-08-26 18:26:30 +0200 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2018-07-06 19:47:16 +0200 |
| commit | 18779109deb3d0fe89fc4aa0ca80002c24f71b81 (patch) | |
| tree | 86814581adcca2d432fe6bb728c868eb2bd395ad /src/x11/group.c | |
| parent | 522f9b4c38ad1e33d14929c7ee7486eeb64501f4 (diff) | |
| download | mutter-18779109deb3d0fe89fc4aa0ca80002c24f71b81.tar.gz | |
Start populating MetaX11Display
- Moved xdisplay, name and various atoms from MetaDisplay
- Moved xroot, screen_name, default_depth and default_xvisual
from MetaScreen
- Moved some X11 specific functions from screen.c and display.c
to meta-x11-display.c
https://bugzilla.gnome.org/show_bug.cgi?id=759538
Diffstat (limited to 'src/x11/group.c')
| -rw-r--r-- | src/x11/group.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/x11/group.c b/src/x11/group.c index 123b9e153..0973cd70f 100644 --- a/src/x11/group.c +++ b/src/x11/group.c @@ -30,6 +30,7 @@ #include "group-private.h" #include "group-props.h" #include "window-private.h" +#include "x11/meta-x11-display-private.h" #include <meta/window.h> #include <X11/Xlib-xcb.h> @@ -51,7 +52,7 @@ meta_group_new (MetaDisplay *display, group->group_leader = group_leader; group->refcount = 1; /* owned by caller, hash table has only weak ref */ - xcb_connection_t *xcb_conn = XGetXCBConnection (display->xdisplay); + xcb_connection_t *xcb_conn = XGetXCBConnection (display->x11_display->xdisplay); xcb_generic_error_t *e; g_autofree xcb_get_window_attributes_reply_t *attrs = xcb_get_window_attributes_reply (xcb_conn, @@ -76,9 +77,9 @@ meta_group_new (MetaDisplay *display, /* Fill these in the order we want them to be gotten */ i = 0; - initial_props[i++] = display->atom_WM_CLIENT_MACHINE; - initial_props[i++] = display->atom__NET_WM_PID; - initial_props[i++] = display->atom__NET_STARTUP_ID; + initial_props[i++] = display->x11_display->atom_WM_CLIENT_MACHINE; + initial_props[i++] = display->x11_display->atom__NET_WM_PID; + initial_props[i++] = display->x11_display->atom__NET_STARTUP_ID; g_assert (N_INITIAL_PROPS == i); meta_group_reload_properties (group, initial_props, N_INITIAL_PROPS); |