Merge branch 'main' into leolost/windowclone-allocate

Author: lenemter

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>

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/HideTracker.vala

@@ -51,6 +51,10 @@ public class Gala.HideTracker : Object {
         if (hide_timeout_id != 0) {
             Source.remove (hide_timeout_id);
         }
+
+        if (update_timeout_id != 0) {
+            Source.remove (update_timeout_id);
+        }
     }
 
     construct {
@@ -95,7 +99,7 @@ public class Gala.HideTracker : Object {
         display.get_stage ().add_action_full ("panel-swipe-gesture", CAPTURE, pan_action);
     }
 
-    //Can be removed with mutter > 45
+#if !HAS_MUTTER45
     private bool window_has_pointer () {
         var cursor_tracker = display.get_cursor_tracker ();
         Graphene.Point pointer_pos;
@@ -114,6 +118,7 @@ public class Gala.HideTracker : Object {
         };
         return graphene_window_rect.contains_point (pointer_pos);
     }
+#endif
 
     private void track_focus_window (Meta.Window? window) {
         if (window == null) {
@@ -208,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/WindowManager.vala

@@ -148,7 +148,38 @@ 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);
@@ -410,10 +441,12 @@ namespace Gala {
         private void launch_action (string action_key) {
             try {
                 var action = behavior_settings.get_string (action_key);
-                if (action != null && action != "") {
+                if (action != null) {
                     Process.spawn_command_line_async (action);
                 }
-            } catch (Error e) { warning (e.message); }
+            } catch (Error e) {
+                warning (e.message);
+            }
         }
 
         private void on_monitors_changed () {
@@ -516,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;
@@ -1045,13 +1081,7 @@ namespace Gala {
                         current.@delete (Gtk.get_current_event_time ());
                     break;
                 case ActionType.OPEN_LAUNCHER:
-                    try {
-                        Process.spawn_command_line_async (
-                            behavior_settings.get_string ("panel-main-menu-action")
-                        );
-                    } catch (Error e) {
-                        warning (e.message);
-                    }
+                    launch_action ("panel-main-menu-action");
                     break;
                 case ActionType.WINDOW_OVERVIEW:
                     if (window_overview == null) {
@@ -1300,6 +1330,8 @@ namespace Gala {
                 case Meta.SizeChange.UNFULLSCREEN:
                     handle_fullscreen_window (window, which_change_local);
                     break;
+                default:
+                    break;
             }
 
             size_change_completed (actor);