core: Move frame related types to x11

Also rename the files to meta-x11-frame* for consistency

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3254>

src/compositor/compositor.c

@@ -60,7 +60,6 @@
 #include "compositor/meta-later-private.h"
 #include "compositor/meta-window-actor-private.h"
 #include "compositor/meta-window-group-private.h"
-#include "core/frame.h"
 #include "core/util-private.h"
 #include "core/window-private.h"
 #include "meta/compositor-mutter.h"

src/compositor/meta-window-actor-x11.c

@@ -29,7 +29,6 @@
 #include "compositor/meta-shaped-texture-private.h"
 #include "compositor/meta-surface-actor.h"
 #include "compositor/meta-surface-actor-x11.h"
-#include "core/frame.h"
 #include "core/window-private.h"
 #include "meta/compositor.h"
 #include "meta/meta-enum-types.h"
@@ -39,6 +38,7 @@
 #include "x11/window-x11.h"
 #include "x11/meta-sync-counter.h"
 #include "x11/meta-x11-display-private.h"
+#include "x11/meta-x11-frame.h"
 #include "x11/window-x11-private.h"
 
 enum

src/compositor/meta-window-drag.c

@@ -23,11 +23,11 @@
 
 #include "compositor/compositor-private.h"
 #include "compositor/edge-resistance.h"
-#include "core/frame.h"
 #include "core/window-private.h"
 #include "meta/meta-enum-types.h"
 
 #ifdef HAVE_X11_CLIENT
+#include "x11/meta-x11-frame.h"
 #include "x11/window-x11.h"
 #endif
 

src/core/bell.h

@@ -18,7 +18,6 @@
  */
 
 #include "core/display-private.h"
-#include "core/frame.h"
 
 struct _MetaBell
 {

src/core/constraints.c

@@ -37,6 +37,7 @@
 #include "core/place.h"
 #include "core/workspace-private.h"
 #include "meta/prefs.h"
+#include "x11/meta-x11-frame.h"
 
 /*
 This is the short and sweet version of how to hack on this file; see

src/core/constraints.h

@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "core/frame.h"
 #include "core/window-private.h"
 #include "meta/util.h"
 

src/core/display.c

@@ -47,7 +47,6 @@
 #include "core/boxes-private.h"
 #include "core/display-private.h"
 #include "core/events.h"
-#include "core/frame.h"
 #include "core/keybindings-private.h"
 #include "core/meta-clipboard-manager.h"
 #include "core/meta-workspace-manager-private.h"

src/core/keybindings.c

@@ -37,7 +37,6 @@
 #include "backends/x11/meta-clutter-backend-x11.h"
 #include "backends/x11/meta-input-device-x11.h"
 #include "compositor/compositor-private.h"
-#include "core/frame.h"
 #include "core/keybindings-private.h"
 #include "core/meta-accel-parse.h"
 #include "core/meta-workspace-manager-private.h"
@@ -46,6 +45,7 @@
 #include "meta/prefs.h"
 #include "mtk/mtk-x11.h"
 #include "x11/meta-x11-display-private.h"
+#include "x11/meta-x11-frame.h"
 #include "x11/window-x11-private.h"
 
 #ifdef HAVE_NATIVE_BACKEND

src/core/place.h

@@ -21,7 +21,6 @@
 
 #pragma once
 
-#include "core/frame.h"
 #include "core/window-private.h"
 
 void meta_window_process_placement (MetaWindow        *window,

src/core/stack-tracker.c

@@ -41,12 +41,12 @@
 
 #include "compositor/compositor-private.h"
 #include "core/display-private.h"
-#include "core/frame.h"
 #include "meta/util.h"
 
 #ifdef HAVE_X11_CLIENT
 #include "mtk/mtk-x11.h"
 #include "x11/meta-x11-display-private.h"
+#include "x11/meta-x11-frame.h"
 #include "x11/window-x11.h"
 #endif
 

src/core/stack.c

@@ -32,7 +32,6 @@
 
 #include "backends/meta-logical-monitor.h"
 #include "cogl/cogl.h"
-#include "core/frame.h"
 #include "core/meta-workspace-manager-private.h"
 #include "core/window-private.h"
 #include "core/workspace-private.h"

src/core/window.c

@@ -71,7 +71,6 @@
 #include "compositor/compositor-private.h"
 #include "core/boxes-private.h"
 #include "core/constraints.h"
-#include "core/frame.h"
 #include "core/keybindings-private.h"
 #include "core/meta-workspace-manager-private.h"
 #include "core/place.h"
@@ -87,6 +86,7 @@
 #include "meta/group.h"
 #include "mtk/mtk-x11.h"
 #include "x11/meta-x11-display-private.h"
+#include "x11/meta-x11-frame.h"
 #include "x11/window-props.h"
 #include "x11/window-x11-private.h"
 #include "x11/window-x11.h"

src/meson.build

@@ -343,8 +343,6 @@ mutter_sources = [
   'core/display-private.h',
   'core/events.c',
   'core/events.h',
-  'core/frame.c',
-  'core/frame.h',
   'core/keybindings.c',
   'core/keybindings-private.h',
   'core/meta-accel-parse.c',
@@ -482,6 +480,8 @@ if have_x11_client
     'x11/meta-x11-display.c',
     'x11/meta-x11-display-private.h',
     'x11/meta-x11-event-source.c',
+    'x11/meta-x11-frame.c',
+    'x11/meta-x11-frame.h',
     'x11/meta-x11-selection.c',
     'x11/meta-x11-selection-private.h',
     'x11/meta-x11-selection-input-stream.c',

src/wayland/meta-wayland-pointer-constraints.c

@@ -28,9 +28,9 @@
 
 #include "backends/meta-backend-private.h"
 #include "backends/meta-pointer-constraint.h"
-#include "core/frame.h"
 #include "core/window-private.h"
 #include "meta/meta-backend.h"
+#include "x11/meta-x11-frame.h"
 #include "wayland/meta-pointer-confinement-wayland.h"
 #include "wayland/meta-pointer-lock-wayland.h"
 #include "wayland/meta-wayland-pointer.h"

src/wayland/meta-window-xwayland.c

@@ -20,9 +20,9 @@
 
 #include <X11/Xatom.h>
 
-#include "core/frame.h"
 #include "mtk/mtk-x11.h"
 #include "x11/meta-x11-display-private.h"
+#include "x11/meta-x11-frame.h"
 #include "x11/window-x11.h"
 #include "x11/window-x11-private.h"
 #include "x11/xprops.h"

src/x11/events.c

@@ -46,6 +46,7 @@
 #include "x11/meta-startup-notification-x11.h"
 #include "x11/meta-x11-display-private.h"
 #include "x11/meta-x11-event-source.h"
+#include "x11/meta-x11-frame.h"
 #include "x11/meta-x11-selection-private.h"
 #include "x11/meta-x11-selection-input-stream-private.h"
 #include "x11/meta-x11-selection-output-stream-private.h"

src/x11/meta-x11-display.c

@@ -52,7 +52,6 @@
 #include "backends/meta-settings-private.h"
 #include "backends/x11/meta-backend-x11.h"
 #include "backends/x11/meta-stage-x11.h"
-#include "core/frame.h"
 #include "core/meta-workspace-manager-private.h"
 #include "core/util-private.h"
 #include "core/workspace-private.h"
@@ -61,6 +60,7 @@
 #include "third_party/xcursor/xcursor.h"
 #include "x11/events.h"
 #include "x11/group-props.h"
+#include "x11/meta-x11-frame.h"
 #include "x11/meta-x11-selection-private.h"
 #include "x11/window-props.h"
 #include "x11/window-x11.h"

src/x11/meta-x11-frame.c

@@ -23,16 +23,15 @@
 
 #include "config.h"
 
-#include "core/frame.h"
-
 #include "backends/x11/meta-backend-x11.h"
 #include "compositor/compositor-private.h"
 #include "core/bell.h"
 #include "core/keybindings-private.h"
 #include "mtk/mtk-x11.h"
 #include "x11/meta-x11-display-private.h"
-#include "x11/window-x11-private.h"
+#include "x11/meta-x11-frame.h"
 #include "x11/window-props.h"
+#include "x11/window-x11-private.h"
 
 #include <X11/Xatom.h>
 #include <X11/extensions/shape.h>

src/x11/meta-x11-stack.c

@@ -20,10 +20,10 @@
 
 #include <X11/Xatom.h>
 
-#include "core/frame.h"
 #include "core/stack.h"
 #include "core/window-private.h"
 #include "x11/meta-x11-display-private.h"
+#include "x11/meta-x11-frame.h"
 #include "x11/meta-x11-stack-private.h"
 #include "x11/window-x11.h"
 

src/x11/window-props.c

@@ -44,12 +44,12 @@
 #include <string.h>
 
 #include "compositor/compositor-private.h"
-#include "core/frame.h"
 #include "core/meta-workspace-manager-private.h"
 #include "core/util-private.h"
 #include "meta/group.h"
 #include "mtk/mtk-x11.h"
 #include "x11/meta-x11-display-private.h"
+#include "x11/meta-x11-frame.h"
 #include "x11/window-x11-private.h"
 #include "x11/window-x11.h"
 #include "x11/xprops.h"

src/x11/window-x11.c

@@ -38,7 +38,6 @@
 #include "compositor/compositor-private.h"
 #include "compositor/meta-window-actor-private.h"
 #include "core/boxes-private.h"
-#include "core/frame.h"
 #include "core/meta-workspace-manager-private.h"
 #include "core/window-private.h"
 #include "core/workspace-private.h"
@@ -55,6 +54,7 @@
 #include "x11/group-private.h"
 #include "x11/meta-sync-counter.h"
 #include "x11/meta-x11-display-private.h"
+#include "x11/meta-x11-frame.h"
 #include "x11/session.h"
 #include "x11/window-props.h"
 #include "x11/xprops.h"