view: Rename/move workspaces_send_to() to view_move_to_workspace()

This function semantically belongs in view.c since it
modifies `struct view`.

Also a minor formatting fix in view_toggle_always_on_top().

diff --git a/include/view.h b/include/view.h
index 0df97d40ca5b63e4b68c9febd640465d379dc154..69d3f9336e01fb7974c6d9d1bedbe6900fb25e74 100644 (file)
--- a/include/view.h
+++ b/include/view.h
@@ -133,6 +133,7 @@ void view_set_fullscreen(struct view *view, bool fullscreen,
 void view_toggle_maximize(struct view *view);
 void view_toggle_decorations(struct view *view);
 void view_toggle_always_on_top(struct view *view);
+void view_move_to_workspace(struct view *view, struct workspace *workspace);
 void view_set_decorations(struct view *view, bool decorations);
 void view_toggle_fullscreen(struct view *view);
 void view_adjust_for_layout_change(struct view *view);

diff --git a/include/workspaces.h b/include/workspaces.h
index 53dc4da31e2a23a6add0bdd3c569894ce0bb3223..809112c21c75547939fe461ee8029febaf76d6b0 100644 (file)
--- a/include/workspaces.h
+++ b/include/workspaces.h
@@ -21,7 +21,6 @@ struct workspace {
 
 void workspaces_init(struct server *server);
 void workspaces_switch_to(struct workspace *target);
-void workspaces_send_to(struct view *view, struct workspace *target);
 void workspaces_destroy(struct server *server);
 void workspaces_osd_hide(struct seat *seat);
 struct workspace *workspaces_find(struct workspace *anchor, const char *name);

diff --git a/src/action.c b/src/action.c
index b1561f721becd1e84466442ed6767671c2a8e627..c1e38d7dd1fadc50146095642547196c1b7fb0e3 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -353,7 +353,7 @@ actions_run(struct view *activator, struct server *server,
                                char *target_name = action_str_from_arg(arg);
                                target = workspaces_find(view->workspace, target_name);
                                if (target) {
-                                       workspaces_send_to(view, target);
+                                       view_move_to_workspace(view, target);
                                }
                        }
                        break;

diff --git a/src/view.c b/src/view.c
index a305ea5188a503a15b263255edbbca4443d54058..ca67a6221a351b3eb9d4860d954a328e967d2400 100644 (file)
--- a/src/view.c
+++ b/src/view.c
@@ -522,13 +522,26 @@ view_toggle_always_on_top(struct view *view)
        assert(view);
        if (is_always_on_top(view)) {
                view->workspace = view->server->workspace_current;
-               wlr_scene_node_reparent(&view->scene_tree->node, view->workspace->tree);
+               wlr_scene_node_reparent(&view->scene_tree->node,
+                       view->workspace->tree);
        } else {
                wlr_scene_node_reparent(&view->scene_tree->node,
                        view->server->view_tree_always_on_top);
        }
 }
 
+void
+view_move_to_workspace(struct view *view, struct workspace *workspace)
+{
+       assert(view);
+       assert(workspace);
+       if (view->workspace != workspace) {
+               view->workspace = workspace;
+               wlr_scene_node_reparent(&view->scene_tree->node,
+                       workspace->tree);
+       }
+}
+
 void
 view_set_decorations(struct view *view, bool decorations)
 {

diff --git a/src/workspaces.c b/src/workspaces.c
index 54d5ee4f756cfaa2ddccd6daf5ba406b84faed07..20abf01103a8527fc996e48ee86762efc8136650 100644 (file)
--- a/src/workspaces.c
+++ b/src/workspaces.c
@@ -270,18 +270,6 @@ workspaces_switch_to(struct workspace *target)
        _osd_show(target->server);
 }
 
-void
-workspaces_send_to(struct view *view, struct workspace *target)
-{
-       assert(view);
-       assert(target);
-       if (view->workspace == target) {
-               return;
-       }
-       wlr_scene_node_reparent(&view->scene_tree->node, target->tree);
-       view->workspace = target;
-}
-
 void
 workspaces_osd_hide(struct seat *seat)
 {