diff options
| author | Ryan Dwyer <RyanDwyer@users.noreply.github.com> | 2018-08-02 23:05:49 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 23:05:49 +1000 |
| commit | 706c0fbe2376e15f8140be60f3c8b0713128ebba (patch) | |
| tree | ffefcdd261970549f8b83adae8d93b6c3b9ebbbb /sway/input/seat.c | |
| parent | 26c5ef18ba295e016074c9d87affe5da44e71cb1 (diff) | |
| parent | 8e60f6a73263c444ab5fecdeacdaf7883a9b1505 (diff) | |
| download | sway-706c0fbe2376e15f8140be60f3c8b0713128ebba.tar.xz | |
Merge branch 'master' into nagbar
Diffstat (limited to 'sway/input/seat.c')
| -rw-r--r-- | sway/input/seat.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index 869560af..dd4d5c3b 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c @@ -775,8 +775,12 @@ void seat_set_focus_warp(struct sway_seat *seat, } } - if (container->type == C_VIEW) { - ipc_event_window(container, "focus"); + if (container) { + if (container->type == C_VIEW) { + ipc_event_window(container, "focus"); + } else if (container->type == C_WORKSPACE) { + ipc_event_workspace(NULL, container, "focus"); + } } seat->has_focus = (container != NULL); |