Merge branch 'main' into leolost/panel-window-use-window-positioner

Author: leolost2605

data/gala.gschema.xml

@@ -62,7 +62,7 @@
       </description>
     </key>
     <key type="s" name="panel-main-menu-action">
-      <default>''</default>
+      <default>'io.elementary.wingpanel --toggle-indicator=app-launcher'</default>
       <summary>Panel main menu action</summary>
       <description>Sets the command to run when the panel-main-menu keybinding is pressed.</description>
     </key>
@@ -72,10 +72,15 @@
       <description></description>
     </key>
     <key type="s" name="overlay-action">
-      <default>''</default>
+      <default>'io.elementary.wingpanel --toggle-indicator=app-launcher'</default>
       <summary></summary>
       <description></description>
     </key>
+    <key type="s" name="interactive-screenshot-action">
+      <default>'flatpak run io.elementary.screenshot'</default>
+      <summary>Interactive screenshot action</summary>
+      <description>Sets the command to run when the interactive-screenshot keybinding is pressed.</description>
+    </key>
     <key type="b" name="move-maximized-workspace">
       <default>false</default>
       <summary>Automatically move maximized windows to a new workspace</summary>
@@ -144,6 +149,10 @@
       <default><![CDATA[['Print']]]></default>
       <summary>Take a screenshot</summary>
     </key>
+    <key name="interactive-screenshot" type="as">
+      <default><![CDATA[['<Super>Print']]]></default>
+      <summary>Launch the interactive screenshot tool</summary>
+    </key>
     <key name="window-screenshot" type="as">
       <default><![CDATA[['<Alt>Print']]]></default>
       <summary>Take a screenshot of a window</summary>

lib/Utils.vala

@@ -400,5 +400,50 @@ namespace Gala {
 
             return texture;
         }
+
+        private static HashTable<Meta.Window, X.XserverRegion?> regions = new HashTable<Meta.Window, X.XserverRegion?> (null, null);
+
+        public static void x11_set_window_pass_through (Meta.Window window) {
+            unowned var x11_display = window.display.get_x11_display ();
+
+#if HAS_MUTTER46
+            var x_window = x11_display.lookup_xwindow (window);
+#else
+            var x_window = window.get_xwindow ();
+#endif
+            unowned var xdisplay = x11_display.get_xdisplay ();
+
+            regions[window] = X.Fixes.create_region_from_window (xdisplay, x_window, 0);
+
+            X.Xrectangle rect = {};
+
+            var region = X.Fixes.create_region (xdisplay, {rect});
+
+            X.Fixes.set_window_shape_region (xdisplay, x_window, 2, 0, 0, region);
+
+            X.Fixes.destroy_region (xdisplay, region);
+        }
+
+        public static void x11_unset_window_pass_through (Meta.Window window) {
+            unowned var x11_display = window.display.get_x11_display ();
+
+#if HAS_MUTTER46
+            var x_window = x11_display.lookup_xwindow (window);
+#else
+            var x_window = window.get_xwindow ();
+#endif
+            unowned var xdisplay = x11_display.get_xdisplay ();
+
+            var region = regions[window];
+
+            if (region == null) {
+                return;
+            }
+
+            X.Fixes.set_window_shape_region (xdisplay, x_window, 2, 0, 0, region);
+
+            regions.remove (window);
+            X.Fixes.destroy_region (xdisplay, region);
+        }
     }
 }

po/en_GB.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: beat-box\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2024-11-23 16:06+0000\n"
-"PO-Revision-Date: 2024-09-29 02:16+0000\n"
+"PO-Revision-Date: 2024-12-05 01:16+0000\n"
 "Last-Translator: David Hewitt <[email protected]>\n"
 "Language-Team: English (United Kingdom) <https://l10n.elementary.io/projects/"
 "desktop/gala/en_GB/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.6.2\n"
+"X-Generator: Weblate 5.8.4\n"
 "X-Launchpad-Export-Date: 2017-03-14 07:02+0000\n"
 
 #: daemon/DBus.vala:82 daemon-gtk3/BackgroundMenu.vala:11
@@ -123,10 +123,8 @@ msgid "Updated translations"
 msgstr "Updated translations"
 
 #: data/gala.metainfo.xml.in:35
-#, fuzzy
-#| msgid "Improve window shadows for legacy apps"
 msgid "Improved shadows performance"
-msgstr "Improve window shadows for legacy apps"
+msgstr "Improved shadows performance"
 
 #: data/gala.metainfo.xml.in:78
 msgid "Fix a potential crash when moving windows between workspaces"

po/pl.po

@@ -8,10 +8,10 @@ msgstr ""
 "Project-Id-Version: gala\n"
 "Report-Msgid-Bugs-To: https://github.com/elementary/gala/issues\n"
 "POT-Creation-Date: 2024-11-23 16:06+0000\n"
-"PO-Revision-Date: 2024-09-23 10:39+0000\n"
+"PO-Revision-Date: 2024-12-03 18:16+0000\n"
 "Last-Translator: Marcin Serwin <[email protected]>\n"
-"Language-Team: Polish <https://l10n.elementary.io/projects/desktop/gala/pl/"
-">\n"
+"Language-Team: Polish <https://l10n.elementary.io/projects/desktop/gala/pl/>"
+"\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -124,10 +124,8 @@ msgid "Updated translations"
 msgstr "Zaktualizowano tłumaczenia"
 
 #: data/gala.metainfo.xml.in:35
-#, fuzzy
-#| msgid "Improve window shadows for legacy apps"
 msgid "Improved shadows performance"
-msgstr "Popraw cienie okien dla przestarzałych aplikacji"
+msgstr "Poprawiona wydajność cieni"
 
 #: data/gala.metainfo.xml.in:78
 msgid "Fix a potential crash when moving windows between workspaces"

src/ShellClients/DelegateActor.vala

@@ -213,13 +213,10 @@ public class Gala.HideTracker : Object {
     }
 
     private void toggle_display (bool should_hide) {
-        unowned var window_actor = (Meta.WindowActor) panel.window.get_compositor_private ();
-
-        // Window actor receives pointer events while hidden on X11: https://github.com/elementary/gala/issues/2083
 #if HAS_MUTTER45
-        hovered = panel.window.has_pointer () && window_actor.visible;
+        hovered = panel.window.has_pointer ();
 #else
-        hovered = window_has_pointer () && window_actor.visible;
+        hovered = window_has_pointer ();
 #endif
 
         if (should_hide && !hovered && !panel.window.has_focus ()) {

src/ShellClients/HideTracker.vala

@@ -48,8 +48,8 @@ public class Gala.PanelClone : Object {
         actor = (Meta.WindowActor) panel.window.get_compositor_private ();
         // WindowActor position and Window position aren't necessarily the same.
         // The clone needs the actor position
-        panel.delegate_actor.notify["x"].connect (update_clone_position);
-        panel.delegate_actor.notify["y"].connect (update_clone_position);
+        actor.notify["x"].connect (update_clone_position);
+        actor.notify["y"].connect (update_clone_position);
         // Actor visibility might be changed by something else e.g. workspace switch
         // but we want to keep it in sync with us
         actor.notify["visible"].connect (update_visible);
@@ -97,7 +97,7 @@ public class Gala.PanelClone : Object {
         switch (panel.anchor) {
             case TOP:
             case BOTTOM:
-                return panel.delegate_actor.x;
+                return actor.x;
             default:
                 return 0;
         }
@@ -106,9 +106,9 @@ public class Gala.PanelClone : Object {
     private float calculate_clone_y (bool hidden) {
         switch (panel.anchor) {
             case TOP:
-                return hidden ? panel.delegate_actor.y - actor.height : panel.delegate_actor.y;
+                return hidden ? actor.y - actor.height : actor.y;
             case BOTTOM:
-                return hidden ? panel.delegate_actor.y + actor.height : panel.delegate_actor.y;
+                return hidden ? actor.y + actor.height : actor.y;
             default:
                 return 0;
         }
@@ -128,7 +128,7 @@ public class Gala.PanelClone : Object {
         panel_hidden = true;
 
         if (!Meta.Util.is_wayland_compositor ()) {
-            panel.window.move_frame (false, DelegateActor.OUT_OF_BOUNDS, DelegateActor.OUT_OF_BOUNDS);
+            Utils.x11_set_window_pass_through (panel.window);
         }
 
         if (panel.anchor != TOP && panel.anchor != BOTTOM) {
@@ -151,7 +151,7 @@ public class Gala.PanelClone : Object {
         }
 
         if (!Meta.Util.is_wayland_compositor ()) {
-            panel.window.move_frame (false, panel.delegate_actor.actual_x, panel.delegate_actor.actual_y);
+            Utils.x11_unset_window_pass_through (panel.window);
         }
 
         clone.save_easing_state ();

src/ShellClients/PanelClone.vala

@@ -15,7 +15,6 @@ public class Gala.PanelWindow : Object {
 
     private WindowPositioner window_positioner;
 
-    public DelegateActor delegate_actor;
     private PanelClone clone;
 
     private int width = -1;
@@ -34,7 +33,6 @@ public class Gala.PanelWindow : Object {
 
         window.stick ();
 
-        delegate_actor = new DelegateActor ((Meta.WindowActor) window.get_compositor_private ());
         clone = new PanelClone (wm, this);
 
         var display = wm.get_display ();
@@ -57,8 +55,6 @@ public class Gala.PanelWindow : Object {
     public Meta.Rectangle get_custom_window_rect () {
 #endif
         var window_rect = window.get_frame_rect ();
-        window_rect.x = delegate_actor.actual_x;
-        window_rect.y = delegate_actor.actual_y;
 
         if (width > 0) {
             window_rect.width = width;

src/ShellClients/PanelWindow.vala

@@ -148,8 +148,39 @@ namespace Gala {
             display.gl_video_memory_purged.connect (() => {
                 Meta.Background.refresh_all ();
             });
+
+#if WITH_SYSTEMD
+            if (Meta.Util.is_wayland_compositor ()) {
+                display.init_xserver.connect ((task) => {
+                    start_x11_services.begin (task);
+                    return true;
+                });
+            }
+#endif
         }
 
+#if WITH_SYSTEMD
+        private async void start_x11_services (GLib.Task task) {
+            try {
+                var session_bus = yield GLib.Bus.@get (GLib.BusType.SESSION);
+                yield session_bus.call (
+                    "org.freedesktop.systemd1",
+                    "/org/freedesktop/systemd1",
+                    "org.freedesktop.systemd1.Manager",
+                    "StartUnit",
+                    new GLib.Variant ("(ss)", "gnome-session-x11-services-ready.target", "fail"),
+                    new GLib.VariantType ("(o)"),
+                    GLib.DBusCallFlags.NONE,
+                    -1
+                );
+            } catch (Error e) {
+                critical (e.message);
+            } finally {
+                task.return_boolean (true);
+            }
+        }
+#endif
+
         private void show_stage () {
             unowned Meta.Display display = get_display ();
 
@@ -255,6 +286,7 @@ namespace Gala {
             display.add_keybinding ("switch-input-source-backward", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_switch_input_source);
 
             display.add_keybinding ("screenshot", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_screenshot);
+            display.add_keybinding ("interactive-screenshot", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_screenshot);
             display.add_keybinding ("window-screenshot", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_screenshot);
             display.add_keybinding ("area-screenshot", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_screenshot);
             display.add_keybinding ("screenshot-clip", keybinding_settings, Meta.KeyBindingFlags.IGNORE_AUTOREPEAT, (Meta.KeyHandlerFunc) handle_screenshot);
@@ -295,8 +327,7 @@ namespace Gala {
             // Most things inside this "later" depend on GTK. We get segfaults if we try to do GTK stuff before the window manager
             // is initialized, so we hold this stuff off until we're ready to draw
             laters.add (Meta.LaterType.BEFORE_REDRAW, () => {
-                unowned string xdg_session_type = Environment.get_variable ("XDG_SESSION_TYPE");
-                if (xdg_session_type == "x11") {
+                if (!Meta.Util.is_wayland_compositor ()) {
                     string[] args = {};
                     unowned string[] _args = args;
                     Gtk.init (ref _args);
@@ -518,6 +549,9 @@ namespace Gala {
                 case "screenshot":
                     screenshot_screen.begin ();
                     break;
+                case "interactive-screenshot":
+                    launch_action ("interactive-screenshot-action");
+                    break;
                 case "area-screenshot":
                     screenshot_area.begin ();
                     break;

src/WindowManager.vala

@@ -41,7 +41,6 @@ gala_bin_sources = files(
     'HotCorners/Barrier.vala',
     'HotCorners/HotCorner.vala',
     'HotCorners/HotCornerManager.vala',
-    'ShellClients/DelegateActor.vala',
     'ShellClients/HideTracker.vala',
     'ShellClients/ManagedClient.vala',
     'ShellClients/NotificationsClient.vala',