cleanup: Make GDK dependency specific to X11

This way, the dependencies on GTK/GDK could be completely dropped if
built with Wayland only.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2407>
This commit is contained in:
Bilal Elmoussaoui 2022-05-08 17:50:11 +02:00
parent a44cd8fdb6
commit fb4161853f
8 changed files with 2 additions and 9 deletions

View File

@ -25,7 +25,6 @@
#include "backends/x11/meta-input-settings-x11.h" #include "backends/x11/meta-input-settings-x11.h"
#include <gdk/gdkx.h>
#include <string.h> #include <string.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/extensions/XInput2.h> #include <X11/extensions/XInput2.h>

View File

@ -21,8 +21,6 @@
#include "compositor/meta-dnd-private.h" #include "compositor/meta-dnd-private.h"
#include <gdk/gdkx.h>
#include "meta/meta-backend.h" #include "meta/meta-backend.h"
#include "compositor/compositor-private.h" #include "compositor/compositor-private.h"
#include "core/display-private.h" #include "core/display-private.h"

View File

@ -38,7 +38,6 @@
#include "compositor/meta-shaped-texture-private.h" #include "compositor/meta-shaped-texture-private.h"
#include "core/boxes-private.h" #include "core/boxes-private.h"
#include <gdk/gdk.h>
#include <math.h> #include <math.h>
#include "cogl/cogl.h" #include "cogl/cogl.h"
@ -785,7 +784,7 @@ do_paint_content (MetaShapedTexture *stex,
cairo_rectangle_int_t rect; cairo_rectangle_int_t rect;
cairo_region_get_rectangle (blended_tex_region, i, &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; continue;
paint_clipped_rectangle_node (stex, root_node, paint_clipped_rectangle_node (stex, root_node,

View File

@ -21,7 +21,6 @@
#include "config.h" #include "config.h"
#include <gdk/gdk.h>
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>

View File

@ -2,7 +2,6 @@
#include "config.h" #include "config.h"
#include <gdk/gdk.h>
#include <math.h> #include <math.h>
#include "compositor/clutter-utils.h" #include "compositor/clutter-utils.h"

View File

@ -26,7 +26,6 @@
#include "core/place.h" #include "core/place.h"
#include <gdk/gdk.h>
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>

View File

@ -29,7 +29,6 @@
#include <X11/extensions/XInput.h> #include <X11/extensions/XInput.h>
#include <X11/extensions/XInput2.h> #include <X11/extensions/XInput2.h>
#include <glib.h> #include <glib.h>
#include <gtk/gtk.h>
#include "clutter/clutter.h" #include "clutter/clutter.h"
#include "meta/meta-enums.h" #include "meta/meta-enums.h"

View File

@ -26,6 +26,7 @@
#define META_X11_DISPLAY_PRIVATE_H #define META_X11_DISPLAY_PRIVATE_H
#include <glib.h> #include <glib.h>
#include <gdk/gdk.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include "backends/meta-monitor-manager-private.h" #include "backends/meta-monitor-manager-private.h"