output: make workspace set accessible via a method instead of a field

Author: ammen99

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

@@ -701,14 +701,14 @@ inline void adjust_view_on_output(drag_done_signal *ev)
     auto grab = ev->grab_position + output_delta;
 
     auto output_geometry = ev->focused_output->get_relative_geometry();
-    auto current_ws = ev->focused_output->workspace->get_current_workspace();
+    auto current_ws = ev->focused_output->wset()->get_current_workspace();
     wf::point_t target_ws{
         (int)std::floor(1.0 * grab.x / output_geometry.width),
         (int)std::floor(1.0 * grab.y / output_geometry.height),
     };
     target_ws = target_ws + current_ws;
 
-    auto gsize = ev->focused_output->workspace->get_workspace_grid_size();
+    auto gsize = ev->focused_output->wset()->get_workspace_grid_size();
     target_ws.x = wf::clamp(target_ws.x, 0, gsize.width - 1);
     target_ws.y = wf::clamp(target_ws.y, 0, gsize.height - 1);
 
@@ -750,7 +750,7 @@ inline void adjust_view_on_output(drag_done_signal *ev)
     // Ensure that every view is visible on parent's main workspace
     for (auto& v : parent->enumerate_views())
     {
-        ev->focused_output->workspace->move_to_workspace(v, target_ws);
+        ev->focused_output->wset()->move_to_workspace(v, target_ws);
     }
 
     ev->focused_output->focus_view(focus_view, true);

plugins/common/wayfire/plugins/common/workspace-stream-sharing.hpp

@@ -100,7 +100,7 @@ class workspace_stream_pool_t : public wf::custom_data_t
     {
         this->output = output;
         output->connect(&on_workspace_grid_changed);
-        resize_pool(this->output->workspace->get_workspace_grid_size());
+        resize_pool(this->output->wset()->get_workspace_grid_size());
     }
 
     void resize_pool(wf::dimensions_t size)
@@ -138,7 +138,7 @@ class workspace_stream_pool_t : public wf::custom_data_t
 
     wf::signal::connection_t<workspace_grid_changed_signal> on_workspace_grid_changed = [=] (auto)
     {
-        resize_pool(this->output->workspace->get_workspace_grid_size());
+        resize_pool(this->output->wset()->get_workspace_grid_size());
     };
 };
 }

plugins/common/wayfire/plugins/common/workspace-wall.hpp

@@ -173,7 +173,7 @@ class workspace_wall_t : public wf::signal::provider_t
     wf::geometry_t get_wall_rectangle() const
     {
         auto size = this->output->get_screen_size();
-        auto workspace_size = this->output->workspace->get_workspace_grid_size();
+        auto workspace_size = this->output->wset()->get_workspace_grid_size();
 
         return {
             -gap_size,
@@ -210,7 +210,7 @@ class workspace_wall_t : public wf::signal::provider_t
     std::vector<wf::point_t> get_visible_workspaces(wf::geometry_t viewport) const
     {
         std::vector<wf::point_t> visible;
-        auto wsize = output->workspace->get_workspace_grid_size();
+        auto wsize = output->wset()->get_workspace_grid_size();
         for (int i = 0; i < wsize.width; i++)
         {
             for (int j = 0; j < wsize.height; j++)
@@ -227,7 +227,7 @@ class workspace_wall_t : public wf::signal::provider_t
 
     void resize_colors()
     {
-        auto size = this->output->workspace->get_workspace_grid_size();
+        auto size = this->output->wset()->get_workspace_grid_size();
         render_colors.resize(size.width);
         for (auto& v : render_colors)
         {
@@ -436,7 +436,7 @@ class workspace_wall_t : public wf::signal::provider_t
         workspace_wall_node_t(workspace_wall_t *wall) : node_t(false)
         {
             this->wall  = wall;
-            auto [w, h] = wall->output->workspace->get_workspace_grid_size();
+            auto [w, h] = wall->output->wset()->get_workspace_grid_size();
             workspaces.resize(w);
             for (int i = 0; i < w; i++)
             {

plugins/cube/cube.cpp

@@ -143,8 +143,8 @@ class wayfire_cube : public wf::per_output_plugin_instance_t, public wf::pointer
         cube_render_node_t(wayfire_cube *cube) : node_t(false)
         {
             this->cube = cube;
-            auto w = cube->output->workspace->get_workspace_grid_size().width;
-            auto y = cube->output->workspace->get_current_workspace().y;
+            auto w = cube->output->wset()->get_workspace_grid_size().width;
+            auto y = cube->output->wset()->get_current_workspace().y;
             for (int i = 0; i < w; i++)
             {
                 auto node = std::make_shared<wf::workspace_stream_node_t>(cube->output, wf::point_t{i, y});
@@ -234,7 +234,7 @@ class wayfire_cube : public wf::per_output_plugin_instance_t, public wf::pointer
 
     int get_num_faces()
     {
-        return output->workspace->get_workspace_grid_size().width;
+        return output->wset()->get_workspace_grid_size().width;
     }
 
     wf::plugin_activation_data_t grab_interface{
@@ -402,7 +402,7 @@ class wayfire_cube : public wf::per_output_plugin_instance_t, public wf::pointer
         wf::get_core().hide_cursor();
         input_grab->grab_input(wf::scene::layer::OVERLAY);
 
-        auto wsize = output->workspace->get_workspace_grid_size();
+        auto wsize = output->wset()->get_workspace_grid_size();
         animation.side_angle = 2 * M_PI / float(wsize.width);
         identity_z_offset    = 0.5 / std::tan(animation.side_angle / 2);
         if (wsize.width == 1)
@@ -444,9 +444,9 @@ class wayfire_cube : public wf::per_output_plugin_instance_t, public wf::pointer
         int size = get_num_faces();
         int dvx  = calculate_viewport_dx_from_rotation();
 
-        auto cws = output->workspace->get_current_workspace();
+        auto cws = output->wset()->get_current_workspace();
         int nvx  = (cws.x + (dvx % size) + size) % size;
-        output->workspace->set_workspace({nvx, cws.y});
+        output->wset()->set_workspace({nvx, cws.y});
 
         /* We are finished with rotation, make sure the next time cube is used
          * it is properly reset */
@@ -602,7 +602,7 @@ class wayfire_cube : public wf::per_output_plugin_instance_t, public wf::pointer
         GL_CALL(glFrontFace(front_face));
         static const GLuint indexData[] = {0, 1, 2, 0, 2, 3};
 
-        auto cws = output->workspace->get_current_workspace();
+        auto cws = output->wset()->get_current_workspace();
         for (int i = 0; i < get_num_faces(); i++)
         {
             int index = (cws.x + i) % get_num_faces();

plugins/cube/skydome.cpp

@@ -155,7 +155,7 @@ void wf_cube_background_skydome::render_frame(const wf::render_target_t& fb,
     program.attrib_pointer("position", 3, 0, vertices.data());
     program.attrib_pointer("uvPosition", 2, 0, coords.data());
 
-    auto cws   = output->workspace->get_current_workspace();
+    auto cws   = output->wset()->get_current_workspace();
     auto model = glm::rotate(glm::mat4(1.0),
         float(attribs.cube_animation.rotation) - cws.x * attribs.side_angle,
         glm::vec3(0, 1, 0));

plugins/grid/grid.cpp

@@ -166,7 +166,7 @@ class wayfire_grid : public wf::per_output_plugin_instance_t
     bool can_adjust_view(wayfire_view view)
     {
         auto workspace_impl =
-            output->workspace->get_workspace_implementation();
+            output->wset()->get_workspace_implementation();
 
         return workspace_impl->view_movable(view) &&
                workspace_impl->view_resizable(view);
@@ -220,7 +220,7 @@ class wayfire_grid : public wf::per_output_plugin_instance_t
     wf::signal::connection_t<wf::workarea_changed_signal> on_workarea_changed =
         [=] (wf::workarea_changed_signal *ev)
     {
-        for (auto& view : output->workspace->get_views(wf::WSET_MAPPED_ONLY))
+        for (auto& view : output->wset()->get_views(wf::WSET_MAPPED_ONLY))
         {
             auto data = view->get_data_safe<wf_grid_slot_data>();
 
@@ -265,7 +265,7 @@ class wayfire_grid : public wf::per_output_plugin_instance_t
     wf::geometry_t adjust_for_workspace(wf::geometry_t geometry,
         wf::point_t workspace)
     {
-        auto delta_ws = workspace - output->workspace->get_current_workspace();
+        auto delta_ws = workspace - output->wset()->get_current_workspace();
         auto scr_size = output->get_screen_size();
         geometry.x += delta_ws.x * scr_size.width;
         geometry.y += delta_ws.y * scr_size.height;

plugins/scale/scale.cpp

@@ -174,7 +174,7 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
                 return false;
             }
 
-            auto ws = output->workspace->get_current_workspace() + delta;
+            auto ws = output->wset()->get_current_workspace() + delta;
 
             // vswitch picks the top view, we want the focused one
             std::vector<wayfire_view> fixed_views;
@@ -183,7 +183,7 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
                 fixed_views.push_back(current_focus_view);
             }
 
-            output->workspace->request_workspace(ws, fixed_views);
+            output->wset()->request_workspace(ws, fixed_views);
 
             return true;
         });
@@ -421,7 +421,7 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
         }
 
         auto ws = get_view_main_workspace(view);
-        output->workspace->request_workspace(ws);
+        output->wset()->request_workspace(ws);
     }
 
     /* Updates current and initial view focus variables accordingly */
@@ -556,7 +556,7 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
             view = view->parent;
         }
 
-        auto ws     = output->workspace->get_current_workspace();
+        auto ws     = output->wset()->get_current_workspace();
         auto og     = output->get_layout_geometry();
         auto vg     = view->get_wm_geometry();
         auto center = wf::point_t{vg.x + vg.width / 2, vg.y + vg.height / 2};
@@ -644,7 +644,7 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
 
           case KEY_ESC:
             deactivate();
-            output->workspace->request_workspace(initial_workspace);
+            output->wset()->request_workspace(initial_workspace);
             output->focus_view(initial_focus_view, true);
             initial_focus_view = nullptr;
 
@@ -733,7 +733,7 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
     /* Returns a list of views for all workspaces */
     std::vector<wayfire_view> get_all_workspace_views()
     {
-        return output->workspace->get_views(wf::WSET_EXCLUDE_MINIMIZED | wf::WSET_MAPPED_ONLY);
+        return output->wset()->get_views(wf::WSET_EXCLUDE_MINIMIZED | wf::WSET_MAPPED_ONLY);
     }
 
     /* Returns a list of views for the current workspace */
@@ -1300,7 +1300,7 @@ class wayfire_scale : public wf::per_output_plugin_instance_t,
             return false;
         }
 
-        initial_workspace  = output->workspace->get_current_workspace();
+        initial_workspace  = output->wset()->get_current_workspace();
         initial_focus_view = output->get_active_view();
         current_focus_view = initial_focus_view ?: views.front();
         // Make sure no leftover events from the activation binding

plugins/scale/scale.hpp

@@ -9,7 +9,7 @@ inline wayfire_view scale_find_view_at(wf::pointf_t at, wf::output_t *output)
     at.x -= offset.x;
     at.y -= offset.y;
 
-    auto node = output->workspace->get_node()->find_node_at(at);
+    auto node = output->wset()->get_node()->find_node_at(at);
     if (node)
     {
         return wf::node_to_view(node->node->shared_from_this());

plugins/single_plugins/expo.cpp

@@ -28,7 +28,7 @@ class wayfire_expo : public wf::per_output_plugin_instance_t, public wf::keyboar
     wf::point_t convert_workspace_index_to_coords(int index)
     {
         index--; // compensate for indexing from 0
-        auto wsize = output->workspace->get_workspace_grid_size();
+        auto wsize = output->wset()->get_workspace_grid_size();
         int x = index % wsize.width;
         int y = index / wsize.width;
 
@@ -93,7 +93,7 @@ class wayfire_expo : public wf::per_output_plugin_instance_t, public wf::keyboar
         for (const auto& [workspace, binding] : workspace_bindings.value())
         {
             int workspace_index = atoi(workspace.c_str());
-            auto wsize = output->workspace->get_workspace_grid_size();
+            auto wsize = output->wset()->get_workspace_grid_size();
             if ((workspace_index > (wsize.width * wsize.height)) ||
                 (workspace_index < 1))
             {
@@ -225,7 +225,7 @@ class wayfire_expo : public wf::per_output_plugin_instance_t, public wf::keyboar
         if ((ev->focus_output == output) && can_handle_drag())
         {
             state.button_pressed = true;
-            auto [vw, vh] = output->workspace->get_workspace_grid_size();
+            auto [vw, vh] = output->wset()->get_workspace_grid_size();
             drag_helper->set_scale(std::max(vw, vh));
         }
     };
@@ -291,7 +291,7 @@ class wayfire_expo : public wf::per_output_plugin_instance_t, public wf::keyboar
         output->render->add_effect(&post_frame, wf::OUTPUT_EFFECT_POST);
         output->render->schedule_redraw();
 
-        auto cws = output->workspace->get_current_workspace();
+        auto cws = output->wset()->get_current_workspace();
         initial_ws = target_ws = cws;
 
         for (size_t i = 0; i < keyboard_select_cbs.size(); i++)
@@ -310,10 +310,10 @@ class wayfire_expo : public wf::per_output_plugin_instance_t, public wf::keyboar
         if (zoom_in)
         {
             zoom_animation.set_start(wall->get_workspace_rectangle(
-                output->workspace->get_current_workspace()));
+                output->wset()->get_current_workspace()));
 
             /* Make sure workspaces are centered */
-            auto wsize = output->workspace->get_workspace_grid_size();
+            auto wsize = output->wset()->get_workspace_grid_size();
             auto size  = output->get_screen_size();
             const int maxdim = std::max(wsize.width, wsize.height);
             const int gap    = this->delimiter_offset;
@@ -343,7 +343,7 @@ class wayfire_expo : public wf::per_output_plugin_instance_t, public wf::keyboar
     {
         state.accepting_input = false;
         start_zoom(false);
-        output->workspace->set_workspace(target_ws);
+        output->wset()->set_workspace(target_ws);
         for (size_t i = 0; i < keyboard_select_cbs.size(); i++)
         {
             output->rem_binding(&keyboard_select_cbs[i]);
@@ -352,7 +352,7 @@ class wayfire_expo : public wf::per_output_plugin_instance_t, public wf::keyboar
 
     wf::geometry_t get_grid_geometry()
     {
-        auto wsize  = output->workspace->get_workspace_grid_size();
+        auto wsize  = output->wset()->get_workspace_grid_size();
         auto full_g = output->get_layout_geometry();
 
         wf::geometry_t grid;
@@ -391,7 +391,7 @@ class wayfire_expo : public wf::per_output_plugin_instance_t, public wf::keyboar
     void start_moving(wayfire_view view, wf::point_t grab)
     {
         auto workspace_impl =
-            output->workspace->get_workspace_implementation();
+            output->wset()->get_workspace_implementation();
         if (!workspace_impl->view_movable(view))
         {
             return;
@@ -404,7 +404,7 @@ class wayfire_expo : public wf::per_output_plugin_instance_t, public wf::keyboar
         // Make sure that the view is in output-local coordinates!
         translate_wobbly(view, grab - ws_coords);
 
-        auto [vw, vh] = output->workspace->get_workspace_grid_size();
+        auto [vw, vh] = output->wset()->get_workspace_grid_size();
         wf::move_drag::drag_options_t opts;
         opts.initial_scale   = std::max(vw, vh);
         opts.enable_snap_off = move_enable_snap_off &&
@@ -529,7 +529,7 @@ class wayfire_expo : public wf::per_output_plugin_instance_t, public wf::keyboar
         }
 
         // ensure that the new target is valid (use wrap-around)
-        auto dim = output->workspace->get_workspace_grid_size();
+        auto dim = output->wset()->get_workspace_grid_size();
         target_ws.x = (target_ws.x + dim.width) % dim.width;
         target_ws.y = (target_ws.y + dim.height) % dim.height;
 
@@ -542,7 +542,7 @@ class wayfire_expo : public wf::per_output_plugin_instance_t, public wf::keyboar
      */
     void highlight_active_workspace()
     {
-        auto dim = output->workspace->get_workspace_grid_size();
+        auto dim = output->wset()->get_workspace_grid_size();
         for (int x = 0; x < dim.width; x++)
         {
             for (int y = 0; y < dim.height; y++)
@@ -587,7 +587,7 @@ class wayfire_expo : public wf::per_output_plugin_instance_t, public wf::keyboar
     {
         auto og = output->get_layout_geometry();
 
-        auto wsize = output->workspace->get_workspace_grid_size();
+        auto wsize = output->wset()->get_workspace_grid_size();
         float max  = std::max(wsize.width, wsize.height);
 
         float grid_start_x = og.width * (max - wsize.width) / float(max) / 2;
@@ -608,7 +608,7 @@ class wayfire_expo : public wf::per_output_plugin_instance_t, public wf::keyboar
     {
         input_coordinates_to_global_coordinates(ip.x, ip.y);
 
-        auto cws = output->workspace->get_current_workspace();
+        auto cws = output->wset()->get_current_workspace();
         auto og  = output->get_relative_geometry();
 
         /* Translate coordinates into output-local coordinate system,
@@ -631,7 +631,7 @@ class wayfire_expo : public wf::per_output_plugin_instance_t, public wf::keyboar
 
             if (auto view = wf::node_to_view(node))
             {
-                auto all_views = output->workspace->get_views();
+                auto all_views = output->wset()->get_views();
                 if (std::find(all_views.begin(), all_views.end(), view) != all_views.end())
                 {
                     return view;
@@ -680,7 +680,7 @@ class wayfire_expo : public wf::per_output_plugin_instance_t, public wf::keyboar
             return;
         }
 
-        auto size = this->output->workspace->get_workspace_grid_size();
+        auto size = this->output->wset()->get_workspace_grid_size();
         for (int x = 0; x < size.width; x++)
         {
             for (int y = 0; y < size.height; y++)
@@ -696,7 +696,7 @@ class wayfire_expo : public wf::per_output_plugin_instance_t, public wf::keyboar
 
     void resize_ws_fade()
     {
-        auto size = this->output->workspace->get_workspace_grid_size();
+        auto size = this->output->wset()->get_workspace_grid_size();
         ws_fade.resize(size.width);
         for (auto& v : ws_fade)
         {
@@ -719,7 +719,7 @@ class wayfire_expo : public wf::per_output_plugin_instance_t, public wf::keyboar
         resize_ws_fade();
 
         // check that the target and initial workspaces are still in the grid
-        auto size = this->output->workspace->get_workspace_grid_size();
+        auto size = this->output->wset()->get_workspace_grid_size();
         initial_ws.x = std::min(initial_ws.x, size.width - 1);
         initial_ws.y = std::min(initial_ws.y, size.height - 1);