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

shell: Use buffer_scale as output scale on fullscreen DRIVER

Browse Source 
It may happen that you e.g. fullscreen a 800x600 surface with
buffer_scale 1 (e.g. a 800x600 buffer) on an output that is
otherwise scale 2. In this case we want to temporarily set
the output scale to 1, as we're really scanning out of a
scale 1 buffer. This causes us to e.g. report the input
positions in the right place, etc.

When we restore the original mode we also restore the original
scale.

Note that the scale change is a purely compositor internal change,
to clients it still looks like the output is scale 2.
This commit is contained in:
Alexander Larsson 2013-05-28 16:23:38 +02:00 committed by Kristian Høgsberg
parent e32c376776
commit 355748e3b5
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compositor.c
View File

@ -96,7 +96,7 @@ weston_output_transform_scale_init(struct weston_output *output,
uint32_t transform, uint32_t scale);
WL_EXPORT int
weston_output_switch_mode(struct weston_output *output, struct weston_mode *mode)
weston_output_switch_mode(struct weston_output *output, struct weston_mode *mode, int32_t scale)
{
struct weston_seat *seat;
pixman_region32_t old_output_region;
@ -109,6 +109,8 @@ weston_output_switch_mode(struct weston_output *output, struct weston_mode *mode
if (ret < 0)
return ret;
output->scale = scale;
pixman_region32_init(&old_output_region);
pixman_region32_copy(&old_output_region, &output->region);

2
src/compositor.h
View File

@ -1141,7 +1141,7 @@ void
weston_surface_destroy(struct weston_surface *surface);
int
weston_output_switch_mode(struct weston_output *output, struct weston_mode *mode);
weston_output_switch_mode(struct weston_output *output, struct weston_mode *mode, int32_t scale);
int
noop_renderer_init(struct weston_compositor *ec);

12
src/shell.c
View File

@ -1503,7 +1503,8 @@ shell_unset_fullscreen(struct shell_surface *shsurf)
if (shsurf->fullscreen.type == WL_SHELL_SURFACE_FULLSCREEN_METHOD_DRIVER &&
shell_surface_is_top_fullscreen(shsurf)) {
weston_output_switch_mode(shsurf->fullscreen_output,
shsurf->fullscreen_output->origin);
shsurf->fullscreen_output->origin,
shsurf->fullscreen_output->origin_scale);
}
shsurf->fullscreen.type = WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT;
shsurf->fullscreen.framerate = 0;
@ -1797,11 +1798,11 @@ shell_configure_fullscreen(struct shell_surface *shsurf)
case WL_SHELL_SURFACE_FULLSCREEN_METHOD_DRIVER:
if (shell_surface_is_top_fullscreen(shsurf)) {
struct weston_mode mode = {0,
surf_width,
surf_height,
surf_width * surface->buffer_scale,
surf_height * surface->buffer_scale,
shsurf->fullscreen.framerate};
if (weston_output_switch_mode(output, &mode) == 0) {
if (weston_output_switch_mode(output, &mode, surface->buffer_scale) == 0) {
weston_surface_configure(shsurf->fullscreen.black_surface,
output->x - surf_x,
output->y - surf_y,
@ -2148,7 +2149,8 @@ destroy_shell_surface(struct shell_surface *shsurf)
if (shsurf->fullscreen.type == WL_SHELL_SURFACE_FULLSCREEN_METHOD_DRIVER &&
shell_surface_is_top_fullscreen(shsurf)) {
weston_output_switch_mode(shsurf->fullscreen_output,
shsurf->fullscreen_output->origin);
shsurf->fullscreen_output->origin,
shsurf->fullscreen_output->origin_scale);
}
if (shsurf->fullscreen.black_surface)