From fae9d7744c973ca3e39ff4bad0fda886b6a850b1 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 5 May 2018 20:41:45 +0200 Subject: input: move an enum back to its correct place This was accidentally moved together with the cmd stuff. --- input/cmd.h | 13 ------------- input/input.h | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'input') diff --git a/input/cmd.h b/input/cmd.h index a985d0394c..7fc3ee63c5 100644 --- a/input/cmd.h +++ b/input/cmd.h @@ -57,19 +57,6 @@ enum mp_cmd_flags { MP_ON_OSD_BAR | MP_ON_OSD_MSG, }; -enum mp_input_section_flags { - // If a key binding is not defined in the current section, do not search the - // other sections for it (like the default section). Instead, an unbound - // key warning will be printed. - MP_INPUT_EXCLUSIVE = 1, - // Prefer it to other sections. - MP_INPUT_ON_TOP = 2, - // Let mp_input_test_dragging() return true, even if inside the mouse area. - MP_INPUT_ALLOW_VO_DRAGGING = 4, - // Don't force mouse pointer visible, even if inside the mouse area. - MP_INPUT_ALLOW_HIDE_CURSOR = 8, -}; - // Arbitrary upper bound for sanity. #define MP_CMD_MAX_ARGS 100 diff --git a/input/input.h b/input/input.h index 6322eb88db..1641f9fad6 100644 --- a/input/input.h +++ b/input/input.h @@ -47,6 +47,19 @@ struct mp_input_src { void *priv; }; +enum mp_input_section_flags { + // If a key binding is not defined in the current section, do not search the + // other sections for it (like the default section). Instead, an unbound + // key warning will be printed. + MP_INPUT_EXCLUSIVE = 1, + // Prefer it to other sections. + MP_INPUT_ON_TOP = 2, + // Let mp_input_test_dragging() return true, even if inside the mouse area. + MP_INPUT_ALLOW_VO_DRAGGING = 4, + // Don't force mouse pointer visible, even if inside the mouse area. + MP_INPUT_ALLOW_HIDE_CURSOR = 8, +}; + // Add an input source that runs on a thread. The source is automatically // removed if the thread loop exits. // ctx: this is passed to loop_fn. -- cgit v1.2.3