mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "backend-wayland: restructure wayland_output_resize_surface()"

Browse Source 
This reverts commit 9e1c96bce7.
This commit is contained in:
nikita tokarchuk
2024-07-20 21:36:17 +02:00
parent 996dd5caa5
commit 419d6a9cf5
1 changed files with 49 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/backend-wayland/wayland.c
+49 -39
View File
@@ -831,54 +831,64 @@ wayland_output_init_pixman_renderer(struct wayland_output *output)
static void static void
wayland_output_resize_surface(struct wayland_output *output) wayland_output_resize_surface(struct wayland_output *output)
{ {
struct wayland_backend *b = to_wayland_backend(output->base.compositor); struct wayland_backend *b =
/* Defaults for without frame: */ to_wayland_backend(output->base.compositor);
struct weston_size fb_size = { int32_t ix, iy, iwidth, iheight;
.width = output->base.current_mode->width, int32_t width, height;
.height = output->base.current_mode->height
};
struct weston_geometry area = {
.x = 0,
.y = 0,
.width = fb_size.width,
.height = fb_size.height
};
struct weston_geometry inp = area;
struct weston_geometry opa = area;
struct wl_region *region; struct wl_region *region;
width = output->base.current_mode->width;
height = output->base.current_mode->height;
if (output->frame) { if (output->frame) {
frame_resize_inside(output->frame, area.width, area.height); frame_resize_inside(output->frame, width, height);
frame_interior(output->frame, &area.x, &area.y, NULL, NULL);
fb_size.width = frame_width(output->frame);
fb_size.height = frame_height(output->frame);
frame_input_rect(output->frame, &inp.x, &inp.y, frame_input_rect(output->frame, &ix, &iy, &iwidth, &iheight);
&inp.width, &inp.height); region = wl_compositor_create_region(b->parent.compositor);
frame_opaque_rect(output->frame, &opa.x, &opa.y, wl_region_add(region, ix, iy, iwidth, iheight);
&opa.width, &opa.height); wl_surface_set_input_region(output->parent.surface, region);
wl_region_destroy(region);
if (output->parent.xdg_surface) {
xdg_surface_set_window_geometry(output->parent.xdg_surface,
ix,
iy,
iwidth,
iheight);
}
frame_opaque_rect(output->frame, &ix, &iy, &iwidth, &iheight);
region = wl_compositor_create_region(b->parent.compositor);
wl_region_add(region, ix, iy, iwidth, iheight);
wl_surface_set_opaque_region(output->parent.surface, region);
wl_region_destroy(region);
width = frame_width(output->frame);
height = frame_height(output->frame);
} else {
region = wl_compositor_create_region(b->parent.compositor);
wl_region_add(region, 0, 0, width, height);
wl_surface_set_input_region(output->parent.surface, region);
wl_region_destroy(region);
region = wl_compositor_create_region(b->parent.compositor);
wl_region_add(region, 0, 0, width, height);
wl_surface_set_opaque_region(output->parent.surface, region);
wl_region_destroy(region);
if (output->parent.xdg_surface) {
xdg_surface_set_window_geometry(output->parent.xdg_surface,
0,
0,
width,
height);
}
} }
region = wl_compositor_create_region(b->parent.compositor);
wl_region_add(region, inp.x, inp.y, inp.width, inp.height);
wl_surface_set_input_region(output->parent.surface, region);
wl_region_destroy(region);
if (output->parent.xdg_surface) {
xdg_surface_set_window_geometry(output->parent.xdg_surface,
inp.x, inp.y,
inp.width, inp.height);
}
region = wl_compositor_create_region(b->parent.compositor);
wl_region_add(region, opa.x, opa.y, opa.width, opa.height);
wl_surface_set_opaque_region(output->parent.surface, region);
wl_region_destroy(region);
#ifdef ENABLE_EGL #ifdef ENABLE_EGL
if (output->gl.egl_window) { if (output->gl.egl_window) {
wl_egl_window_resize(output->gl.egl_window, wl_egl_window_resize(output->gl.egl_window,
fb_size.width, fb_size.height, 0, 0); width, height, 0, 0);
/* These will need to be re-created due to the resize */ /* These will need to be re-created due to the resize */
gl_renderer->output_set_border(&output->base, gl_renderer->output_set_border(&output->base,