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

wayland: fix check for set_surface_scaling 

We don't want to use this if we have fractional scaling or version 6 of
the wl_surface interface which has a preferred buffer scale event which
is superior to this. We were checking in the important place (surface
entrance events) but not technically in the output. So just move the
conditional to set_surface_scaling itself. Also through the VO_EVENT_DPI
in there for convenience.
This commit is contained in:
Dudemanguy 2024-02-24 18:39:22 -06:00
parent 505a08a37f
commit 7b03a2ff17
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
video/out/wayland_common.c
View File

@ -873,7 +873,6 @@ static void output_handle_done(void *data, struct wl_output *wl_output)
spawn_cursor(wl);
set_geometry(wl, false);
prepare_resize(wl, 0, 0);
wl->pending_vo_events |= VO_EVENT_DPI;
}
wl->pending_vo_events |= VO_EVENT_WIN_STATE;
@ -933,13 +932,10 @@ static void surface_handle_enter(void *data, struct wl_surface *wl_surface,
wl->current_output->has_surface = true;
bool force_resize = false;
if (!wl->fractional_scale_manager && wl_surface_get_version(wl_surface) < 6 &&
wl->scaling != wl->current_output->scale)
{
if (wl->scaling != wl->current_output->scale) {
set_surface_scaling(wl);
spawn_cursor(wl);
force_resize = true;
wl->pending_vo_events |= VO_EVENT_DPI;
}
if (!mp_rect_equals(&old_output_geometry, &wl->current_output->geometry)) {
@ -2061,12 +2057,13 @@ static int set_screensaver_inhibitor(struct vo_wayland_state *wl, int state)
static void set_surface_scaling(struct vo_wayland_state *wl)
{
if (wl->fractional_scale_manager)
if (wl->fractional_scale_manager || wl_surface_get_version(wl->surface) >= 6)
return;
double old_scale = wl->scaling;
wl->scaling = wl->current_output->scale;
rescale_geometry(wl, old_scale);
wl->pending_vo_events |= VO_EVENT_DPI;
}
static void set_window_bounds(struct vo_wayland_state *wl)