mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 00:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed workspace switching in multimonitor layouts

Browse source
This commit is contained in:
Luminarys 2015-08-15 13:55:06 -05:00
parent b01a04f22b
commit 618b3df051
4 changed files with 70 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sway/workspace.c
View file

@ -94,20 +94,30 @@ swayc_t *workspace_find_by_name(const char* name) {
} }
void workspace_switch(swayc_t *workspace) { void workspace_switch(swayc_t *workspace) {
if (workspace != active_workspace && active_workspace) { swayc_t *parent = workspace;
sway_log(L_DEBUG, "workspace: changing from '%s' to '%s'", active_workspace->name, workspace->name); while (parent->type != C_OUTPUT) {
parent = parent->parent;
}
// The current workspace of the output our target workspace is in
swayc_t *c_workspace = parent->focused;
if (workspace != c_workspace && c_workspace) {
sway_log(L_DEBUG, "workspace: changing from '%s' to '%s'", c_workspace->name, workspace->name);
uint32_t mask = 1; uint32_t mask = 1;
// set all c_views in the old workspace to the invisible mask
container_map(active_workspace, set_mask, &mask);
// and c_views in the new workspace to the visible mask // set all c_views in the old workspace to the invisible mask if the workspace
// is in the same output & c_views in the new workspace to the visible mask
container_map(c_workspace, set_mask, &mask);
mask = 2; mask = 2;
container_map(workspace, set_mask, &mask); container_map(workspace, set_mask, &mask);
wlc_output_set_mask(wlc_get_focused_output(), 2); wlc_output_set_mask(wlc_get_focused_output(), 2);
//wlc_output_set_mask(wlc_get_focused_output(), 2);
unfocus_all(&root_container); unfocus_all(&root_container);
focus_view(workspace); focus_view(workspace);
destroy_workspace(active_workspace);
destroy_workspace(c_workspace);
} }
active_workspace = workspace; active_workspace = workspace;
} }