mirror of
https://github.com/mpv-player/mpv
synced 2024-11-18 21:16:10 +01:00
7c5f41ff5f
This gets rid of an old hack, VOFLAG_HIDDEN. Although handling of it has been sane for a while, it used to cause much pain, and is still unintuitive and weird even today. The main reason for this hack is that OpenGL selects a X11 Visual for you, and you're supposed to use this Visual when creating the X window for the OpenGL context. Which means the X window can't be created early in the common X11 init code, but the OpenGL code needs to do something before that. API-wise you need separate functions for X11 init and X11 window creation. The VOFLAG_HIDDEN hack conflated window creation and the entrypoint for resizing on video resolution change into one function, vo_x11_config_vo_window(). This required all platform backends to handle this flag, even if they didn't need this mechanism. Wayland still uses this for minor reasons (alpha support?), so the wayland backend must be changed before the flag can be entirely removed.
134 lines
3.7 KiB
C
134 lines
3.7 KiB
C
/*
|
|
* This file is part of mpv.
|
|
*
|
|
* mpv is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with mpv. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef MPLAYER_X11_COMMON_H
|
|
#define MPLAYER_X11_COMMON_H
|
|
|
|
#include <stdint.h>
|
|
#include <stdbool.h>
|
|
#include <pthread.h>
|
|
#include <X11/Xlib.h>
|
|
#include <X11/Xutil.h>
|
|
|
|
#include "osdep/atomics.h"
|
|
#include "osdep/semaphore.h"
|
|
|
|
#include "common/common.h"
|
|
|
|
struct vo;
|
|
struct mp_log;
|
|
|
|
#define MAX_DISPLAYS 32 // ought to be enough for everyone
|
|
|
|
struct xrandr_display {
|
|
struct mp_rect rc;
|
|
double fps;
|
|
char *name;
|
|
bool overlaps;
|
|
};
|
|
|
|
struct vo_x11_state {
|
|
struct mp_log *log;
|
|
Display *display;
|
|
Window window;
|
|
Window rootwin;
|
|
Window parent; // embedded in this foreign window
|
|
int screen;
|
|
int display_is_local;
|
|
int ws_width;
|
|
int ws_height;
|
|
struct mp_rect screenrc;
|
|
|
|
struct xrandr_display displays[MAX_DISPLAYS];
|
|
int num_displays;
|
|
|
|
int xrandr_event;
|
|
|
|
bool screensaver_enabled;
|
|
bool dpms_touched;
|
|
double screensaver_time_last;
|
|
pthread_t screensaver_thread;
|
|
bool screensaver_thread_running;
|
|
sem_t screensaver_sem;
|
|
atomic_bool screensaver_terminate;
|
|
|
|
XIM xim;
|
|
XIC xic;
|
|
bool no_autorepeat;
|
|
|
|
Colormap colormap;
|
|
|
|
int wm_type;
|
|
bool window_hidden; // the window was mapped at least once
|
|
bool pseudo_mapped; // not necessarily mapped, but known window size
|
|
int fs; // whether we assume the window is in fullscreen mode
|
|
|
|
bool mouse_cursor_hidden;
|
|
long orig_layer;
|
|
|
|
// Current actual window position (updated on window move/resize events).
|
|
struct mp_rect winrc;
|
|
double current_display_fps;
|
|
|
|
int pending_vo_events;
|
|
|
|
// last non-fullscreen extends (updated on fullscreen or reinitialization)
|
|
struct mp_rect nofsrc;
|
|
|
|
/* Keep track of original video width/height to determine when to
|
|
* resize window when reconfiguring. Resize window when video size
|
|
* changes, but don't force window size changes as long as video size
|
|
* stays the same (even if that size is different from the current
|
|
* window size after the user modified the latter). */
|
|
int old_dw, old_dh;
|
|
/* Video size changed during fullscreen when we couldn't tell the new
|
|
* size to the window manager. Must set window size when turning
|
|
* fullscreen off. */
|
|
bool size_changed_during_fs;
|
|
bool pos_changed_during_fs;
|
|
|
|
XComposeStatus compose_status;
|
|
|
|
/* XShm stuff */
|
|
int ShmCompletionEvent;
|
|
/* Number of outstanding XShmPutImage requests */
|
|
/* Decremented when ShmCompletionEvent is received */
|
|
/* Increment it before XShmPutImage */
|
|
int ShmCompletionWaitCount;
|
|
|
|
/* drag and drop */
|
|
Atom dnd_requested_format;
|
|
Atom dnd_requested_action;
|
|
Window dnd_src_window;
|
|
|
|
/* dragging the window */
|
|
bool win_drag_button1_down;
|
|
|
|
Atom icc_profile_property;
|
|
};
|
|
|
|
int vo_x11_init(struct vo *vo);
|
|
void vo_x11_uninit(struct vo *vo);
|
|
int vo_x11_check_events(struct vo *vo);
|
|
bool vo_x11_screen_is_composited(struct vo *vo);
|
|
bool vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis,
|
|
const char *classname);
|
|
void vo_x11_config_vo_window(struct vo *vo);
|
|
int vo_x11_control(struct vo *vo, int *events, int request, void *arg);
|
|
|
|
#endif /* MPLAYER_X11_COMMON_H */
|