input: move an enum back to its correct place

This was accidentally moved together with the cmd stuff.

wm4 committed 8 years ago

Commit 383da1b1 parent dc005662 files · +13 −13Browse files

Showing the changes to input (2 of 2 files). Show all

Unified · Split

2 files

@@ -57,19 +57,6 @@ enum mp_cmd_flags { · 56 unmodified lines
57	MP_ON_OSD_BAR \| MP_ON_OSD_MSG,	57	MP_ON_OSD_BAR \| MP_ON_OSD_MSG,
58	};	58	};
59		59
60	enum mp_input_section_flags {
61	// If a key binding is not defined in the current section, do not search the
62	// other sections for it (like the default section). Instead, an unbound
63	// key warning will be printed.
64	MP_INPUT_EXCLUSIVE = 1,
65	// Prefer it to other sections.
66	MP_INPUT_ON_TOP = 2,
67	// Let mp_input_test_dragging() return true, even if inside the mouse area.
68	MP_INPUT_ALLOW_VO_DRAGGING = 4,
69	// Don't force mouse pointer visible, even if inside the mouse area.
70	MP_INPUT_ALLOW_HIDE_CURSOR = 8,
71	};
72
73	// Arbitrary upper bound for sanity.	60	// Arbitrary upper bound for sanity.
74	#define MP_CMD_MAX_ARGS 100	61	#define MP_CMD_MAX_ARGS 100
75		62

@@ -47,6 +47,19 @@ struct mp_input_src { · 46 unmodified lines
47	void *priv;	47	void *priv;
48	};	48	};
49		49
		50	enum mp_input_section_flags {
		51	// If a key binding is not defined in the current section, do not search the
		52	// other sections for it (like the default section). Instead, an unbound
		53	// key warning will be printed.
		54	MP_INPUT_EXCLUSIVE = 1,
		55	// Prefer it to other sections.
		56	MP_INPUT_ON_TOP = 2,
		57	// Let mp_input_test_dragging() return true, even if inside the mouse area.
		58	MP_INPUT_ALLOW_VO_DRAGGING = 4,
		59	// Don't force mouse pointer visible, even if inside the mouse area.
		60	MP_INPUT_ALLOW_HIDE_CURSOR = 8,
		61	};
		62
50	// Add an input source that runs on a thread. The source is automatically	63	// Add an input source that runs on a thread. The source is automatically
51	// removed if the thread loop exits.	64	// removed if the thread loop exits.
52	// ctx: this is passed to loop_fn.	65	// ctx: this is passed to loop_fn.

Keyboard shortcuts