From 2b851c6ed3de92c22837d44f16e7033e926b72e9 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 15 Nov 2012 18:59:41 +0100 Subject: options: rename --cursor-autohide, replace magic number values --cursor-autohide-delay=-2 becomes --cursor-autohide=always --cursor-autohide-delay=-1 becomes --cursor-autohide=no --cursor-autohide-delay=123 becomes --cursor-autohide=123 --- DOCS/man/en/changes.rst | 1 + DOCS/man/en/options.rst | 4 ++-- core/cfg-mplayer.h | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index 53d9179e6d..5de62fe601 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -107,6 +107,7 @@ Command line switches -xineramascreen --screen (different values) -ss --start -endpos --length + --cursor-autohide-delay --cursor-autohide =================================== =================================== input.conf and slave commands diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 97171a8c42..8dd852e6a8 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -448,9 +448,9 @@ off by some frames. This option does not work correctly with some demuxers and codecs. ---cursor-autohide-delay= +--cursor-autohide= Make mouse cursor automatically hide after given number of milliseconds. - A value of -1 will disable cursor autohide. A value of -2 means the cursor + ``no`` will disable cursor autohide. ``always`` means the cursor will stay hidden. Supported by video output drivers which use X11 or OS X Cocoa. diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index a83c16d271..b5b15df0d1 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -621,7 +621,8 @@ const m_option_t mplayer_opts[]={ {"full", MP_CSP_LEVELS_PC})), {"grabpointer", &vo_grabpointer, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - OPT_INTRANGE("cursor-autohide-delay", cursor_autohide_delay, 0, -2, 30000), + OPT_CHOICE_OR_INT("cursor-autohide", cursor_autohide_delay, 0, + 0, 30000, ({"no", -1}, {"always", -2})), {"refreshrate",&vo_refresh_rate,CONF_TYPE_INT,CONF_RANGE, 0,100, NULL}, {"wid", &WinID, CONF_TYPE_INT64, 0, 0, 0, NULL}, -- cgit v1.2.3