diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2018-03-27 13:28:43 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2018-03-27 13:28:43 -0400 |
| commit | cbb2e3308e66c2e5b1852c7475e3f40a5bbdca1c (patch) | |
| tree | f4207749074a611f47ebd1a69bd0bb25923351dc /sway/desktop | |
| parent | Merge pull request #1626 from emersion/wlroots-update (diff) | |
| download | sway-cbb2e3308e66c2e5b1852c7475e3f40a5bbdca1c.tar.gz sway-cbb2e3308e66c2e5b1852c7475e3f40a5bbdca1c.tar.zst sway-cbb2e3308e66c2e5b1852c7475e3f40a5bbdca1c.zip | |
Update API to match latest wlroots
Diffstat (limited to 'sway/desktop')
| -rw-r--r-- | sway/desktop/output.c | 2 | ||||
| -rw-r--r-- | sway/desktop/xdg_shell_v6.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 96635db4..6c990c47 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
| @@ -187,7 +187,7 @@ static void output_frame_notify(struct wl_listener *listener, void *data) { | |||
| 187 | 187 | ||
| 188 | int buffer_age = -1; | 188 | int buffer_age = -1; |
| 189 | wlr_output_make_current(wlr_output, &buffer_age); | 189 | wlr_output_make_current(wlr_output, &buffer_age); |
| 190 | wlr_renderer_begin(server->renderer, wlr_output); | 190 | wlr_renderer_begin(server->renderer, wlr_output->width, wlr_output->height); |
| 191 | 191 | ||
| 192 | struct sway_seat *seat = input_manager_current_seat(input_manager); | 192 | struct sway_seat *seat = input_manager_current_seat(input_manager); |
| 193 | swayc_t *focus = sway_seat_get_focus_inactive(seat, soutput->swayc); | 193 | swayc_t *focus = sway_seat_get_focus_inactive(seat, soutput->swayc); |
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 7371b829..7b550b30 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c | |||
| @@ -63,7 +63,7 @@ static void close(struct sway_view *view) { | |||
| 63 | } | 63 | } |
| 64 | struct wlr_xdg_surface_v6 *surface = view->wlr_xdg_surface_v6; | 64 | struct wlr_xdg_surface_v6 *surface = view->wlr_xdg_surface_v6; |
| 65 | if (surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) { | 65 | if (surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) { |
| 66 | wlr_xdg_toplevel_v6_send_close(surface); | 66 | wlr_xdg_surface_v6_send_close(surface); |
| 67 | } | 67 | } |
| 68 | } | 68 | } |
| 69 | 69 | ||