Merge branch 'main' into lenemter/gtk4

Author: lenemter

daemon/DBus.vala

@@ -3,44 +3,6 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-public enum Gala.ActionType {
-    NONE = 0,
-    SHOW_MULTITASKING_VIEW,
-    MAXIMIZE_CURRENT,
-    HIDE_CURRENT,
-    OPEN_LAUNCHER,
-    CUSTOM_COMMAND,
-    WINDOW_OVERVIEW,
-    WINDOW_OVERVIEW_ALL,
-    SWITCH_TO_WORKSPACE_PREVIOUS,
-    SWITCH_TO_WORKSPACE_NEXT,
-    SWITCH_TO_WORKSPACE_LAST,
-    START_MOVE_CURRENT,
-    START_RESIZE_CURRENT,
-    TOGGLE_ALWAYS_ON_TOP_CURRENT,
-    TOGGLE_ALWAYS_ON_VISIBLE_WORKSPACE_CURRENT,
-    MOVE_CURRENT_WORKSPACE_LEFT,
-    MOVE_CURRENT_WORKSPACE_RIGHT,
-    CLOSE_CURRENT,
-    SCREENSHOT_CURRENT
-}
-
-[Flags]
-public enum Gala.WindowFlags {
-    NONE = 0,
-    CAN_HIDE,
-    CAN_MAXIMIZE,
-    IS_MAXIMIZED,
-    ALLOWS_MOVE,
-    ALLOWS_RESIZE,
-    ALWAYS_ON_TOP,
-    ON_ALL_WORKSPACES,
-    CAN_CLOSE,
-    IS_TILED,
-    ALLOWS_MOVE_LEFT,
-    ALLOWS_MOVE_RIGHT
-}
-
 [DBus (name = "org.pantheon.gala")]
 public interface Gala.WMDBus : GLib.Object {
     public abstract void perform_action (Gala.ActionType type) throws DBusError, IOError;

daemon/meson.build

@@ -7,14 +7,15 @@ gala_daemon_sources = files(
     'WindowMenu.vala',
 )
 
-granite_dep = dependency('granite-7')
+gtk4_dep = dependency('gtk4')
+granite7_dep = dependency('granite-7')
 
-gala_daemon_bin = executable(
+executable(
     'gala-daemon',
     gala_daemon_sources,
+    gala_common_enums,
     config_header,
     gala_resources,
-    dependencies: [granite_dep, gtk4_dep],
-    include_directories: include_directories('.'),
-    install: true,
+    dependencies: [gtk4_dep, granite7_dep],
+    install: true
 )

docs/meson.build

@@ -1,12 +1,10 @@
-valadoc = find_program('valadoc')
-
 mutter_packages_command = []
 foreach dep : mutter_dep
     mutter_packages_command += [ '--pkg', dep.name() ]
 endforeach
 
 basic_command = [
-    valadoc,
+    find_program('valadoc'),
     '--force',
     '--verbose',
     '--package-name','gala',
@@ -18,7 +16,7 @@ basic_command = [
     '--pkg', 'gmodule-2.0',
     '--pkg', 'posix',
     vala_flags,
-    '--vapidir=' + join_paths(meson.build_root(), 'lib'),
+    '--vapidir=' + join_paths(meson.project_build_root(), 'lib'),
     '--vapidir=' + join_paths(meson.global_source_root(), 'vapi'),
     '--doclet=html',
     '--use-svg-images'
@@ -45,6 +43,7 @@ all_doc_target = custom_target(
         '--pkg', 'gnome-bg-4',
         '--pkg', 'gnome-desktop-4',
         '--pkg', 'libsystemd',
+        '--pkg', 'gnome-desktop-3.0',
         '--pkg', 'pantheon-desktop-shell',
         '--pkg', 'sqlite3',
         '--pkg', 'wayland-server',

lib/CommonEnums.vala

@@ -0,0 +1,47 @@
+/*
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2025 elementary, Inc. (https://elementary.io)
+ *                         2014 Tom Beckmann
+ *
+ * Note: These enums are shared with the daemon
+ */
+
+namespace Gala {
+    public enum ActionType {
+        NONE = 0,
+        SHOW_MULTITASKING_VIEW,
+        MAXIMIZE_CURRENT,
+        HIDE_CURRENT,
+        OPEN_LAUNCHER,
+        CUSTOM_COMMAND,
+        WINDOW_OVERVIEW,
+        WINDOW_OVERVIEW_ALL,
+        SWITCH_TO_WORKSPACE_PREVIOUS,
+        SWITCH_TO_WORKSPACE_NEXT,
+        SWITCH_TO_WORKSPACE_LAST,
+        START_MOVE_CURRENT,
+        START_RESIZE_CURRENT,
+        TOGGLE_ALWAYS_ON_TOP_CURRENT,
+        TOGGLE_ALWAYS_ON_VISIBLE_WORKSPACE_CURRENT,
+        MOVE_CURRENT_WORKSPACE_LEFT,
+        MOVE_CURRENT_WORKSPACE_RIGHT,
+        CLOSE_CURRENT,
+        SCREENSHOT_CURRENT
+    }
+
+    [Flags]
+    public enum WindowFlags {
+        NONE = 0,
+        CAN_HIDE,
+        CAN_MAXIMIZE,
+        IS_MAXIMIZED,
+        ALLOWS_MOVE,
+        ALLOWS_RESIZE,
+        ALWAYS_ON_TOP,
+        ON_ALL_WORKSPACES,
+        CAN_CLOSE,
+        IS_TILED,
+        ALLOWS_MOVE_LEFT,
+        ALLOWS_MOVE_RIGHT
+    }
+}

lib/WindowManager.vala

@@ -23,44 +23,6 @@ namespace Gala {
         public const string TOGGLE_RECORDING_ACTION = "toggle-recording-action";
     }
 
-    public enum ActionType {
-        NONE = 0,
-        SHOW_MULTITASKING_VIEW,
-        MAXIMIZE_CURRENT,
-        HIDE_CURRENT,
-        OPEN_LAUNCHER,
-        CUSTOM_COMMAND,
-        WINDOW_OVERVIEW,
-        WINDOW_OVERVIEW_ALL,
-        SWITCH_TO_WORKSPACE_PREVIOUS,
-        SWITCH_TO_WORKSPACE_NEXT,
-        SWITCH_TO_WORKSPACE_LAST,
-        START_MOVE_CURRENT,
-        START_RESIZE_CURRENT,
-        TOGGLE_ALWAYS_ON_TOP_CURRENT,
-        TOGGLE_ALWAYS_ON_VISIBLE_WORKSPACE_CURRENT,
-        MOVE_CURRENT_WORKSPACE_LEFT,
-        MOVE_CURRENT_WORKSPACE_RIGHT,
-        CLOSE_CURRENT,
-        SCREENSHOT_CURRENT
-    }
-
-    [Flags]
-    public enum WindowFlags {
-        NONE = 0,
-        CAN_HIDE,
-        CAN_MAXIMIZE,
-        IS_MAXIMIZED,
-        ALLOWS_MOVE,
-        ALLOWS_RESIZE,
-        ALWAYS_ON_TOP,
-        ON_ALL_WORKSPACES,
-        CAN_CLOSE,
-        IS_TILED,
-        ALLOWS_MOVE_LEFT,
-        ALLOWS_MOVE_RIGHT
-    }
-
     /**
      * Function that should return true if the given shortcut should be blocked.
      */

lib/meson.build

@@ -1,3 +1,7 @@
+gala_common_enums = files(
+  'CommonEnums.vala',
+)
+
 gala_lib_sources = files(
     'ActivatableComponent.vala',
     'App.vala',
@@ -33,7 +37,7 @@ gala_lib_sources = files(
     'Gestures/SpringTimeline.vala',
     'Gestures/ToucheggBackend.vala',
     'Gestures/TouchpadBackend.vala'
-)
+) + gala_common_enums
 
 gala_resources = gnome.compile_resources(
     'gala-resources',
@@ -47,7 +51,6 @@ gala_lib = shared_library(
     gala_lib_sources,
     gala_resources,
     dependencies: [gala_base_dep],
-    include_directories: include_directories('.'),
     install: true,
     install_dir: [true, join_paths(get_option('includedir'), 'gala'), true],
     install_rpath: mutter_typelib_dir,

plugins/pip/meson.build

@@ -1,14 +1,13 @@
-gala_pip_sources = [
+gala_pip_sources = files(
     'Main.vala',
     'PopupWindow.vala',
     'SelectionArea.vala'
-]
+)
 
 gala_pip_lib = shared_library(
     'gala-pip',
     gala_pip_sources,
     dependencies: [gala_dep, gala_base_dep],
-    include_directories: include_directories('.'),
     install: true,
     install_dir: plugins_dir,
     install_rpath: mutter_typelib_dir,

plugins/template/meson.build

@@ -1,12 +1,11 @@
-gala_template_sources = [
-    'Main.vala',
-]
+gala_template_sources = files(
+    'Main.vala'
+)
 
 gala_template_lib = shared_library(
     'gala-template',
     gala_template_sources,
     dependencies: [gala_dep, gala_base_dep],
-    include_directories: include_directories('.'),
     install: false,
     install_dir: plugins_dir,
     install_rpath: mutter_typelib_dir,

src/meson.build

@@ -72,7 +72,6 @@ gala_bin = executable(
     gala_bin_sources,
     config_header,
     dependencies: [gala_dep, gala_base_dep, pantheon_desktop_shell_dep],
-    include_directories: include_directories('.'),
     install_rpath: mutter_typelib_dir,
     install: true,
 )