mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2026-04-04 07:15:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to wlroots 0.6.0

Browse source
This commit is contained in:
Drew DeVault 2019-04-25 11:40:25 -04:00 • committed by Jente Hidskes
parent 887c855a3b
commit 9354781f32
2 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
output.c
View file

@ -198,23 +198,23 @@ handle_output_damage_frame(struct wl_listener *listener, void *data)
struct timespec now; struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
bool needs_swap; bool needs_frame;
pixman_region32_t damage; pixman_region32_t damage;
pixman_region32_init(&damage); pixman_region32_init(&damage);
if (!wlr_output_damage_make_current(output->damage, &needs_swap, &damage)) { if (!wlr_output_damage_attach_render(output->damage, &needs_frame, &damage)) {
wlr_log(WLR_ERROR, "Cannot make damage output current"); wlr_log(WLR_ERROR, "Cannot make damage output current");
goto damage_finish; goto damage_finish;
} }
if (!needs_swap) { if (!needs_frame) {
wlr_log(WLR_DEBUG, "Output doesn't need swap and isn't damaged"); wlr_log(WLR_DEBUG, "Output doesn't need frame and isn't damaged");
goto damage_finish; goto damage_finish;
} }
wlr_renderer_begin(renderer, output->wlr_output->width, output->wlr_output->height); wlr_renderer_begin(renderer, output->wlr_output->width, output->wlr_output->height);
if (!pixman_region32_not_empty(&damage)) { if (!pixman_region32_not_empty(&damage)) {
wlr_log(WLR_DEBUG, "Output isn't damaged but needs a buffer swap"); wlr_log(WLR_DEBUG, "Output isn't damaged but needs a buffer frame");
goto renderer_end; goto renderer_end;
} }
@ -267,8 +267,9 @@ handle_output_damage_frame(struct wl_listener *listener, void *data)
enum wl_output_transform transform = wlr_output_transform_invert(output->wlr_output->transform); enum wl_output_transform transform = wlr_output_transform_invert(output->wlr_output->transform);
wlr_region_transform(&damage, &damage, transform, output_width, output_height); wlr_region_transform(&damage, &damage, transform, output_width, output_height);
if (!wlr_output_damage_swap_buffers(output->damage, &now, &damage)) { wlr_output_set_damage(output->wlr_output, &damage);
wlr_log(WLR_ERROR, "Could not swap buffers"); if (!wlr_output_commit(output->wlr_output)) {
wlr_log(WLR_ERROR, "Could not commit output");
} }
damage_finish: damage_finish:

12
xdg_shell.c
View file

@ -94,15 +94,15 @@ popup_unconstrain(struct cg_xdg_popup *popup)
{ {
struct cg_view *view = popup->view_child.view; struct cg_view *view = popup->view_child.view;
struct wlr_output *output = view->server->output->wlr_output; struct wlr_output *output = view->server->output->wlr_output;
struct wlr_output_layout *output_layout = view->server->output_layout;
int width, height; struct wlr_box *output_box = wlr_output_layout_get_box(output_layout, output);
wlr_output_effective_resolution(output, &width, &height);
struct wlr_box output_toplevel_box = { struct wlr_box output_toplevel_box = {
.x = output->lx - view->x, .x = output_box->x - view->x,
.y = output->ly - view->y, .y = output_box->y - view->y,
.width = width, .width = output_box->width,
.height = height .height = output_box->height
}; };
wlr_xdg_popup_unconstrain_from_box(popup->wlr_popup, &output_toplevel_box); wlr_xdg_popup_unconstrain_from_box(popup->wlr_popup, &output_toplevel_box);