mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 03:52:22 +02:00
895f40e150
The mpv window overlapping multiple outputs with different scale values can result in some weird behavior when dragging it from one monitor to another one. This is due to the way some compositors implement preferred_scale or preferred_buffer_scale (integer scale equivalent). Depending on the scale values, mpv window has to be resized to match the new scaling value (due to fractional scaling requiring a viewport). This can cause the window to become smaller and no longer overlap the monitor you were just trying to drag it to. Repeat this and the window will become smaller and smaller. Depending on the layout, the reverse can also happen (the window becomes larger). This can cause additional events to fire as the preferred_scale value may change again which does more weird things. It seems kwin is not affected by this because their implementation of preferred_scale sends the event only if the window is fully on the new monitor. Honestly, this is probably more logical anyway but we should at least deal with the other implementations better. Try to deal with it by reworking scaling changes so they only occur when the mpv window is fully on one monitor. If we get a preferred_scale event and there is an overlap, save it as a pending change to be performed on the next surface_enter or surface_leave event (whichever results in there being only one monitor. Some weird rendering glitches can still happen during overlap but this makes it usable again.
183 lines
5.4 KiB
C
183 lines
5.4 KiB
C
/*
|
|
* This file is part of mpv video player.
|
|
*
|
|
* mpv is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* mpv is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef MPLAYER_WAYLAND_COMMON_H
|
|
#define MPLAYER_WAYLAND_COMMON_H
|
|
|
|
#include <wayland-client.h>
|
|
#include "input/event.h"
|
|
#include "vo.h"
|
|
|
|
struct vo_wayland_seat;
|
|
|
|
typedef struct {
|
|
uint32_t format;
|
|
uint32_t padding;
|
|
uint64_t modifier;
|
|
} wayland_format;
|
|
|
|
struct wayland_opts {
|
|
int configure_bounds;
|
|
int content_type;
|
|
bool disable_vsync;
|
|
int edge_pixels_pointer;
|
|
int edge_pixels_touch;
|
|
};
|
|
|
|
struct vo_wayland_state {
|
|
struct m_config_cache *vo_opts_cache;
|
|
struct mp_log *log;
|
|
struct mp_vo_opts *vo_opts;
|
|
struct vo *vo;
|
|
struct wayland_opts *opts;
|
|
struct wl_callback *frame_callback;
|
|
struct wl_compositor *compositor;
|
|
struct wl_subcompositor *subcompositor;
|
|
struct wl_display *display;
|
|
struct wl_registry *registry;
|
|
struct wl_shm *shm;
|
|
struct wl_surface *surface;
|
|
struct wl_surface *osd_surface;
|
|
struct wl_subsurface *osd_subsurface;
|
|
struct wl_surface *video_surface;
|
|
struct wl_surface *callback_surface;
|
|
struct wl_subsurface *video_subsurface;
|
|
|
|
/* Geometry */
|
|
struct mp_rect geometry;
|
|
struct mp_rect window_size;
|
|
struct wl_list output_list;
|
|
struct vo_wayland_output *current_output;
|
|
int bounded_height;
|
|
int bounded_width;
|
|
int reduced_height;
|
|
int reduced_width;
|
|
|
|
/* State */
|
|
bool activated;
|
|
bool focused;
|
|
bool frame_wait;
|
|
bool geometry_configured;
|
|
bool hidden;
|
|
bool initial_size_hint;
|
|
bool locked_size;
|
|
bool need_rescale;
|
|
bool reconfigured;
|
|
bool scale_configured;
|
|
bool state_change;
|
|
bool tiled;
|
|
bool toplevel_configured;
|
|
int display_fd;
|
|
int mouse_x;
|
|
int mouse_y;
|
|
int pending_vo_events;
|
|
double pending_scaling;
|
|
double scaling;
|
|
int timeout_count;
|
|
int wakeup_pipe[2];
|
|
|
|
/* content-type */
|
|
/* TODO: unvoid these if required wayland protocols is bumped to 1.27+ */
|
|
void *content_type_manager;
|
|
void *content_type;
|
|
int current_content_type;
|
|
|
|
/* cursor-shape */
|
|
/* TODO: unvoid these if required wayland protocols is bumped to 1.32+ */
|
|
void *cursor_shape_manager;
|
|
|
|
/* fractional-scale */
|
|
/* TODO: unvoid these if required wayland protocols is bumped to 1.31+ */
|
|
void *fractional_scale_manager;
|
|
void *fractional_scale;
|
|
|
|
/* idle-inhibit */
|
|
struct zwp_idle_inhibit_manager_v1 *idle_inhibit_manager;
|
|
struct zwp_idle_inhibitor_v1 *idle_inhibitor;
|
|
|
|
/* linux-dmabuf */
|
|
struct zwp_linux_dmabuf_v1 *dmabuf;
|
|
struct zwp_linux_dmabuf_feedback_v1 *dmabuf_feedback;
|
|
wayland_format *format_map;
|
|
uint32_t format_size;
|
|
|
|
/* presentation-time */
|
|
struct wp_presentation *presentation;
|
|
struct vo_wayland_feedback_pool *fback_pool;
|
|
struct mp_present *present;
|
|
int64_t refresh_interval;
|
|
bool use_present;
|
|
|
|
/* single-pixel-buffer */
|
|
/* TODO: unvoid this if required wayland-protocols is bumped to 1.27+ */
|
|
void *single_pixel_manager;
|
|
|
|
/* xdg-decoration */
|
|
struct zxdg_decoration_manager_v1 *xdg_decoration_manager;
|
|
struct zxdg_toplevel_decoration_v1 *xdg_toplevel_decoration;
|
|
int requested_decoration;
|
|
|
|
/* xdg-shell */
|
|
struct xdg_wm_base *wm_base;
|
|
struct xdg_surface *xdg_surface;
|
|
struct xdg_toplevel *xdg_toplevel;
|
|
|
|
/* viewporter */
|
|
struct wp_viewporter *viewporter;
|
|
struct wp_viewport *viewport;
|
|
struct wp_viewport *cursor_viewport;
|
|
struct wp_viewport *osd_viewport;
|
|
struct wp_viewport *video_viewport;
|
|
|
|
/* Input */
|
|
struct wl_list seat_list;
|
|
struct xkb_context *xkb_context;
|
|
|
|
/* DND */
|
|
struct wl_data_device_manager *dnd_devman;
|
|
struct wl_data_offer *dnd_offer;
|
|
int dnd_action; // actually enum mp_dnd_action
|
|
char *dnd_mime_type;
|
|
int dnd_fd;
|
|
int dnd_mime_score;
|
|
|
|
/* Cursor */
|
|
struct wl_cursor_theme *cursor_theme;
|
|
struct wl_cursor *default_cursor;
|
|
struct wl_surface *cursor_surface;
|
|
bool cursor_visible;
|
|
int allocated_cursor_scale;
|
|
struct vo_wayland_seat *last_button_seat;
|
|
};
|
|
|
|
bool vo_wayland_check_visible(struct vo *vo);
|
|
bool vo_wayland_init(struct vo *vo);
|
|
bool vo_wayland_reconfig(struct vo *vo);
|
|
|
|
int vo_wayland_allocate_memfd(struct vo *vo, size_t size);
|
|
int vo_wayland_control(struct vo *vo, int *events, int request, void *arg);
|
|
|
|
void vo_wayland_handle_scale(struct vo_wayland_state *wl);
|
|
void vo_wayland_set_opaque_region(struct vo_wayland_state *wl, bool alpha);
|
|
void vo_wayland_sync_swap(struct vo_wayland_state *wl);
|
|
void vo_wayland_uninit(struct vo *vo);
|
|
void vo_wayland_wait_events(struct vo *vo, int64_t until_time_ns);
|
|
void vo_wayland_wait_frame(struct vo_wayland_state *wl);
|
|
void vo_wayland_wakeup(struct vo *vo);
|
|
|
|
#endif /* MPLAYER_WAYLAND_COMMON_H */
|