mirror of
https://github.com/mpv-player/mpv
synced 2024-12-22 14:52:43 +00:00
c4b08a9a11
There was a MPOpts fullscreen field, a mp_vo_opts.fs field, and
VOFLAG_FULLSCREEN. Remove all these and introduce a
mp_vo_opts.fullscreen flag instead.
When VOs receive VOCTRL_FULLSCREEN, they are supposed to set the
current fullscreen mode to the state in mp_vo_opts.fullscreen. They
also should do this implicitly on config().
VOs which are capable of doing so can update the mp_vo_opts.fullscreen
if the actual fullscreen mode changes (e.g. if the user uses the
window manager controls). If fullscreen mode switching fails, they
can also set mp_vo_opts.fullscreen to the actual state.
Note that the X11 backend does almost none of this, and it has a
private fs flag to store the fullscreen flag, instead of getting it
from the WM. (Possibly because it has to deal with broken WMs.)
The fullscreen option has to be checked on config() to deal with
the -fs option, especially with something like:
mpv --fs file1.mkv --{ --no-fs file2.mkv --}
(It should start in fullscreen mode, but go to windowed mode when
playing file2.mkv.)
Wayland changes by: Alexander Preisinger <alexander.preisinger@gmail.com>
Cocoa changes by: Stefano Pigozzi <stefano.pigozzi@gmail.com>
147 lines
4.3 KiB
C
147 lines
4.3 KiB
C
/*
|
|
* This file is part of MPlayer.
|
|
*
|
|
* MPlayer 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.
|
|
*
|
|
* MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#ifndef MPLAYER_X11_COMMON_H
|
|
#define MPLAYER_X11_COMMON_H
|
|
|
|
#include <stdint.h>
|
|
#include <stdbool.h>
|
|
#include <X11/Xlib.h>
|
|
#include <X11/Xutil.h>
|
|
|
|
#include "config.h"
|
|
|
|
struct vo;
|
|
struct mp_rect;
|
|
|
|
struct vo_x11_state {
|
|
Display *display;
|
|
Window window;
|
|
Window rootwin;
|
|
int screen;
|
|
int display_is_local;
|
|
int ws_width;
|
|
int ws_height;
|
|
|
|
int screensaver_off;
|
|
int dpms_disabled;
|
|
double screensaver_time_last;
|
|
|
|
XIM xim;
|
|
XIC xic;
|
|
bool no_autorepeat;
|
|
|
|
GC f_gc; // used to paint background
|
|
GC vo_gc; // used to paint video
|
|
Colormap colormap;
|
|
|
|
int wm_type;
|
|
int fs_type;
|
|
bool window_hidden;
|
|
int fs_flip;
|
|
int fs_layer;
|
|
int fs; // whether we assume the window is in fullscreen mode
|
|
|
|
XSizeHints vo_hint;
|
|
bool mouse_cursor_hidden;
|
|
int orig_layer;
|
|
int old_gravity;
|
|
|
|
// Current actual window position (updated on window move/resize events).
|
|
int win_x;
|
|
int win_y;
|
|
unsigned int win_width;
|
|
unsigned int win_height;
|
|
|
|
int pending_vo_events;
|
|
|
|
// last non-fullscreen extends (updated on fullscreen or reinitialization)
|
|
int nofs_width;
|
|
int nofs_height;
|
|
int nofs_x;
|
|
int nofs_y;
|
|
|
|
/* 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_dwidth;
|
|
int old_dheight;
|
|
/* 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;
|
|
|
|
unsigned int olddecor;
|
|
unsigned int oldfuncs;
|
|
XComposeStatus compose_status;
|
|
|
|
int vo_gamma;
|
|
int vo_brightness;
|
|
int vo_contrast;
|
|
|
|
Colormap cmap;
|
|
XColor cols[256];
|
|
int cm_size, red_mask, green_mask, blue_mask;
|
|
|
|
/* XShm stuff */
|
|
int ShmCompletionEvent;
|
|
/* Number of outstanding XShmPutImage requests */
|
|
/* Decremented when ShmCompletionEvent is received */
|
|
/* Increment it before XShmPutImage */
|
|
int ShmCompletionWaitCount;
|
|
|
|
Atom XA_NET_SUPPORTED;
|
|
Atom XA_NET_WM_STATE;
|
|
Atom XA_NET_WM_STATE_FULLSCREEN;
|
|
Atom XA_NET_WM_STATE_ABOVE;
|
|
Atom XA_NET_WM_STATE_STAYS_ON_TOP;
|
|
Atom XA_NET_WM_STATE_BELOW;
|
|
Atom XA_NET_WM_PID;
|
|
Atom XA_NET_WM_NAME;
|
|
Atom XA_NET_WM_ICON_NAME;
|
|
Atom XA_WIN_PROTOCOLS;
|
|
Atom XA_WIN_LAYER;
|
|
Atom XA_WIN_HINTS;
|
|
Atom XAWM_PROTOCOLS;
|
|
Atom XAWM_DELETE_WINDOW;
|
|
Atom XAUTF8_STRING;
|
|
Atom XA_NET_WM_CM;
|
|
};
|
|
|
|
int vo_x11_init(struct vo *vo);
|
|
void vo_x11_uninit(struct vo *vo);
|
|
int vo_x11_check_events(struct vo *vo);
|
|
uint32_t vo_x11_set_equalizer(struct vo *vo, const char *name, int value);
|
|
uint32_t vo_x11_get_equalizer(struct vo *vo, const char *name, int *value);
|
|
bool vo_x11_screen_is_composited(struct vo *vo);
|
|
void fstype_help(void);
|
|
void vo_x11_config_vo_window(struct vo *vo, XVisualInfo *vis,
|
|
int x, int y, unsigned int width,
|
|
unsigned int height, int flags,
|
|
const char *classname);
|
|
void vo_x11_clear_background(struct vo *vo, const struct mp_rect *rc);
|
|
void vo_x11_clearwindow(struct vo *vo, Window vo_window);
|
|
int vo_x11_control(struct vo *vo, int *events, int request, void *arg);
|
|
|
|
double vo_x11_vm_get_fps(struct vo *vo);
|
|
|
|
#endif /* MPLAYER_X11_COMMON_H */
|