RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

wayland: update geometry/autofit opts on runtime 

Additionally, do some cleanups in the resize/autofitting code to make
sure we don't do any wasteful VO_EVENT_RESIZE calls. Note that if
set_geometry is called, we must always perform a resize.
This commit is contained in:
Dudemanguy 2020-12-13 15:03:34 -06:00
parent df805cfc84
commit 4445ac828d
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
video/out/wayland_common.c
View File

@ -846,6 +846,8 @@ static void surface_handle_enter(void *data, struct wl_surface *wl_surface,
struct wl_output *output) struct wl_output *output)
{ {
struct vo_wayland_state *wl = data; struct vo_wayland_state *wl = data;
struct mp_rect old_output_geometry = wl->current_output->geometry;
struct mp_rect old_geometry = wl->geometry;
wl->current_output = NULL; wl->current_output = NULL;
struct vo_wayland_output *o; struct vo_wayland_output *o;
@ -857,8 +859,13 @@ static void surface_handle_enter(void *data, struct wl_surface *wl_surface,
} }
wl->current_output->has_surface = true; wl->current_output->has_surface = true;
set_geometry(wl); bool force_resize = false;
wl->window_size = wl->vdparams;
if (!mp_rect_equals(&old_output_geometry, &wl->current_output->geometry)) {
set_geometry(wl);
wl->window_size = wl->vdparams;
force_resize = true;
}
if (wl->scaling != wl->current_output->scale && wl->vo_opts->hidpi_window_scale) { if (wl->scaling != wl->current_output->scale && wl->vo_opts->hidpi_window_scale) {
double factor = (double)wl->scaling / wl->current_output->scale; double factor = (double)wl->scaling / wl->current_output->scale;
@ -866,10 +873,11 @@ static void surface_handle_enter(void *data, struct wl_surface *wl_surface,
rescale_geometry_dimensions(wl, factor); rescale_geometry_dimensions(wl, factor);
} }
if (!wl->vo_opts->fullscreen && !wl->vo_opts->window_maximized) { if (!wl->vo_opts->fullscreen && !wl->vo_opts->window_maximized)
wl->geometry = wl->window_size; wl->geometry = wl->window_size;
if (!mp_rect_equals(&old_geometry, &wl->geometry) || force_resize)
wl->pending_vo_events |= VO_EVENT_RESIZE; wl->pending_vo_events |= VO_EVENT_RESIZE;
}
MP_VERBOSE(wl, "Surface entered output %s %s (0x%x), scale = %i\n", o->make, MP_VERBOSE(wl, "Surface entered output %s %s (0x%x), scale = %i\n", o->make,
o->model, o->id, wl->scaling); o->model, o->id, wl->scaling);
@ -1600,6 +1608,15 @@ int vo_wayland_control(struct vo *vo, int *events, int request, void *arg)
set_border_decorations(wl, opts->border); set_border_decorations(wl, opts->border);
if (opt == &opts->appid) if (opt == &opts->appid)
update_app_id(wl); update_app_id(wl);
if (opt == &opts->geometry || opt == &opts->autofit ||
opt == &opts->autofit_smaller || opt == &opts->autofit_larger)
{
set_geometry(wl);
wl->window_size = wl->vdparams;
if (!wl->vo_opts->fullscreen && !wl->vo_opts->window_maximized)
wl->geometry = wl->window_size;
wl->pending_vo_events |= VO_EVENT_RESIZE;
}
} }
return VO_TRUE; return VO_TRUE;
} }