Merge branch 'main' into lenemter/set-open-in-photos-as-default-action

Author: leonardo-lemos

lib/AppSystem.vala

@@ -14,12 +14,64 @@ public class Gala.AppSystem : GLib.Object {
     private GLib.HashTable<unowned string, Gala.App> id_to_app;
     private GLib.HashTable<string, string> startup_wm_class_to_id;
     private Gala.AppCache app_cache;
+    private string[] all_desktop_files = {};
+    private GLib.FileMonitor[]? directory_monitors;
 
     construct {
         id_to_app = new GLib.HashTable<unowned string, Gala.App> (str_hash, str_equal);
         startup_wm_class_to_id = new GLib.HashTable<string, string> (str_hash, str_equal);
         running_apps = new GLib.HashTable<Gala.App, unowned Gala.App> (null, null);
         app_cache = new AppCache ();
+
+        update_desktop_files ();
+    }
+
+    private void update_desktop_files () {
+        var data_dirs = Environment.get_system_data_dirs ();
+        data_dirs += Environment.get_user_data_dir ();
+
+        var create_monitors = directory_monitors == null;
+        if (create_monitors) {
+            directory_monitors = {};
+        }
+
+        foreach (unowned string data_dir in data_dirs) {
+            var app_dir = Path.build_filename (data_dir, "applications");
+            if (FileUtils.test (app_dir, FileTest.EXISTS)) {
+                try {
+                    foreach (var name in enumerate_children (app_dir)) {
+                        if (!name.contains ("~") && name.has_suffix (".desktop")) {
+                            all_desktop_files += name;
+                        }
+                    }
+
+                    if (!create_monitors) {
+                        continue;
+                    }
+
+                    var monitor = File.new_for_path (app_dir).monitor (GLib.FileMonitorFlags.NONE, null);
+                    monitor.changed.connect ((file, other_file, event_type) => {
+                        if (event_type == GLib.FileMonitorEvent.CHANGES_DONE_HINT) {
+                            update_desktop_files ();
+                        }
+                    });
+                    directory_monitors += monitor;
+                } catch (Error e) {
+                    debug ("Error inside %s: %s", app_dir, e.message);
+                }
+            }
+        }
+    }
+
+    private string[] enumerate_children (string dir) throws Error {
+        string[] result = {};
+        FileInfo? file_info;
+        var enumerator = File.new_for_path (dir).enumerate_children (FileAttribute.STANDARD_NAME, 0);
+        while ((file_info = enumerator.next_file ()) != null) {
+            result += file_info.get_name ();
+        }
+
+        return result;
     }
 
     public unowned Gala.App? lookup_app (string id) {
@@ -105,6 +157,20 @@ public class Gala.AppSystem : GLib.Object {
         return lookup_heuristic_basename (desktop_file);
     }
 
+    public unowned Gala.App? guess_app_by_id (string _id) {
+        var id = _id.ascii_down ();
+        unowned Gala.App? result = null;
+
+        foreach (var name in all_desktop_files) {
+            // Try to find desktop file based on the application name
+            if (name.contains (id) && (result = lookup_app (name)) != null) {
+                return result;
+            }
+        }
+
+        return null;
+    }
+
     public void notify_app_state_changed (Gala.App app) {
         if (app.state == Gala.AppState.RUNNING) {
             running_apps.insert (app, app);

lib/Drawing/StyleManager.vala

@@ -18,11 +18,16 @@ public class Gala.Drawing.StyleManager : Object {
     }
 
     [DBus (name="io.elementary.pantheon.AccountsService")]
-    private interface AccountsService : DBusProxy {
+    private interface PantheonAccountsService : DBusProxy {
         public abstract int prefers_color_scheme { get; set; }
         public abstract int prefers_accent_color { get; set; }
     }
 
+    [DBus (name="io.elementary.SettingsDaemon.AccountsService")]
+    private interface SettingsDaemonAccountsService : DBusProxy {
+        public abstract int accent_color { get; set; }
+    }
+
     private const string FDO_ACCOUNTS_NAME = "org.freedesktop.Accounts";
     private const string FDO_ACCOUNTS_PATH = "/org/freedesktop/Accounts";
 
@@ -37,10 +42,18 @@ public class Gala.Drawing.StyleManager : Object {
     public ColorScheme prefers_color_scheme { get; private set; default = LIGHT; }
     public Gdk.RGBA theme_accent_color { get; private set; default = DEFAULT_ACCENT_COLOR; }
 
-    private AccountsService? accounts_service_proxy;
+    private PantheonAccountsService? pantheon_proxy;
+    private SettingsDaemonAccountsService? settings_daemon_proxy;
 
     construct {
-        Bus.watch_name (SYSTEM, FDO_ACCOUNTS_NAME, NONE, () => connect_to_accounts_service.begin (), () => accounts_service_proxy = null);
+        Bus.watch_name (
+            SYSTEM, FDO_ACCOUNTS_NAME, NONE,
+            () => connect_to_accounts_service.begin (),
+            () => {
+                pantheon_proxy = null;
+                settings_daemon_proxy = null;
+            }
+        );
     }
 
     private async void connect_to_accounts_service () {
@@ -49,24 +62,27 @@ public class Gala.Drawing.StyleManager : Object {
 
             var path = yield accounts.find_user_by_name (Environment.get_user_name ());
 
-            accounts_service_proxy = yield Bus.get_proxy<AccountsService> (SYSTEM, FDO_ACCOUNTS_NAME, path, GET_INVALIDATED_PROPERTIES);
+            pantheon_proxy = yield Bus.get_proxy<PantheonAccountsService> (SYSTEM, FDO_ACCOUNTS_NAME, path, GET_INVALIDATED_PROPERTIES);
+            settings_daemon_proxy = yield Bus.get_proxy<SettingsDaemonAccountsService> (SYSTEM, FDO_ACCOUNTS_NAME, path, GET_INVALIDATED_PROPERTIES);
         } catch {
             warning ("Could not connect to AccountsService. Default accent color will be used");
             return;
         }
 
-        update_color_scheme (accounts_service_proxy.prefers_color_scheme);
-        update_color (accounts_service_proxy.prefers_accent_color);
+        update_color_scheme (pantheon_proxy.prefers_color_scheme);
+        update_color (settings_daemon_proxy.accent_color);
 
-        accounts_service_proxy.g_properties_changed.connect ((changed, invalid) => {
-            var value = changed.lookup_value ("PrefersAccentColor", new VariantType ("i"));
+        pantheon_proxy.g_properties_changed.connect ((changed, invalid) => {
+            var value = changed.lookup_value ("PrefersColorScheme", new VariantType ("i"));
             if (value != null) {
-                update_color (value.get_int32 ());
+                update_color_scheme (value.get_int32 ());
             }
+        });
 
-            value = changed.lookup_value ("PrefersColorScheme", new VariantType ("i"));
+        settings_daemon_proxy.g_properties_changed.connect ((changed, invalid) => {
+            var value = changed.lookup_value ("AccentColor", new VariantType ("i"));
             if (value != null) {
-                update_color_scheme (value.get_int32 ());
+                update_color (value.get_int32 ());
             }
         });
     }

src/DesktopIntegration.vala

@@ -37,10 +37,7 @@ public class Gala.DesktopIntegration : GLib.Object {
         unowned var display = wm.get_display ();
         unowned var workspace_manager = display.get_workspace_manager ();
 
-        workspace_manager.active_workspace_changed.connect (() => {
-            active_workspace_changed ();
-            windows_changed (); // windows have 'on-active-workspace' property that we need to update
-        });
+        workspace_manager.active_workspace_changed.connect (() => active_workspace_changed ());
         workspace_manager.workspaces_reordered.connect (() => windows_changed ());
         workspace_manager.workspace_added.connect (() => windows_changed ());
         workspace_manager.workspace_removed.connect ((index) => {
@@ -99,7 +96,6 @@ public class Gala.DesktopIntegration : GLib.Object {
     public Window[] get_windows () throws GLib.DBusError, GLib.IOError {
         Window[] returned_windows = {};
         var apps = Gala.AppSystem.get_default ().get_running_apps ();
-        unowned var active_workspace = wm.get_display ().get_workspace_manager ().get_active_workspace ();
         foreach (unowned var app in apps) {
             foreach (weak Meta.Window window in app.get_windows ()) {
                 if (!is_eligible_window (window)) {
@@ -116,7 +112,6 @@ public class Gala.DesktopIntegration : GLib.Object {
                 properties.insert ("client-type", new GLib.Variant.uint32 (window.get_client_type ()));
                 properties.insert ("is-hidden", new GLib.Variant.boolean (window.is_hidden ()));
                 properties.insert ("has-focus", new GLib.Variant.boolean (window.has_focus ()));
-                properties.insert ("on-active-workspace", new GLib.Variant.boolean (window.located_on_workspace (active_workspace)));
                 properties.insert ("workspace-index", new GLib.Variant.int32 (window.get_workspace ().index ()));
                 properties.insert ("width", new GLib.Variant.uint32 (frame_rect.width));
                 properties.insert ("height", new GLib.Variant.uint32 (frame_rect.height));

src/WindowTracker.vala

@@ -199,6 +199,34 @@ public class Gala.WindowTracker : GLib.Object {
         return null;
     }
 
+    private unowned Gala.App? get_app_by_guessing (Meta.Window window) {
+        unowned var app_system = Gala.AppSystem.get_default ();
+        unowned Gala.App? result = null;
+
+        unowned string? id = window.get_gtk_application_id ();
+        // if id contains '.' it's probably a valid app id but it doesn't provide the desktop file
+        if (id != null && !id.contains (".") && (result = app_system.guess_app_by_id (id)) != null) {
+            return result;
+        }
+
+        id = window.get_sandboxed_app_id ();
+        if (id != null && !id.contains (".") && (result = app_system.guess_app_by_id (id)) != null) {
+            return result;
+        }
+
+        id = window.get_wm_class ();
+        if (id != null && !id.contains (".") && (result = app_system.guess_app_by_id (id)) != null) {
+            return result;
+        }
+
+        id = window.get_wm_class_instance ();
+        if (id != null && !id.contains (".") && (result = app_system.guess_app_by_id (id)) != null) {
+            return result;
+        }
+
+        return null;
+    }
+
     public Gala.App get_app_for_window (Meta.Window window) {
         unowned Meta.Window? transient_for = window.get_transient_for ();
         if (transient_for != null) {
@@ -279,9 +307,15 @@ public class Gala.WindowTracker : GLib.Object {
             return result;
         }
 
+        /* Try to carefully guess .desktop file name based on application ids and wm class
+         */
+        result = get_app_by_guessing (window);
+        if (result != null) {
+            return result;
+        }
+
         /* Our last resort - we create a fake app from the window */
         return new Gala.App.for_window (window);
-
     }
 
     private void tracked_window_changed (Meta.Window window) {