diff options
| author | dudemanguy <random342@airmail.cc> | 2019-12-02 09:11:06 -0600 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2019-12-04 00:47:05 +0000 |
| commit | 65a317436df05000366af2738bdbb834e95e33db (patch) | |
| tree | c57e664163e17d8acc7797015faaf2a41eb0d7e0 /options/options.c | |
| parent | fd28be400cbee01ea37aec07ea23480aae90e06b (diff) | |
| download | mpv-65a317436df05000366af2738bdbb834e95e33db.tar.bz2 mpv-65a317436df05000366af2738bdbb834e95e33db.tar.xz | |
options: move cursor autohiding opts to mp_vo_opts
Certain backends (i.e. wayland) will need to do special things with the
mouse. It makes sense to expose the values of these options to them, so
they can behave correctly.
Diffstat (limited to 'options/options.c')
| -rw-r--r-- | options/options.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/options/options.c b/options/options.c index 7cb750d81b..26aaa24c91 100644 --- a/options/options.c +++ b/options/options.c @@ -145,6 +145,9 @@ static const m_option_t mp_vo_opt_list[] = { ({"default", -1})), OPT_CHOICE_OR_INT("fs-screen", fsscreen_id, 0, 0, 32, ({"all", -2}, {"current", -1})), + OPT_CHOICE_OR_INT("cursor-autohide", cursor_autohide_delay, 0, + 0, 30000, ({"no", -1}, {"always", -2})), + OPT_FLAG("cursor-autohide-fs-only", cursor_autohide_fs, 0), OPT_FLAG("keepaspect", keepaspect, 0), OPT_FLAG("keepaspect-window", keepaspect_window, 0), OPT_FLAG("hidpi-window-scale", hidpi_window_scale, 0), @@ -176,6 +179,7 @@ const struct m_sub_options vo_sub_opts = { .screen_id = -1, .fsscreen_id = -1, .panscan = 0.0f, + .cursor_autohide_delay = 1000, .keepaspect = 1, .keepaspect_window = 1, .hidpi_window_scale = 1, @@ -589,9 +593,6 @@ static const m_option_t mp_opts[] = { OPT_CHOICE_OR_INT("video-rotate", video_rotate, UPDATE_IMGPAR, 0, 359, ({"no", -1})), - OPT_CHOICE_OR_INT("cursor-autohide", cursor_autohide_delay, 0, - 0, 30000, ({"no", -1}, {"always", -2})), - OPT_FLAG("cursor-autohide-fs-only", cursor_autohide_fs, 0), OPT_FLAG("stop-screensaver", stop_screensaver, UPDATE_SCREENSAVER), OPT_SUBSTRUCT("", video_equalizer, mp_csp_equalizer_conf, 0), @@ -909,7 +910,6 @@ static const struct MPOpts mp_default_opts = { .gapless_audio = -1, .wintitle = "${?media-title:${media-title}}${!media-title:No file} - mpv", .stop_screensaver = 1, - .cursor_autohide_delay = 1000, .video_osd = 1, .osd_level = 1, .osd_on_seek = 1, |