fix(launcher): Find app window to activate even if it doesn't register with Shell.App

Author: mmstick

src/launcher.ts

@@ -15,7 +15,7 @@ import type { ShellWindow } from 'window'
 import type { JsonIPC } from 'launcher_service'
 
 const { DefaultPointerPosition } = config
-const { Clutter, GLib, Meta, Shell } = imports.gi
+const { Clutter, Gio, GLib, Meta, Shell } = imports.gi
 
 interface SearchOption {
     result: JsonIPC.SearchResult
@@ -192,7 +192,6 @@ export class Launcher extends search.Search {
 
         if (app) {
             if (app.state === Shell.AppState.RUNNING) {
-                global.log(`activating window`)
                 app.activate()
                 const window = app.get_windows()[0]
                 if (window) shell_window.activate(true, DefaultPointerPosition.TopLeft, window)
@@ -202,6 +201,15 @@ export class Launcher extends search.Search {
             app.launch(0, -1, gpuPref)
 
             GLib.timeout_add(GLib.PRIORITY_DEFAULT, 100, () => {
+                if (app.state === Shell.AppState.STOPPED) {
+                    const info = app.get_app_info()
+                    if (info) {
+                        this.locate_by_app_info(info)?.activate(false)
+                    }
+
+                    return false;
+                }
+
                 const window = app.get_windows()[0]
                 if (window) {
                     shell_window.activate(true, DefaultPointerPosition.TopLeft, window)
@@ -223,6 +231,30 @@ export class Launcher extends search.Search {
         log.warn("pop-shell: deprecated function called (dialog_launcher::load_desktop_files)")
     }
 
+    locate_by_app_info(info: any): null | ShellWindow {
+        const exec_info: null | string = info.get_string("Exec")
+        const exec = exec_info?.split(' ').shift()?.split('/').pop()
+        if (exec) {
+            for (const window of this.ext.tab_list(Meta.TabList.NORMAL, null)) {
+                const pid = window.meta.get_pid()
+                if (pid !== -1) {
+                    try {
+                        let f = Gio.File.new_for_path(`/proc/${pid}/cmdline`)
+                        const [,bytes] = f.load_contents(null)
+                        const output: string = imports.byteArray.toString(bytes)
+                        const cmd = output.split(' ').shift()?.split('/').pop()
+                        global.log(`is ${cmd} equal to ${exec}`)
+                        if (cmd === exec) return window
+                    } catch (_) {
+
+                    }
+                }
+            }
+        }
+
+        return null
+    }
+
     open(ext: Ext) {
         const mon = ext.monitor_work_area(ext.active_monitor())
 

src/search.ts

@@ -250,12 +250,14 @@ export class Search {
 
     highlight_selected() {
         const widget = this.widgets[this.active_id]
-        widget.add_style_pseudo_class("select")
+        if (widget) {
+            widget.add_style_pseudo_class("select")
 
-        try {
-            imports.misc.util.ensureActorVisibleInScrollView(this.scroller, widget)
-        } catch (_error) {
+            try {
+                imports.misc.util.ensureActorVisibleInScrollView(this.scroller, widget)
+            } catch (_error) {
 
+            }
         }
     }
 
@@ -266,9 +268,7 @@ export class Search {
     }
 
     unselect() {
-        this.widgets[this.active_id].remove_style_pseudo_class(
-            "select"
-        );
+        this.widgets[this.active_id]?.remove_style_pseudo_class("select");
     }
 
     append_search_option(option: SearchOption) {

src/window.ts

@@ -610,7 +610,8 @@ export function activate(move_mouse: boolean, default_pointer_position: Config.D
 
     win.raise();
     win.unminimize();
-    win.get_workspace().activate_with_focus(win, global.get_current_time())
+
+    workspace.activate_with_focus(win, global.get_current_time())
 
     if (move_mouse && !pointer_already_on_window(win)) {
         place_pointer_on(default_pointer_position, win)