mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 00:16:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:SirCmpwn/sway

Browse source
This commit is contained in:
Drew DeVault 2015-08-15 16:53:53 -04:00
commit 976e1b1c71
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sway/workspace.c
View file

@ -94,12 +94,12 @@ swayc_t *workspace_find_by_name(const char* name) {
} }
void workspace_switch(swayc_t *workspace) { void workspace_switch(swayc_t *workspace) {
swayc_t *parent = workspace->parent; swayc_t *ws_output = workspace->parent;
while (parent->type != C_OUTPUT) { while (ws_output->type != C_OUTPUT) {
parent = parent->parent; ws_output = ws_output->parent;
} }
// The current workspace of the output our target workspace is in // The current workspace of the output our target workspace is in
swayc_t *focused_workspace = parent->focused; swayc_t *focused_workspace = ws_output->focused;
if (workspace != focused_workspace && focused_workspace) { if (workspace != focused_workspace && focused_workspace) {
sway_log(L_DEBUG, "workspace: changing from '%s' to '%s'", focused_workspace->name, workspace->name); sway_log(L_DEBUG, "workspace: changing from '%s' to '%s'", focused_workspace->name, workspace->name);
uint32_t mask = 1; uint32_t mask = 1;
@ -109,7 +109,7 @@ void workspace_switch(swayc_t *workspace) {
container_map(focused_workspace, set_mask, &mask); container_map(focused_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(ws_output->handle, 2);
destroy_workspace(focused_workspace); destroy_workspace(focused_workspace);
} }