diff options
author | taiyu <taiyu.len@gmail.com> | 2015-11-02 11:28:51 -0800 |
---|---|---|
committer | taiyu <taiyu.len@gmail.com> | 2015-11-02 11:28:51 -0800 |
commit | 65d71d0a5e66ec4b8f2d2112d870e34a7dfbd2fb (patch) | |
tree | 0592959a6575057c8665d95572e2daa535e035b3 | |
parent | Merge pull request #212 from sce/mouse_warping (diff) | |
download | sway-65d71d0a5e66ec4b8f2d2112d870e34a7dfbd2fb.tar.gz sway-65d71d0a5e66ec4b8f2d2112d870e34a7dfbd2fb.tar.zst sway-65d71d0a5e66ec4b8f2d2112d870e34a7dfbd2fb.zip |
put ipc_event_workspace in update_focus
-rw-r--r-- | sway/focus.c | 3 | ||||
-rw-r--r-- | sway/workspace.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sway/focus.c b/sway/focus.c index 7f0b1599..7eebf941 100644 --- a/sway/focus.c +++ b/sway/focus.c | |||
@@ -11,7 +11,6 @@ bool locked_container_focus = false; | |||
11 | bool locked_view_focus = false; | 11 | bool locked_view_focus = false; |
12 | 12 | ||
13 | // switches parent focus to c. will switch it accordingly | 13 | // switches parent focus to c. will switch it accordingly |
14 | // TODO: Everything needs a handle, so we can set front/back position properly | ||
15 | static void update_focus(swayc_t *c) { | 14 | static void update_focus(swayc_t *c) { |
16 | // Handle if focus switches | 15 | // Handle if focus switches |
17 | swayc_t *parent = c->parent; | 16 | swayc_t *parent = c->parent; |
@@ -20,6 +19,7 @@ static void update_focus(swayc_t *c) { | |||
20 | swayc_t *prev = parent->focused; | 19 | swayc_t *prev = parent->focused; |
21 | // Set new focus | 20 | // Set new focus |
22 | parent->focused = c; | 21 | parent->focused = c; |
22 | |||
23 | switch (c->type) { | 23 | switch (c->type) { |
24 | // Shouldnt happen | 24 | // Shouldnt happen |
25 | case C_ROOT: return; | 25 | case C_ROOT: return; |
@@ -32,6 +32,7 @@ static void update_focus(swayc_t *c) { | |||
32 | // Case where workspace changes | 32 | // Case where workspace changes |
33 | case C_WORKSPACE: | 33 | case C_WORKSPACE: |
34 | if (prev) { | 34 | if (prev) { |
35 | ipc_event_workspace(prev, c); | ||
35 | // update visibility of old workspace | 36 | // update visibility of old workspace |
36 | update_visibility(prev); | 37 | update_visibility(prev); |
37 | destroy_workspace(prev); | 38 | destroy_workspace(prev); |
diff --git a/sway/workspace.c b/sway/workspace.c index 604fc8e4..55b1ffbf 100644 --- a/sway/workspace.c +++ b/sway/workspace.c | |||
@@ -223,7 +223,5 @@ bool workspace_switch(swayc_t *workspace) { | |||
223 | } | 223 | } |
224 | arrange_windows(workspace, -1, -1); | 224 | arrange_windows(workspace, -1, -1); |
225 | 225 | ||
226 | ipc_event_workspace(active_ws, workspace); | ||
227 | |||
228 | return true; | 226 | return true; |
229 | } | 227 | } |