From 66391dbb642fe08fea59d4c2e3c36b69d9db7446 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 9 May 2014 21:49:25 +0200 Subject: input: fix typos, cosmetics --- input/keycodes.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/input/keycodes.h b/input/keycodes.h index ae1aa32747..9e890fc166 100644 --- a/input/keycodes.h +++ b/input/keycodes.h @@ -21,7 +21,7 @@ #ifndef MPLAYER_KEYCODES_H #define MPLAYER_KEYCODES_H -// Key in the range [0, MP_KEY_BASE) follow unicode. +// Keys in the range [0, MP_KEY_BASE) follow unicode. // Special keys come after this. #define MP_KEY_BASE (1<<21) @@ -222,14 +222,14 @@ (MP_KEY_IS_MOUSE_BTN_SINGLE(code) || MP_KEY_IS_MOUSE_BTN_DBL(code) || \ (code) == MP_KEY_MOUSE_MOVE) -// Emit a command even on key-up (normally key-up is ignored). The command -// handling code has to ignore unwanted commands specifically. -// This is static part of the keycode, not a modifier than can change. +// Emit a command even on key-up (normally key-up is ignored). This means by +// default they binding will be triggered on key-up instead of key-down. +// This is a fixed part of the keycode, not a modifier than can change. #define MP_KEY_EMIT_ON_UP (1<<22) // Use this when the key shouldn't be auto-repeated (like mouse buttons) // Also means both key-down key-up events produce emit bound commands. -// This is static part of the keycode, not a modifier than can change. +// This is a fixed part of the keycode, not a modifier than can change. #define MP_NO_REPEAT_KEY (1<<23) /* Modifiers added to individual keys */ @@ -238,21 +238,21 @@ #define MP_KEY_MODIFIER_ALT (1<<26) #define MP_KEY_MODIFIER_META (1<<27) -#define MP_KEY_MODIFIER_MASK (MP_KEY_MODIFIER_SHIFT | MP_KEY_MODIFIER_CTRL | \ - MP_KEY_MODIFIER_ALT | MP_KEY_MODIFIER_META | \ - MP_KEY_STATE_DOWN | MP_KEY_STATE_UP) - // Flag for key events. Multiple down events are idempotent. Release keys by // sending the key code with KEY_STATE_UP set, or by sending // MP_INPUT_RELEASE_ALL as key code. #define MP_KEY_STATE_DOWN (1<<28) // Flag for key events. Releases a key previously held down with -// MP_KEY_STATE_DOWN. Do not sending redundant UP events and do not forget to +// MP_KEY_STATE_DOWN. Do not send redundant UP events and do not forget to // release keys at all with UP. If input is unreliable, use MP_INPUT_RELEASE_ALL // or don't use MP_KEY_STATE_DOWN in the first place. #define MP_KEY_STATE_UP (1<<29) +#define MP_KEY_MODIFIER_MASK (MP_KEY_MODIFIER_SHIFT | MP_KEY_MODIFIER_CTRL | \ + MP_KEY_MODIFIER_ALT | MP_KEY_MODIFIER_META | \ + MP_KEY_STATE_DOWN | MP_KEY_STATE_UP) + // Get input key from its name. int mp_input_get_key_from_name(const char *name); -- cgit v1.2.3