diff options
| author |  emersion <contact@emersion.fr> | 2018-04-02 15:24:25 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-04-02 15:24:25 -0400 |
| commit | 0c0cc79282b5ce29616893977aca629f90521988 (patch) | |
| tree | e06d46f222487c4d266c09892d1907ce80b69a66 /sway/desktop/xdg_shell_v6.c | |
| parent | Merge pull request #1690 from swaywm/i3bar-json (diff) | |
| parent | fix segfault (diff) | |
| download | sway-0c0cc79282b5ce29616893977aca629f90521988.tar.gz sway-0c0cc79282b5ce29616893977aca629f90521988.tar.zst sway-0c0cc79282b5ce29616893977aca629f90521988.zip | |
Merge pull request #1699 from acrisci/seat-fixes
Seat fixes and cleanup
Diffstat (limited to 'sway/desktop/xdg_shell_v6.c')
| -rw-r--r-- | sway/desktop/xdg_shell_v6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 713437f2..cffe83fb 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c | |||
| @@ -98,11 +98,11 @@ static void handle_map(struct wl_listener *listener, void *data) { | |||
| 98 | container_view_destroy(view->swayc); | 98 | container_view_destroy(view->swayc); |
| 99 | 99 | ||
| 100 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 100 | struct sway_seat *seat = input_manager_current_seat(input_manager); |
| 101 | struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container); | 101 | struct sway_container *focus = seat_get_focus_inactive(seat, &root_container); |
| 102 | struct sway_container *cont = container_view_create(focus, view); | 102 | struct sway_container *cont = container_view_create(focus, view); |
| 103 | view->swayc = cont; | 103 | view->swayc = cont; |
| 104 | arrange_windows(cont->parent, -1, -1); | 104 | arrange_windows(cont->parent, -1, -1); |
| 105 | sway_input_manager_set_focus(input_manager, cont); | 105 | input_manager_set_focus(input_manager, cont); |
| 106 | 106 | ||
| 107 | view_damage_whole(sway_surface->view); | 107 | view_damage_whole(sway_surface->view); |
| 108 | } | 108 | } |