summaryrefslogtreecommitdiffstats
path: root/sway/workspace.c
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2015-08-15 16:08:13 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2015-08-15 16:08:13 -0400
commit7f9ed880b0b102a1c9765d8b32e025ca778a57d5 (patch)
tree27313733bc2384048ae74bf196a7677e1355ad6b /sway/workspace.c
parentFix switching focus between outputs (diff)
downloadsway-7f9ed880b0b102a1c9765d8b32e025ca778a57d5.tar.gz
sway-7f9ed880b0b102a1c9765d8b32e025ca778a57d5.tar.zst
sway-7f9ed880b0b102a1c9765d8b32e025ca778a57d5.zip
Rename variable in workspace.c
Diffstat (limited to 'sway/workspace.c')
-rw-r--r--sway/workspace.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sway/workspace.c b/sway/workspace.c
index 6f46dd6b..b8b4d66e 100644
--- a/sway/workspace.c
+++ b/sway/workspace.c
@@ -99,19 +99,19 @@ void workspace_switch(swayc_t *workspace) {
99 parent = parent->parent; 99 parent = parent->parent;
100 } 100 }
101 // The current workspace of the output our target workspace is in 101 // The current workspace of the output our target workspace is in
102 swayc_t *c_workspace = parent->focused; 102 swayc_t *focused_workspace = parent->focused;
103 if (workspace != c_workspace && c_workspace) { 103 if (workspace != focused_workspace && focused_workspace) {
104 sway_log(L_DEBUG, "workspace: changing from '%s' to '%s'", c_workspace->name, workspace->name); 104 sway_log(L_DEBUG, "workspace: changing from '%s' to '%s'", focused_workspace->name, workspace->name);
105 uint32_t mask = 1; 105 uint32_t mask = 1;
106 106
107 // set all c_views in the old workspace to the invisible mask if the workspace 107 // set all c_views in the old workspace to the invisible mask if the workspace
108 // is in the same output & c_views in the new workspace to the visible mask 108 // is in the same output & c_views in the new workspace to the visible mask
109 container_map(c_workspace, set_mask, &mask); 109 container_map(focused_workspace, set_mask, &mask);
110 mask = 2; 110 mask = 2;
111 container_map(workspace, set_mask, &mask); 111 container_map(workspace, set_mask, &mask);
112 wlc_output_set_mask(wlc_get_focused_output(), 2); 112 wlc_output_set_mask(wlc_get_focused_output(), 2);
113 113
114 destroy_workspace(c_workspace); 114 destroy_workspace(focused_workspace);
115 } 115 }
116 unfocus_all(&root_container); 116 unfocus_all(&root_container);
117 focus_view(workspace); 117 focus_view(workspace);