From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 6 Nov 2017 00:37:54 +0000 (-0500)
Subject: broadway: Stop using gdk_display_get_root_window
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~23^2~834
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a163d5b7a7ce3af8e5220097837fd433a8d7970b;p=gtk4.git

broadway: Stop using gdk_display_get_root_window

We can just use the field in the display.
---

diff --git a/gdk/broadway/gdkdevice-broadway.c b/gdk/broadway/gdkdevice-broadway.c
index 994309ed00..a8575afefd 100644
--- a/gdk/broadway/gdkdevice-broadway.c
+++ b/gdk/broadway/gdkdevice-broadway.c
@@ -182,7 +182,7 @@ gdk_broadway_device_query_state (GdkDevice        *device,
       GdkWindow *mouse_toplevel;
 
       if (window == NULL)
-        window = gdk_display_get_root_window (gdk_device_get_display (device));
+        window = broadway_display->root_window;
 
       impl = GDK_WINDOW_IMPL_BROADWAY (window->impl);
       toplevel = impl->wrapper;
@@ -333,10 +333,14 @@ gdk_broadway_device_window_at_position (GdkDevice       *device,
 					GdkModifierType *mask,
 					gboolean         get_toplevel)
 {
+  GdkDisplay *display;
+  GdkBroadwayDisplay *broadway_display;
   GdkWindow *root_window;
   GdkWindow *window;
 
-  root_window = gdk_display_get_root_window (gdk_device_get_display (device));
+  display = gdk_device_get_display (device);
+  broadway_display = GDK_BROADWAY_DISPLAY (display);
+  root_window = broadway_display->root_window;
 
   gdk_broadway_device_query_state (device, root_window, &window, NULL, NULL, win_x, win_y, mask);
 
diff --git a/gdk/broadway/gdkeventsource.c b/gdk/broadway/gdkeventsource.c
index c230c9a9b6..268bd657b2 100644
--- a/gdk/broadway/gdkeventsource.c
+++ b/gdk/broadway/gdkeventsource.c
@@ -349,7 +349,7 @@ _gdk_broadway_events_got_input (BroadwayInputMsg *message)
     break;
 
   case BROADWAY_EVENT_SCREEN_SIZE_CHANGED:
-    window = gdk_display_get_root_window (display);
+    window = display_broadway->root_window;
     window->width = message->screen_resize_notify.width;
     window->height = message->screen_resize_notify.height;
     _gdk_window_update_size (window);