Skip nonmanaged window when focusing

Author: iacore

gui-agent/vmside.c

@@ -1673,6 +1673,31 @@ static void handle_keypress(Ghandles * g, XID UNUSED(winid))
 
 static void handle_focus_helper(Ghandles * g, XID winid, struct msg_focus msg);
 
+static void try_to_focus(Ghandles * g, XID window)
+{
+    SKIP_NONMANAGED_WINDOW;
+    bool parent_has_focus = true;
+
+    // TODO: check if the parent has focus
+    // The window may have hierarchy, where context menu may have focus
+    // root 
+    // +-VS Code
+    //   +-Context Menu
+
+    // the commented code is wrong (only works for "decorated" window)
+    // int _return_to;
+    // XID focused_winid;
+    // XGetInputFocus(g->display, &focused_winid, &_return_to);
+    
+    if (!parent_has_focus) {
+        struct msg_focus msg_focusin;
+        msg_focusin.type = FocusIn;
+        msg_focusin.mode = NotifyNormal;
+        msg_focusin.detail = NotifyAncestor;
+        handle_focus_helper(g, window, msg_focusin);
+    }
+}
+
 static void handle_button(Ghandles * g, XID winid)
 {
     struct msg_button msg;
@@ -1695,16 +1720,7 @@ static void handle_button(Ghandles * g, XID winid)
 
     // Fake a "focus in" when mouse down on unfocused window.
     if (is_button_press) {
-        int _return_to;
-        XID focused_winid;
-        XGetInputFocus(g->display, &focused_winid, &_return_to);
-        if (focused_winid != winid) {
-            struct msg_focus msg_focusin;
-            msg_focusin.type = FocusIn;
-            msg_focusin.mode = NotifyNormal;
-            msg_focusin.detail = NotifyAncestor;
-            handle_focus_helper(g, winid, msg_focusin);
-        }
+        try_to_focus(g, winid);
     }
 
     feed_xdriver(g, 'B', msg.button, is_button_press ? 1 : 0);