api: make input focus global state (#1913)

The keyboard input focus has always been a global state (to be precise,
per-seat, but Wayfire has only one seat anyway). However, previously the
focused view has been managed per-output, which makes little sense and
does not reflect reality, nor the desired behavior. This commit moves
all keyboard-focus functionality out of wf::output_t and into
wf::seat_t.

Should fix #1892

Author: ammen99

plugins/common/wayfire/plugins/common/input-grab.hpp

@@ -8,6 +8,7 @@
 #include <wayfire/debug.hpp>
 #include <memory>
 #include <string>
+#include <wayfire/seat.hpp>
 namespace wf
 {
 namespace scene
@@ -146,8 +147,7 @@ class input_grab_t
         children.insert(idx, grab_node);
         root->set_children_list(children);
         wf::get_core().transfer_grab(grab_node);
-        scene::update(root, scene::update_flag::CHILDREN_LIST);
-        output->refocus();
+        scene::update(root, scene::update_flag::CHILDREN_LIST | scene::update_flag::REFOCUS);
 
         // Set cursor to default.
         wf::get_core().set_cursor("default");
@@ -160,10 +160,8 @@ class input_grab_t
     {
         if (grab_node->parent())
         {
-            wf::scene::remove_child(grab_node);
+            wf::scene::remove_child(grab_node, scene::update_flag::REFOCUS);
         }
-
-        output->refocus();
     }
 };
 }

plugins/common/wayfire/plugins/common/move-drag-interface.hpp

@@ -9,6 +9,7 @@
 #include "wayfire/scene-operations.hpp"
 #include "wayfire/scene-render.hpp"
 #include "wayfire/scene.hpp"
+#include "wayfire/seat.hpp"
 #include "wayfire/signal-definitions.hpp"
 #include <memory>
 #include <wayfire/nonstd/reverse.hpp>
@@ -669,7 +670,7 @@ class core_drag_t : public signal::provider_t
 
             current_output    = output;
             data.focus_output = output;
-            wf::get_core().focus_output(output);
+            wf::get_core().seat->focus_output(output);
             emit(&data);
 
             if (output)
@@ -774,7 +775,7 @@ inline void adjust_view_on_output(drag_done_signal *ev)
         ev->focused_output->wset()->move_to_workspace(v, target_ws);
     }
 
-    ev->focused_output->focus_view(focus_view, true);
+    wf::get_core().default_wm->focus_raise_view(focus_view);
 }
 
 /**

plugins/ipc/ipc-activator.hpp

@@ -9,6 +9,7 @@
 #include "wayfire/option-wrapper.hpp"
 #include "wayfire/output.hpp"
 #include "wayfire/plugins/common/shared-core-data.hpp"
+#include "wayfire/seat.hpp"
 
 namespace wf
 {
@@ -74,7 +75,7 @@ class ipc_activator_t
         WFJSON_OPTIONAL_FIELD(data, "output_id", number_integer);
         WFJSON_OPTIONAL_FIELD(data, "view_id", number_integer);
 
-        wf::output_t *wo = wf::get_core().get_active_output();
+        wf::output_t *wo = wf::get_core().seat->get_active_output();
         if (data.contains("output_id"))
         {
             wo = ipc::find_output_by_id(data["output_id"]);
@@ -104,7 +105,7 @@ class ipc_activator_t
 
     wf::output_t *choose_output()
     {
-        return wf::get_core().get_active_output();
+        return wf::get_core().seat->get_active_output();
     }
 
     wayfire_view choose_view(wf::activator_source_t source)
@@ -115,7 +116,7 @@ class ipc_activator_t
             view = wf::get_core().get_cursor_focus_view();
         } else
         {
-            view = wf::get_core().get_active_output()->get_active_view();
+            view = wf::get_core().seat->get_active_view();
         }
 
         return view;

plugins/scale/scale-title-filter.cpp

@@ -10,6 +10,7 @@
 #include <wayfire/plugins/scale-signal.hpp>
 #include <wayfire/nonstd/wlroots-full.hpp>
 #include <wayfire/toplevel-view.hpp>
+#include <wayfire/seat.hpp>
 
 #include <linux/input-event-codes.h>
 
@@ -218,7 +219,7 @@ class scale_title_filter : public wf::per_output_plugin_instance_t
             return;
         }
 
-        if (output != wf::get_core().get_active_output())
+        if (output != wf::get_core().seat->get_active_output())
         {
             return;
         }

plugins/scale/scale.cpp

@@ -418,7 +418,7 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
     {
         if (view == current_focus_view)
         {
-            current_focus_view = toplevel_cast(output->get_active_view());
+            current_focus_view = toplevel_cast(wf::get_active_view_for_output(output));
         }
 
         if (view == initial_focus_view)
@@ -498,9 +498,6 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
             // End scale
             initial_focus_view = nullptr;
             deactivate();
-            select_view(view);
-
-            output->focus_view(view, false);
             break;
 
           case BTN_MIDDLE:
@@ -587,15 +584,16 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
 
     void handle_keyboard_key(wf::seat_t*, wlr_keyboard_key_event ev) override
     {
-        auto view = toplevel_cast(output->get_active_view());
+        auto view = toplevel_cast(wf::get_active_view_for_output(output));
         if (!view)
         {
             view = current_focus_view;
             if (view)
             {
                 fade_out_all_except(view);
                 fade_in(view);
-                output->focus_view(view, true);
+
+                wf::get_core().default_wm->focus_raise_view(view);
                 return;
             }
         } else if (!scale_data.count(view))
@@ -635,14 +633,14 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
           case KEY_ENTER:
             deactivate();
             select_view(current_focus_view);
-            output->focus_view(current_focus_view, true);
+            wf::get_core().default_wm->focus_raise_view(view);
 
             return;
 
           case KEY_ESC:
             deactivate();
             output->wset()->request_workspace(initial_workspace);
-            output->focus_view(initial_focus_view, true);
+            wf::get_core().default_wm->focus_raise_view(initial_focus_view);
             initial_focus_view = nullptr;
 
             return;
@@ -682,9 +680,12 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
         view = find_view_in_grid(next_row, next_col);
         if (view && (current_focus_view != view))
         {
-            /* view_focused handler will update the view state
-             * note: this will always unminimize a minimized view */
-            output->focus_view(view, false);
+            fade_out_all_except(view);
+            fade_in(view);
+            current_focus_view = view;
+
+            // Update activated state
+            wf::get_core().seat->focus_view(view);
         }
     }
 
@@ -896,7 +897,7 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
             });
 
             current_focus_view = views.empty() ? nullptr : views.front();
-            output->focus_view(current_focus_view, true);
+            wf::get_core().default_wm->focus_raise_view(current_focus_view);
         }
     }
 
@@ -1162,7 +1163,7 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
     {
         if (current_focus_view)
         {
-            output->focus_view(current_focus_view, true);
+            wf::get_core().default_wm->focus_raise_view(current_focus_view);
         }
 
         layout_slots(get_views());
@@ -1202,20 +1203,12 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
         }
     };
 
-    /* View focused. This handler makes sure our view remains focused */
-    wf::signal::connection_t<wf::focus_view_signal> view_focused = [=] (wf::focus_view_signal *ev)
-    {
-        fade_out_all_except(toplevel_cast(ev->view));
-        fade_in(toplevel_cast(ev->view));
-        current_focus_view = toplevel_cast(ev->view);
-    };
-
     /* Our own refocus that uses untransformed coordinates */
     void refocus()
     {
         if (current_focus_view)
         {
-            output->focus_view(current_focus_view, true);
+            wf::get_core().default_wm->focus_raise_view(current_focus_view);
             select_view(current_focus_view);
 
             return;
@@ -1234,7 +1227,7 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
             }
         }
 
-        output->focus_view(next_focus, true);
+        wf::get_core().default_wm->focus_raise_view(current_focus_view);
     }
 
     /* Returns true if any scale animation is running */
@@ -1340,16 +1333,16 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
         }
 
         initial_workspace  = output->wset()->get_current_workspace();
-        initial_focus_view = toplevel_cast(output->get_active_view());
+        initial_focus_view = toplevel_cast(wf::get_active_view_for_output(output));
         current_focus_view = initial_focus_view ?: views.front();
         // Make sure no leftover events from the activation binding
         // trigger an action in scale
         last_selected_view = nullptr;
 
         grab->grab_input(wf::scene::layer::OVERLAY);
-        if (current_focus_view != output->get_active_view())
+        if (current_focus_view != wf::get_core().seat->get_active_view())
         {
-            output->focus_view(current_focus_view, true);
+            wf::get_core().default_wm->focus_raise_view(current_focus_view);
         }
 
         active = true;
@@ -1362,7 +1355,6 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
         output->connect(&view_disappeared);
         output->connect(&view_minimized);
         output->connect(&view_unmapped);
-        output->connect(&view_focused);
 
         fade_out_all_except(current_focus_view);
         fade_in(current_focus_view);
@@ -1376,7 +1368,6 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
         active = false;
 
         set_hook();
-        view_focused.disconnect();
         on_view_mapped.disconnect();
         on_view_set_output.disconnect();
         view_unmapped.disconnect();
@@ -1433,7 +1424,6 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
         remove_transformers();
         scale_data.clear();
         grab->ungrab_input();
-        view_focused.disconnect();
         on_view_mapped.disconnect();
         on_view_set_output.disconnect();
         view_unmapped.disconnect();

plugins/single_plugins/fast-switcher.cpp

@@ -11,6 +11,7 @@
 #include <wayfire/util/log.hpp>
 #include <wayfire/seat.hpp>
 #include <wayfire/toplevel-view.hpp>
+#include <wayfire/window-manager.hpp>
 
 /*
  * This plugin provides abilities to switch between views.
@@ -74,7 +75,7 @@ class wayfire_fast_switcher : public wf::per_output_plugin_instance_t, public wf
             wf::view_bring_to_front(views[i]);
         } else
         {
-            output->focus_view(views[i], true);
+            wf::get_core().default_wm->focus_raise_view(views[i]);
         }
     }
 

plugins/single_plugins/idle.cpp

@@ -194,7 +194,7 @@ class wayfire_idle_plugin : public wf::per_output_plugin_instance_t
         output->connect(&fullscreen_state_changed);
         disable_on_fullscreen.set_callback(disable_on_fullscreen_changed);
 
-        if (auto toplevel = toplevel_cast(output->get_active_view()))
+        if (auto toplevel = toplevel_cast(wf::get_active_view_for_output(output)))
         {
             /* Currently, the fullscreen count would always be 0 or 1,
              * since fullscreen-layer-focused is only emitted on changes between 0

plugins/single_plugins/ipc-rules.cpp

@@ -3,6 +3,7 @@
 #include <wayfire/view.hpp>
 #include <wayfire/output.hpp>
 #include <wayfire/toplevel-view.hpp>
+#include <wayfire/seat.hpp>
 #include <set>
 
 #include "plugins/ipc/ipc-helpers.hpp"
@@ -75,7 +76,7 @@ class ipc_rules_t : public wf::plugin_interface_t, public wf::per_output_tracker
 
     wf::ipc::method_callback get_focused_view = [=] (nlohmann::json data)
     {
-        if (auto view = wf::get_core().get_active_output()->get_active_view())
+        if (auto view = wf::get_core().seat->get_active_view())
         {
             auto response = wf::ipc::json_ok();
             response["info"] = view_to_json(view);

plugins/single_plugins/move.cpp

@@ -331,7 +331,7 @@ class wayfire_move : public wf::per_output_plugin_instance_t,
         if (join_views)
         {
             // ensure that the originally grabbed view will be focused
-            output->focus_view(grabbed_view);
+            wf::get_core().seat->focus_view(grabbed_view);
         }
 
         drag_helper->start_drag(view, grab_position, opts);

plugins/single_plugins/oswitch.cpp

@@ -5,6 +5,7 @@
 #include <wayfire/view.hpp>
 #include <wayfire/output-layout.hpp>
 #include <wayfire/bindings-repository.hpp>
+#include <wayfire/seat.hpp>
 
 class wayfire_oswitch : public wf::plugin_interface_t
 {
@@ -15,21 +16,22 @@ class wayfire_oswitch : public wf::plugin_interface_t
         /* when we switch the output, the oswitch keybinding
          * may be activated for the next output, which we don't want,
          * so we postpone the switch */
-        auto current_output = wf::get_core().get_active_output();
+        auto current_output = wf::get_core().seat->get_active_output();
         auto next = wf::get_core().output_layout->get_next_output(current_output);
         idle_next_output.run_once([=] ()
         {
-            wf::get_core().focus_output(next);
+            wf::get_core().seat->focus_output(next);
         });
 
         return true;
     };
 
     wf::activator_callback switch_output_with_window = [=] (auto)
     {
-        auto current_output = wf::get_core().get_active_output();
+        auto current_output = wf::get_core().seat->get_active_output();
         auto next = wf::get_core().output_layout->get_next_output(current_output);
-        auto view = wf::toplevel_cast(current_output->get_active_view());
+        auto view = wf::toplevel_cast(wf::get_active_view_for_output(current_output));
+        LOGI("Found view ", view);
         if (!view)
         {
             switch_output(wf::activator_data_t{});
@@ -40,7 +42,7 @@ class wayfire_oswitch : public wf::plugin_interface_t
         move_view_to_output(view, next, true);
         idle_next_output.run_once([=] ()
         {
-            wf::get_core().focus_output(next);
+            wf::get_core().seat->focus_output(next);
         });
 
         return true;

plugins/single_plugins/preserve-output.cpp

@@ -3,6 +3,7 @@
 #include <wayfire/workspace-set.hpp>
 #include <wayfire/signal-definitions.hpp>
 #include <wayfire/output.hpp>
+#include <wayfire/seat.hpp>
 #include <wayfire/output-layout.hpp>
 #include <wayfire/nonstd/wlroots-full.hpp>
 #include <chrono>
@@ -47,7 +48,7 @@ class preserve_output_t : public wf::plugin_interface_t
         auto ident = make_output_identifier(output);
         auto& data = saved_outputs[ident];
 
-        data.was_focused = (output == wf::get_core().get_active_output());
+        data.was_focused = (output == wf::get_core().seat->get_active_output());
         data.destroy_timestamp = std::chrono::steady_clock::now();
         data.workspace_set     = output->wset();
 
@@ -84,7 +85,7 @@ class preserve_output_t : public wf::plugin_interface_t
         output->set_workspace_set(data.workspace_set);
         if (data.was_focused && !focused_output_expired(data))
         {
-            wf::get_core().focus_output(output);
+            wf::get_core().seat->focus_output(output);
         }
 
         saved_outputs.erase(ident);