diff options
| -rw-r--r-- | DOCS/man/en/changes.rst | 1 | ||||
| -rw-r--r-- | DOCS/man/en/options.rst | 14 | ||||
| -rw-r--r-- | core/cfg-mplayer.h | 3 | ||||
| -rw-r--r-- | core/m_option.h | 1 |
4 files changed, 10 insertions, 9 deletions
diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index ac36feda21..71d788a044 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -104,6 +104,7 @@ Command line switches -forcedsubsonly --sub-forced-only -ni --avi-ni -benchmark --untimed (no stats) + -xineramascreen --screen (different values) =================================== =================================== input.conf and slave commands diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index c3e970a1e5..e4ecf1e6ee 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -694,8 +694,8 @@ border". If an external window is specified using the ``--wid`` option, then the x and y coordinates are relative to the top-left corner of the window rather than the screen. The coordinates are relative to the screen - given with ``--xineramascreen`` for the video output drivers that fully - support ``--xineramascreen`` (direct3d, gl, vdpau, x11, xv, corevideo). + given with ``--screen`` for the video output drivers that fully + support ``--screen``. *NOTE*: May not be supported by some of the older VO drivers. @@ -2151,19 +2151,17 @@ Scale image to width <width> (if software/hardware scaling is available). Disables aspect calculations. ---xineramascreen=<-2-...> - In Xinerama configurations (i.e. a single desktop that spans across +--screen=<all|current|0-32> + In multi-monitor configurations (i.e. a single desktop that spans across multiple displays) this option tells mpv which screen to display the - movie on. A value of -2 means fullscreen across the whole virtual display - (in this case Xinerama information is completely ignored), -1 means + movie on. A value of ``all?? means fullscreen across the whole virtual display + (in this case system provided information is completely ignored), ``current`` means fullscreen on the display the window currently is on. The initial position set via the ``--geometry`` option is relative to the specified screen. Will usually only work with ``--fstype=-fullscreen`` or ``--fstype=none``. This option is not suitable to only set the startup screen (because it will always display on the given screen in fullscreen mode), ``--geometry`` is the best that is available for that purpose currently. - Supported by at least the direct3d, gl, x11, xv and corevideo video output - drivers. --xy=<value> diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index 5bc07c8f34..aa5e8d66de 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -636,7 +636,8 @@ const m_option_t mplayer_opts[]={ {"heartbeat-cmd", &heartbeat_cmd, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"mouseinput", &vo_nomouse_input, CONF_TYPE_FLAG, 0, 1, 0, NULL}, - {"xineramascreen", &xinerama_screen, CONF_TYPE_INT, CONF_RANGE, -2, 32, NULL}, + {"screen", &xinerama_screen, CONF_TYPE_CHOICE, CONF_RANGE, + .min = 0, .max = 32, M_CHOICES(({"all", -2}, {"current", -1}))}, OPT_INTRANGE("brightness", vo_gamma_brightness, 0, -100, 100), OPT_INTRANGE("saturation", vo_gamma_saturation, 0, -100, 100), diff --git a/core/m_option.h b/core/m_option.h index 30bd6a9ff2..7fec11895a 100644 --- a/core/m_option.h +++ b/core/m_option.h @@ -175,6 +175,7 @@ struct m_sub_options { #define CONF_TYPE_OBJ_PARAMS (&m_option_type_obj_params) #define CONF_TYPE_TIME (&m_option_type_time) #define CONF_TYPE_TIME_SIZE (&m_option_type_time_size) +#define CONF_TYPE_CHOICE (&m_option_type_choice) // Possible option values. Code is allowed to access option data without going // through this union. It serves for self-documentation and to get minimal |