broadway: Stop using gdk_display_get_root_window
authorMatthias Clasen <mclasen@redhat.com>
Mon, 6 Nov 2017 00:37:54 +0000 (19:37 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Mon, 6 Nov 2017 00:37:54 +0000 (19:37 -0500)
We can just use the field in the display.

gdk/broadway/gdkdevice-broadway.c
gdk/broadway/gdkeventsource.c

index 994309ed00580d0457f59440e90b6a00353aca16..a8575afefd695b2fd2c212892e7642bf1ded83c9 100644 (file)
@@ -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);
 
index c230c9a9b6ced839cc8ebd996620cffefb7d4084..268bd657b2324981128859b69cb72620622e2dc6 100644 (file)
@@ -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);