Drop foreign window checks in Wayland
authorMatthias Clasen <mclasen@redhat.com>
Tue, 22 Aug 2017 19:23:46 +0000 (15:23 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 2 Nov 2017 02:55:27 +0000 (22:55 -0400)
The wayland backend never creates foreign windows,
so no need to check for this type of window.

gdk/wayland/gdkwindow-wayland.c

index 14cda9b1fcd6a9e679b701f8cc1a4df19e3d5967..ca7f54f6fc47ad820c81e95e7d1885f83ebaa9ca 100644 (file)
@@ -48,13 +48,9 @@ enum {
 
 static guint signals[LAST_SIGNAL];
 
-#define WINDOW_IS_TOPLEVEL_OR_FOREIGN(window) \
+#define WINDOW_IS_TOPLEVEL(window) \
   (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD)
 
-#define WINDOW_IS_TOPLEVEL(window)                   \
-  (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&   \
-   GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN)
-
 #define MAX_WL_BUFFER_SIZE (4083) /* 4096 minus header, string argument length and NUL byte */
 
 typedef struct _GdkWaylandWindow GdkWaylandWindow;
@@ -3059,7 +3055,7 @@ gdk_wayland_window_set_geometry_hints (GdkWindow         *window,
   int width, height;
 
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 
   impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
@@ -3248,7 +3244,7 @@ gdk_wayland_window_iconify (GdkWindow *window)
   GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
 
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 
   if (!impl->display_server.xdg_toplevel)
@@ -3261,7 +3257,7 @@ static void
 gdk_wayland_window_deiconify (GdkWindow *window)
 {
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 
   if (GDK_WINDOW_IS_MAPPED (window))
@@ -3420,7 +3416,7 @@ gdk_wayland_window_begin_resize_drag (GdkWindow     *window,
   uint32_t resize_edges, serial;
 
   if (GDK_WINDOW_DESTROYED (window) ||
-      !WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
+      !WINDOW_IS_TOPLEVEL (window))
     return;
 
   switch (edge)
@@ -3529,9 +3525,7 @@ gdk_wayland_window_destroy_notify (GdkWindow *window)
 {
   if (!GDK_WINDOW_DESTROYED (window))
     {
-      if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN)
-        g_warning ("GdkWindow %p unexpectedly destroyed", window);
-
+      g_warning ("GdkWindow %p unexpectedly destroyed", window);
       _gdk_window_destroy (window, TRUE);
     }