From ad9da99d86af6dd9d0be696ac5173aba12600527 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Thu, 21 Aug 2014 17:27:26 +0200 Subject: [PATCH] wayland: Acquire wl_subcompositor interface This will be needed for GDK_WINDOW_SUBSURFACE windows. https://bugzilla.gnome.org/show_bug.cgi?id=729215 --- gdk/wayland/gdkdisplay-wayland.c | 4 ++++ gdk/wayland/gdkdisplay-wayland.h | 1 + 2 files changed, 5 insertions(+) diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index 15e4cdc4da..0cc7eaa75f 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -177,6 +177,10 @@ gdk_registry_handle_global(void *data, struct wl_registry *registry, uint32_t id display_wayland->data_device_manager = wl_registry_bind(display_wayland->wl_registry, id, &wl_data_device_manager_interface, 1); + } else if (strcmp (interface, "wl_subcompositor") == 0) { + display_wayland->subcompositor = + wl_registry_bind (display_wayland->wl_registry, id, + &wl_subcompositor_interface, 1); } } diff --git a/gdk/wayland/gdkdisplay-wayland.h b/gdk/wayland/gdkdisplay-wayland.h index 3098e544e0..8393b231bc 100644 --- a/gdk/wayland/gdkdisplay-wayland.h +++ b/gdk/wayland/gdkdisplay-wayland.h @@ -62,6 +62,7 @@ struct _GdkWaylandDisplay struct gtk_shell *gtk_shell; struct wl_input_device *input_device; struct wl_data_device_manager *data_device_manager; + struct wl_subcompositor *subcompositor; struct wl_cursor_theme *cursor_theme; GHashTable *cursor_cache;