xdg-shell, xwayland: always focus dialogs on map if parent is focused

Dialogs are identified as a view with a parent.

This commit also moves shared code between xdg-shell and xwayland to a common location (toplevel_view_interface_t::focus_toplevel_on_map())

Author: dkondor

src/api/wayfire/toplevel-view.hpp

@@ -203,6 +203,17 @@ class toplevel_view_interface_t : public virtual wf::view_interface_t
      * This function is useful for view implementations only.
      */
     void set_toplevel(std::shared_ptr<wf::toplevel_t> toplevel);
+
+    /**
+     * Potentially focus this view on first map. Newly mapped views are
+     * focused if either:
+     *  - the "core/focus_on_map" option is set
+     *  - no toplevel view is currently focused (i.e. no view is focused
+     *      or the currently focused view has role VIEW_ROLE_DESKTOP_ENVIRONMENT)
+     *  - the newly mapped view is a dialog (i.e. has a non-null parent)
+     *      and its parent is focused
+     */
+    void focus_toplevel_on_map();
 };
 
 inline wayfire_toplevel_view toplevel_cast(wayfire_view view)

src/view/toplevel-view.cpp

@@ -8,6 +8,7 @@
 #include <wayfire/window-manager.hpp>
 #include <wayfire/txn/transaction-manager.hpp>
 #include <wayfire/seat.hpp>
+#include <wayfire/view-helpers.hpp>
 #include "view-impl.hpp"
 #include "wayfire/core.hpp"
 #include "wayfire/scene.hpp"
@@ -329,6 +330,35 @@ void wf::toplevel_view_interface_t::set_toplevel(
     priv->toplevel = toplevel;
 }
 
+void wf::toplevel_view_interface_t::focus_toplevel_on_map()
+{
+    /* We only focus a newly mapped view if the corresponding option is
+     * set or if there is no currently active view. */
+    wayfire_view active_view = nullptr;
+    bool should_focus = wf::get_core().default_wm->focus_on_map;
+    if (!should_focus)
+    {
+        active_view = wf::get_core().seat->get_active_view();
+        if (active_view && (active_view->role == wf::VIEW_ROLE_DESKTOP_ENVIRONMENT))
+        {
+            active_view = nullptr;
+        }
+
+        if (!active_view || (active_view == this->parent))
+        {
+            should_focus = true;
+        }
+    }
+
+    if (should_focus)
+    {
+        wf::get_core().default_wm->focus_request(self());
+    } else if (active_view)
+    {
+        wf::view_bring_to_front(active_view);
+    }
+}
+
 wayfire_toplevel_view wf::find_view_for_toplevel(
     std::shared_ptr<wf::toplevel_t> toplevel)
 {

src/view/xdg-shell/xdg-toplevel-view.cpp

@@ -311,21 +311,7 @@ void wf::xdg_toplevel_view_t::map()
 
     xdg_toplevel_view_base_t::map();
 
-    /* We only focus a newly mapped view if the corresponding option is
-     * set or if there is no currently active view. */
-    auto active_view = wf::get_core().seat->get_active_view();
-    if (active_view && (active_view->role == wf::VIEW_ROLE_DESKTOP_ENVIRONMENT))
-    {
-        active_view = nullptr;
-    }
-
-    if (wf::get_core().default_wm->focus_on_map || (active_view == nullptr))
-    {
-        wf::get_core().default_wm->focus_request(self());
-    } else if (active_view)
-    {
-        wf::view_bring_to_front(active_view);
-    }
+    focus_toplevel_on_map();
 
     /* Might trigger repositioning */
     set_toplevel_parent(this->parent);

src/view/xwayland/xwayland-toplevel-view.hpp

@@ -378,21 +378,7 @@ class wayfire_xwayland_view : public wf::toplevel_view_interface_t, public wayfi
         const bool wants_focus = (wlr_xwayland_icccm_input_model(xw) != WLR_ICCCM_INPUT_MODEL_NONE);
         if (wants_focus)
         {
-            /* We only focus a newly mapped view if the corresponding option is
-             * set or if there is no currently active view. */
-            auto active_view = wf::get_core().seat->get_active_view();
-            if (active_view && (active_view->role == wf::VIEW_ROLE_DESKTOP_ENVIRONMENT))
-            {
-                active_view = nullptr;
-            }
-
-            if (wf::get_core().default_wm->focus_on_map || (active_view == nullptr))
-            {
-                wf::get_core().default_wm->focus_request(self());
-            } else if (active_view)
-            {
-                wf::view_bring_to_front(active_view);
-            }
+            focus_toplevel_on_map();
         }
 
         /* Might trigger repositioning */