[mutter/bilelmoussaoui/gdk-x11-only: 1/6] cleanup: Make GDK dependency specific to X11

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit 79324d893f65e6ce4e68e11a4b20e9f7fea0a307
Author: Bilal Elmoussaoui <belmouss redhat com>
Date:   Sun May 8 17:50:11 2022 +0200

    cleanup: Make GDK dependency specific to X11
    
    This way, the dependencies on GTK/GDK could be completely dropped if
    built with Wayland only.

 src/backends/x11/meta-input-settings-x11.c |  1 -
 src/compositor/meta-dnd.c                  |  2 --
 src/compositor/meta-shaped-texture.c       |  3 +--
 src/compositor/meta-window-actor.c         | 43 ------------------------------
 src/compositor/meta-window-group.c         |  1 -
 src/core/place.c                           |  1 -
 src/meta/common.h                          |  1 -
 src/x11/meta-x11-display-private.h         |  1 +
 src/x11/meta-x11-window-control.h          |  1 -
 9 files changed, 2 insertions(+), 52 deletions(-)
---
diff --git a/src/backends/x11/meta-input-settings-x11.c b/src/backends/x11/meta-input-settings-x11.c
index 0cfbb0aff3..3d51dc79e8 100644
--- a/src/backends/x11/meta-input-settings-x11.c
+++ b/src/backends/x11/meta-input-settings-x11.c
@@ -25,7 +25,6 @@
 
 #include "backends/x11/meta-input-settings-x11.h"
 
-#include <gdk/gdkx.h>
 #include <string.h>
 #include <X11/Xatom.h>
 #include <X11/extensions/XInput2.h>
diff --git a/src/compositor/meta-dnd.c b/src/compositor/meta-dnd.c
index 4053ccaeaf..629eebf473 100644
--- a/src/compositor/meta-dnd.c
+++ b/src/compositor/meta-dnd.c
@@ -19,8 +19,6 @@
 
 #include "config.h"
 
-#include <gdk/gdkx.h>
-
 #include "meta/meta-backend.h"
 #include "compositor/compositor-private.h"
 #include "core/display-private.h"
diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c
index 34fec6852a..50d99a74cf 100644
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@@ -36,7 +36,6 @@
 #include "compositor/meta-shaped-texture-private.h"
 #include "core/boxes-private.h"
 
-#include <gdk/gdk.h>
 #include <math.h>
 
 #include "cogl/cogl.h"
@@ -846,7 +845,7 @@ do_paint_content (MetaShapedTexture   *stex,
               cairo_rectangle_int_t rect;
               cairo_region_get_rectangle (blended_tex_region, i, &rect);
 
-              if (!gdk_rectangle_intersect (&content_rect, &rect, &rect))
+              if (!meta_rectangle_intersect (&content_rect, &rect, &rect))
                 continue;
 
               paint_clipped_rectangle_node (stex, root_node,
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index 9cee56a371..99ad27382f 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <gdk/gdk.h>
 #include <math.h>
 #include <string.h>
 
@@ -975,48 +974,6 @@ meta_window_actor_size_change (MetaWindowActor    *self,
     priv->size_change_in_progress--;
 }
 
-#if 0
-/* Print out a region; useful for debugging */
-static void
-print_region (cairo_region_t *region)
-{
-  int n_rects;
-  int i;
-
-  n_rects = cairo_region_num_rectangles (region);
-  g_print ("[");
-  for (i = 0; i < n_rects; i++)
-    {
-      cairo_rectangle_int_t rect;
-      cairo_region_get_rectangle (region, i, &rect);
-      g_print ("+%d+%dx%dx%d ",
-               rect.x, rect.y, rect.width, rect.height);
-    }
-  g_print ("]\n");
-}
-#endif
-
-#if 0
-/* Dump a region to a PNG file; useful for debugging */
-static void
-see_region (cairo_region_t *region,
-            int             width,
-            int             height,
-            char           *filename)
-{
-  cairo_surface_t *surface = cairo_image_surface_create (CAIRO_FORMAT_A8, width, height);
-  cairo_t *cr = cairo_create (surface);
-
-  gdk_cairo_region (cr, region);
-  cairo_fill (cr);
-
-  cairo_surface_write_to_png (surface, filename);
-  cairo_destroy (cr);
-  cairo_surface_destroy (surface);
-}
-#endif
-
-
 static void
 meta_window_actor_cull_out (MetaCullable   *cullable,
                             cairo_region_t *unobscured_region,
diff --git a/src/compositor/meta-window-group.c b/src/compositor/meta-window-group.c
index 16ff2db097..23958045d2 100644
--- a/src/compositor/meta-window-group.c
+++ b/src/compositor/meta-window-group.c
@@ -2,7 +2,6 @@
 
 #include "config.h"
 
-#include <gdk/gdk.h>
 #include <math.h>
 
 #include "compositor/clutter-utils.h"
diff --git a/src/core/place.c b/src/core/place.c
index 1075fe20d5..f19d45f238 100644
--- a/src/core/place.c
+++ b/src/core/place.c
@@ -26,7 +26,6 @@
 
 #include "core/place.h"
 
-#include <gdk/gdk.h>
 #include <math.h>
 #include <stdlib.h>
 
diff --git a/src/meta/common.h b/src/meta/common.h
index 2c516a70d4..5984b1729e 100644
--- a/src/meta/common.h
+++ b/src/meta/common.h
@@ -29,7 +29,6 @@
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <glib.h>
-#include <gtk/gtk.h>
 
 #include "clutter/clutter.h"
 
diff --git a/src/x11/meta-x11-display-private.h b/src/x11/meta-x11-display-private.h
index d53073e111..f7516b422f 100644
--- a/src/x11/meta-x11-display-private.h
+++ b/src/x11/meta-x11-display-private.h
@@ -26,6 +26,7 @@
 #define META_X11_DISPLAY_PRIVATE_H
 
 #include <glib.h>
+#include <gdk/gdk.h>
 #include <X11/Xlib.h>
 
 #include "backends/meta-monitor-manager-private.h"
diff --git a/src/x11/meta-x11-window-control.h b/src/x11/meta-x11-window-control.h
index dfb66f262c..6f378f3359 100644
--- a/src/x11/meta-x11-window-control.h
+++ b/src/x11/meta-x11-window-control.h
@@ -23,7 +23,6 @@
 #ifndef META_X11_WINDOW__CONTROL_H
 #define META_X11_WINDOW__CONTROL_H
 
-#include <gdk/gdkx.h>
 
 #include "meta/boxes.h"
 #include "meta/common.h"