summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-02-12 01:34:04 +0100
committerwm4 <wm4@nowhere>2013-02-12 10:27:00 +0100
commit75e6584ab3b06a02be37b447c397271c0d120b01 (patch)
treebf912a16b719397df464fde4d46e6b84144a4029 /video
parent3ded26ccba9831ef4b4a2b22f2989fd9d5e72964 (diff)
downloadmpv-75e6584ab3b06a02be37b447c397271c0d120b01.tar.bz2
mpv-75e6584ab3b06a02be37b447c397271c0d120b01.tar.xz
Prefix keycode defines with MP_
Do this to reduce conflicts with <linux/input.h>, which contains some conflicting defines. This changes the meaning of MP_KEY_DOWN: KEY_DOWN is renamed to MP_KEY_DOWN (cursor down key) MP_KEY_DOWN is renamed to MP_KEY_STATE_DOWN (modifier for key down state)
Diffstat (limited to 'video')
-rw-r--r--video/out/cocoa_common.m28
-rw-r--r--video/out/osx_common.m30
-rw-r--r--video/out/vo_caca.c38
-rw-r--r--video/out/vo_sdl.c148
-rw-r--r--video/out/w32_common.c54
-rw-r--r--video/out/x11_common.c72
6 files changed, 188 insertions, 182 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 15ccaac4c6..fd8e43b18b 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -656,10 +656,10 @@ void create_menu()
- (BOOL)resignFirstResponder { return YES; }
- (BOOL)windowShouldClose:(id)sender
{
- mplayer_put_key(_vo->key_fifo, KEY_CLOSE_WIN);
+ mplayer_put_key(_vo->key_fifo, MP_KEY_CLOSE_WIN);
// We have to wait for MPlayer to handle this,
// otherwise we are in trouble if the
- // KEY_CLOSE_WIN handler is disabled
+ // MP_KEY_CLOSE_WIN handler is disabled
return NO;
}
@@ -673,7 +673,7 @@ void create_menu()
- (void)handleQuitEvent:(NSAppleEventDescriptor*)e
withReplyEvent:(NSAppleEventDescriptor*)r
{
- mplayer_put_key(_vo->key_fifo, KEY_CLOSE_WIN);
+ mplayer_put_key(_vo->key_fifo, MP_KEY_CLOSE_WIN);
}
- (void)keyDown:(NSEvent *)theEvent
@@ -689,14 +689,14 @@ void create_menu()
if (key > -1) {
if ([theEvent modifierFlags] & NSShiftKeyMask)
- key |= KEY_MODIFIER_SHIFT;
+ key |= MP_KEY_MODIFIER_SHIFT;
if ([theEvent modifierFlags] & NSControlKeyMask)
- key |= KEY_MODIFIER_CTRL;
+ key |= MP_KEY_MODIFIER_CTRL;
if (([theEvent modifierFlags] & NSLeftAlternateKeyMask) ==
NSLeftAlternateKeyMask)
- key |= KEY_MODIFIER_ALT;
+ key |= MP_KEY_MODIFIER_ALT;
if ([theEvent modifierFlags] & NSCommandKeyMask)
- key |= KEY_MODIFIER_META;
+ key |= MP_KEY_MODIFIER_META;
mplayer_put_key(_vo->key_fifo, key);
}
}
@@ -760,17 +760,17 @@ void create_menu()
static const CGFloat threshold = 10;
while (s->accumulated_scroll >= threshold) {
s->accumulated_scroll -= threshold;
- mplayer_put_key(_vo->key_fifo, MOUSE_BTN3);
+ mplayer_put_key(_vo->key_fifo, MP_MOUSE_BTN3);
}
while (s->accumulated_scroll <= -threshold) {
s->accumulated_scroll += threshold;
- mplayer_put_key(_vo->key_fifo, MOUSE_BTN4);
+ mplayer_put_key(_vo->key_fifo, MP_MOUSE_BTN4);
}
} else {
if (delta > 0)
- mplayer_put_key(_vo->key_fifo, MOUSE_BTN3);
+ mplayer_put_key(_vo->key_fifo, MP_MOUSE_BTN3);
else
- mplayer_put_key(_vo->key_fifo, MOUSE_BTN4);
+ mplayer_put_key(_vo->key_fifo, MP_MOUSE_BTN4);
}
}
@@ -786,17 +786,17 @@ void create_menu()
case NSRightMouseDown:
case NSOtherMouseDown:
mplayer_put_key(_vo->key_fifo,
- (MOUSE_BTN0 + buttonNumber) | MP_KEY_DOWN);
+ (MP_MOUSE_BTN0 + buttonNumber) | MP_KEY_STATE_DOWN);
// Looks like Cocoa doesn't create MouseUp events when we are
// doing the second click in a double click. Put in the key_fifo
// the key that would be put from the MouseUp handling code.
if([theEvent clickCount] == 2)
- mplayer_put_key(_vo->key_fifo, MOUSE_BTN0 + buttonNumber);
+ mplayer_put_key(_vo->key_fifo, MP_MOUSE_BTN0 + buttonNumber);
break;
case NSLeftMouseUp:
case NSRightMouseUp:
case NSOtherMouseUp:
- mplayer_put_key(_vo->key_fifo, MOUSE_BTN0 + buttonNumber);
+ mplayer_put_key(_vo->key_fifo, MP_MOUSE_BTN0 + buttonNumber);
break;
}
}
diff --git a/video/out/osx_common.m b/video/out/osx_common.m
index 38b3868f2c..93281ecb6e 100644
--- a/video/out/osx_common.m
+++ b/video/out/osx_common.m
@@ -79,30 +79,30 @@
static const struct mp_keymap keymap[] = {
// special keys
- {0x34, KEY_ENTER}, // Enter key on some iBooks?
- {kVK_Return, KEY_ENTER},
- {kVK_Escape, KEY_ESC},
- {kVK_Delete, KEY_BACKSPACE}, {kVK_Option, KEY_BACKSPACE}, {kVK_Control, KEY_BACKSPACE}, {kVK_Shift, KEY_BACKSPACE},
- {kVK_Tab, KEY_TAB},
+ {0x34, MP_KEY_ENTER}, // Enter key on some iBooks?
+ {kVK_Return, MP_KEY_ENTER},
+ {kVK_Escape, MP_KEY_ESC},
+ {kVK_Delete, MP_KEY_BACKSPACE}, {kVK_Option, MP_KEY_BACKSPACE}, {kVK_Control, MP_KEY_BACKSPACE}, {kVK_Shift, MP_KEY_BACKSPACE},
+ {kVK_Tab, MP_KEY_TAB},
// cursor keys
- {kVK_UpArrow, KEY_UP}, {kVK_DownArrow, KEY_DOWN}, {kVK_LeftArrow, KEY_LEFT}, {kVK_RightArrow, KEY_RIGHT},
+ {kVK_UpArrow, MP_KEY_UP}, {kVK_DownArrow, MP_KEY_DOWN}, {kVK_LeftArrow, MP_KEY_LEFT}, {kVK_RightArrow, MP_KEY_RIGHT},
// navigation block
- {kVK_Help, KEY_INSERT}, {kVK_ForwardDelete, KEY_DELETE}, {kVK_Home, KEY_HOME},
- {kVK_End, KEY_END}, {kVK_PageUp, KEY_PAGE_UP}, {kVK_PageDown, KEY_PAGE_DOWN},
+ {kVK_Help, MP_KEY_INSERT}, {kVK_ForwardDelete, MP_KEY_DELETE}, {kVK_Home, MP_KEY_HOME},
+ {kVK_End, MP_KEY_END}, {kVK_PageUp, MP_KEY_PAGE_UP}, {kVK_PageDown, MP_KEY_PAGE_DOWN},
// F-keys
- {kVK_F1, KEY_F + 1}, {kVK_F2, KEY_F + 2}, {kVK_F3, KEY_F + 3}, {kVK_F4, KEY_F + 4},
- {kVK_F5, KEY_F + 5}, {kVK_F6, KEY_F + 6}, {kVK_F7, KEY_F + 7}, {kVK_F8, KEY_F + 8},
- {kVK_F9, KEY_F + 9}, {kVK_F10, KEY_F + 10}, {kVK_F11, KEY_F + 11}, {kVK_F12, KEY_F + 12},
+ {kVK_F1, MP_KEY_F + 1}, {kVK_F2, MP_KEY_F + 2}, {kVK_F3, MP_KEY_F + 3}, {kVK_F4, MP_KEY_F + 4},
+ {kVK_F5, MP_KEY_F + 5}, {kVK_F6, MP_KEY_F + 6}, {kVK_F7, MP_KEY_F + 7}, {kVK_F8, MP_KEY_F + 8},
+ {kVK_F9, MP_KEY_F + 9}, {kVK_F10, MP_KEY_F + 10}, {kVK_F11, MP_KEY_F + 11}, {kVK_F12, MP_KEY_F + 12},
// numpad
{kVK_ANSI_KeypadPlus, '+'}, {kVK_ANSI_KeypadMinus, '-'}, {kVK_ANSI_KeypadMultiply, '*'},
- {kVK_ANSI_KeypadDivide, '/'}, {kVK_ANSI_KeypadEnter, KEY_KPENTER}, {kVK_ANSI_KeypadDecimal, KEY_KPDEC},
- {kVK_ANSI_Keypad0, KEY_KP0}, {kVK_ANSI_Keypad1, KEY_KP1}, {kVK_ANSI_Keypad2, KEY_KP2}, {kVK_ANSI_Keypad3, KEY_KP3},
- {kVK_ANSI_Keypad4, KEY_KP4}, {kVK_ANSI_Keypad5, KEY_KP5}, {kVK_ANSI_Keypad6, KEY_KP6}, {kVK_ANSI_Keypad7, KEY_KP7},
- {kVK_ANSI_Keypad8, KEY_KP8}, {kVK_ANSI_Keypad9, KEY_KP9},
+ {kVK_ANSI_KeypadDivide, '/'}, {kVK_ANSI_KeypadEnter, MP_KEY_KPENTER}, {kVK_ANSI_KeypadDecimal, MP_KEY_KPDEC},
+ {kVK_ANSI_Keypad0, MP_KEY_KP0}, {kVK_ANSI_Keypad1, MP_KEY_KP1}, {kVK_ANSI_Keypad2, MP_KEY_KP2}, {kVK_ANSI_Keypad3, MP_KEY_KP3},
+ {kVK_ANSI_Keypad4, MP_KEY_KP4}, {kVK_ANSI_Keypad5, MP_KEY_KP5}, {kVK_ANSI_Keypad6, MP_KEY_KP6}, {kVK_ANSI_Keypad7, MP_KEY_KP7},
+ {kVK_ANSI_Keypad8, MP_KEY_KP8}, {kVK_ANSI_Keypad9, MP_KEY_KP9},
{0, 0}
};
diff --git a/video/out/vo_caca.c b/video/out/vo_caca.c
index a334b4ab02..0a61889d7d 100644
--- a/video/out/vo_caca.c
+++ b/video/out/vo_caca.c
@@ -212,22 +212,22 @@ static void set_next_str(const char * const *list, const char **str,
}
static const struct mp_keymap keysym_map[] = {
- {CACA_KEY_RETURN, KEY_ENTER}, {CACA_KEY_ESCAPE, KEY_ESC},
- {CACA_KEY_UP, KEY_DOWN}, {CACA_KEY_DOWN, KEY_DOWN},
- {CACA_KEY_LEFT, KEY_LEFT}, {CACA_KEY_RIGHT, KEY_RIGHT},
- {CACA_KEY_PAGEUP, KEY_PAGE_UP}, {CACA_KEY_PAGEDOWN, KEY_PAGE_DOWN},
- {CACA_KEY_HOME, KEY_HOME}, {CACA_KEY_END, KEY_END},
- {CACA_KEY_INSERT, KEY_INSERT}, {CACA_KEY_DELETE, KEY_DELETE},
- {CACA_KEY_BACKSPACE, KEY_BACKSPACE}, {CACA_KEY_TAB, KEY_TAB},
- {CACA_KEY_PAUSE, KEY_PAUSE},
- {CACA_KEY_F1, KEY_F+1}, {CACA_KEY_F2, KEY_F+2},
- {CACA_KEY_F3, KEY_F+3}, {CACA_KEY_F4, KEY_F+4},
- {CACA_KEY_F5, KEY_F+5}, {CACA_KEY_F6, KEY_F+6},
- {CACA_KEY_F7, KEY_F+7}, {CACA_KEY_F8, KEY_F+8},
- {CACA_KEY_F9, KEY_F+9}, {CACA_KEY_F10, KEY_F+10},
- {CACA_KEY_F11, KEY_F+11}, {CACA_KEY_F12, KEY_F+12},
- {CACA_KEY_F13, KEY_F+13}, {CACA_KEY_F14, KEY_F+14},
- {CACA_KEY_F15, KEY_F+15},
+ {CACA_KEY_RETURN, MP_KEY_ENTER}, {CACA_KEY_ESCAPE, MP_KEY_ESC},
+ {CACA_KEY_UP, MP_KEY_UP}, {CACA_KEY_DOWN, MP_KEY_DOWN},
+ {CACA_KEY_LEFT, MP_KEY_LEFT}, {CACA_KEY_RIGHT, MP_KEY_RIGHT},
+ {CACA_KEY_PAGEUP, MP_KEY_PAGE_UP}, {CACA_KEY_PAGEDOWN, MP_KEY_PAGE_DOWN},
+ {CACA_KEY_HOME, MP_KEY_HOME}, {CACA_KEY_END, MP_KEY_END},
+ {CACA_KEY_INSERT, MP_KEY_INSERT}, {CACA_KEY_DELETE, MP_KEY_DELETE},
+ {CACA_KEY_BACKSPACE, MP_KEY_BACKSPACE}, {CACA_KEY_TAB, MP_KEY_TAB},
+ {CACA_KEY_PAUSE, MP_KEY_PAUSE},
+ {CACA_KEY_F1, MP_KEY_F+1}, {CACA_KEY_F2, MP_KEY_F+2},
+ {CACA_KEY_F3, MP_KEY_F+3}, {CACA_KEY_F4, MP_KEY_F+4},
+ {CACA_KEY_F5, MP_KEY_F+5}, {CACA_KEY_F6, MP_KEY_F+6},
+ {CACA_KEY_F7, MP_KEY_F+7}, {CACA_KEY_F8, MP_KEY_F+8},
+ {CACA_KEY_F9, MP_KEY_F+9}, {CACA_KEY_F10, MP_KEY_F+10},
+ {CACA_KEY_F11, MP_KEY_F+11}, {CACA_KEY_F12, MP_KEY_F+12},
+ {CACA_KEY_F13, MP_KEY_F+13}, {CACA_KEY_F14, MP_KEY_F+14},
+ {CACA_KEY_F15, MP_KEY_F+15},
{0, 0}
};
@@ -242,7 +242,7 @@ static void check_events(struct vo *vo)
resize();
break;
case CACA_EVENT_QUIT:
- mplayer_put_key(vo->key_fifo, KEY_CLOSE_WIN);
+ mplayer_put_key(vo->key_fifo, MP_KEY_CLOSE_WIN);
break;
case CACA_EVENT_MOUSE_MOTION:
vo_mouse_movement(vo, cev.data.mouse.x, cev.data.mouse.y);
@@ -250,12 +250,12 @@ static void check_events(struct vo *vo)
case CACA_EVENT_MOUSE_PRESS:
if (!vo_nomouse_input)
mplayer_put_key(vo->key_fifo,
- (MOUSE_BTN0 + cev.data.mouse.button - 1) | MP_KEY_DOWN);
+ (MP_MOUSE_BTN0 + cev.data.mouse.button - 1) | MP_KEY_STATE_DOWN);
break;
case CACA_EVENT_MOUSE_RELEASE:
if (!vo_nomouse_input)
mplayer_put_key(vo->key_fifo,
- MOUSE_BTN0 + cev.data.mouse.button - 1);
+ MP_MOUSE_BTN0 + cev.data.mouse.button - 1);
break;
case CACA_EVENT_KEY_PRESS:
{
diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c
index e708b3afc6..e9967f37e5 100644
--- a/video/out/vo_sdl.c
+++ b/video/out/vo_sdl.c
@@ -98,70 +98,70 @@ struct keymap_entry {
int mpv;
};
const struct keymap_entry keys[] = {
- {SDLK_RETURN, KEY_ENTER},
- {SDLK_ESCAPE, KEY_ESC},
- {SDLK_BACKSPACE, KEY_BACKSPACE},
- {SDLK_TAB, KEY_TAB},
- {SDLK_PRINTSCREEN, KEY_PRINT},
- {SDLK_PAUSE, KEY_PAUSE},
- {SDLK_INSERT, KEY_INSERT},
- {SDLK_HOME, KEY_HOME},
- {SDLK_PAGEUP, KEY_PAGE_UP},
- {SDLK_DELETE, KEY_DELETE},
- {SDLK_END, KEY_END},
- {SDLK_PAGEDOWN, KEY_PAGE_DOWN},
- {SDLK_RIGHT, KEY_RIGHT},
- {SDLK_LEFT, KEY_LEFT},
- {SDLK_DOWN, KEY_DOWN},
- {SDLK_UP, KEY_UP},
- {SDLK_KP_ENTER, KEY_KPENTER},
- {SDLK_KP_1, KEY_KP1},
- {SDLK_KP_2, KEY_KP2},
- {SDLK_KP_3, KEY_KP3},
- {SDLK_KP_4, KEY_KP4},
- {SDLK_KP_5, KEY_KP5},
- {SDLK_KP_6, KEY_KP6},
- {SDLK_KP_7, KEY_KP7},
- {SDLK_KP_8, KEY_KP8},
- {SDLK_KP_9, KEY_KP9},
- {SDLK_KP_0, KEY_KP0},
- {SDLK_KP_PERIOD, KEY_KPDEC},
- {SDLK_POWER, KEY_POWER},
- {SDLK_MENU, KEY_MENU},
- {SDLK_STOP, KEY_STOP},
- {SDLK_MUTE, KEY_MUTE},
- {SDLK_VOLUMEUP, KEY_VOLUME_UP},
- {SDLK_VOLUMEDOWN, KEY_VOLUME_DOWN},
- {SDLK_KP_COMMA, KEY_KPDEC},
- {SDLK_AUDIONEXT, KEY_NEXT},
- {SDLK_AUDIOPREV, KEY_PREV},
- {SDLK_AUDIOSTOP, KEY_STOP},
- {SDLK_AUDIOPLAY, KEY_PLAY},
- {SDLK_AUDIOMUTE, KEY_MUTE},
- {SDLK_F1, KEY_F + 1},
- {SDLK_F2, KEY_F + 2},
- {SDLK_F3, KEY_F + 3},
- {SDLK_F4, KEY_F + 4},
- {SDLK_F5, KEY_F + 5},
- {SDLK_F6, KEY_F + 6},
- {SDLK_F7, KEY_F + 7},
- {SDLK_F8, KEY_F + 8},
- {SDLK_F9, KEY_F + 9},
- {SDLK_F10, KEY_F + 10},
- {SDLK_F11, KEY_F + 11},
- {SDLK_F12, KEY_F + 12},
- {SDLK_F13, KEY_F + 13},
- {SDLK_F14, KEY_F + 14},
- {SDLK_F15, KEY_F + 15},
- {SDLK_F16, KEY_F + 16},
- {SDLK_F17, KEY_F + 17},
- {SDLK_F18, KEY_F + 18},
- {SDLK_F19, KEY_F + 19},
- {SDLK_F20, KEY_F + 20},
- {SDLK_F21, KEY_F + 21},
- {SDLK_F22, KEY_F + 22},
- {SDLK_F23, KEY_F + 23},
- {SDLK_F24, KEY_F + 24}
+ {SDLK_RETURN, MP_KEY_ENTER},
+ {SDLK_ESCAPE, MP_KEY_ESC},
+ {SDLK_BACKSPACE, MP_KEY_BACKSPACE},
+ {SDLK_TAB, MP_KEY_TAB},
+ {SDLK_PRINTSCREEN, MP_KEY_PRINT},
+ {SDLK_PAUSE, MP_KEY_PAUSE},
+ {SDLK_INSERT, MP_KEY_INSERT},
+ {SDLK_HOME, MP_KEY_HOME},
+ {SDLK_PAGEUP, MP_KEY_PAGE_UP},
+ {SDLK_DELETE, MP_KEY_DELETE},
+ {SDLK_END, MP_KEY_END},
+ {SDLK_PAGEDOWN, MP_KEY_PAGE_DOWN},
+ {SDLK_RIGHT, MP_KEY_RIGHT},
+ {SDLK_LEFT, MP_KEY_LEFT},
+ {SDLK_DOWN, MP_KEY_DOWN},
+ {SDLK_UP, MP_KEY_UP},
+ {SDLK_KP_ENTER, MP_KEY_KPENTER},
+ {SDLK_KP_1, MP_KEY_KP1},
+ {SDLK_KP_2, MP_KEY_KP2},
+ {SDLK_KP_3, MP_KEY_KP3},
+ {SDLK_KP_4, MP_KEY_KP4},
+ {SDLK_KP_5, MP_KEY_KP5},
+ {SDLK_KP_6, MP_KEY_KP6},
+ {SDLK_KP_7, MP_KEY_KP7},
+ {SDLK_KP_8, MP_KEY_KP8},
+ {SDLK_KP_9, MP_KEY_KP9},
+ {SDLK_KP_0, MP_KEY_KP0},
+ {SDLK_KP_PERIOD, MP_KEY_KPDEC},
+ {SDLK_POWER, MP_KEY_POWER},
+ {SDLK_MENU, MP_KEY_MENU},
+ {SDLK_STOP, MP_KEY_STOP},
+ {SDLK_MUTE, MP_KEY_MUTE},
+ {SDLK_VOLUMEUP, MP_KEY_VOLUME_UP},
+ {SDLK_VOLUMEDOWN, MP_KEY_VOLUME_DOWN},
+ {SDLK_KP_COMMA, MP_KEY_KPDEC},
+ {SDLK_AUDIONEXT, MP_KEY_NEXT},
+ {SDLK_AUDIOPREV, MP_KEY_PREV},
+ {SDLK_AUDIOSTOP, MP_KEY_STOP},
+ {SDLK_AUDIOPLAY, MP_KEY_PLAY},
+ {SDLK_AUDIOMUTE, MP_KEY_MUTE},
+ {SDLK_F1, MP_KEY_F + 1},
+ {SDLK_F2, MP_KEY_F + 2},
+ {SDLK_F3, MP_KEY_F + 3},
+ {SDLK_F4, MP_KEY_F + 4},
+ {SDLK_F5, MP_KEY_F + 5},
+ {SDLK_F6, MP_KEY_F + 6},
+ {SDLK_F7, MP_KEY_F + 7},
+ {SDLK_F8, MP_KEY_F + 8},
+ {SDLK_F9, MP_KEY_F + 9},
+ {SDLK_F10, MP_KEY_F + 10},
+ {SDLK_F11, MP_KEY_F + 11},
+ {SDLK_F12, MP_KEY_F + 12},
+ {SDLK_F13, MP_KEY_F + 13},
+ {SDLK_F14, MP_KEY_F + 14},
+ {SDLK_F15, MP_KEY_F + 15},
+ {SDLK_F16, MP_KEY_F + 16},
+ {SDLK_F17, MP_KEY_F + 17},
+ {SDLK_F18, MP_KEY_F + 18},
+ {SDLK_F19, MP_KEY_F + 19},
+ {SDLK_F20, MP_KEY_F + 20},
+ {SDLK_F21, MP_KEY_F + 21},
+ {SDLK_F22, MP_KEY_F + 22},
+ {SDLK_F23, MP_KEY_F + 23},
+ {SDLK_F24, MP_KEY_F + 24}
};
struct priv {
@@ -505,7 +505,7 @@ static void check_events(struct vo *vo)
}
break;
case SDL_QUIT:
- mplayer_put_key(vo->key_fifo, KEY_CLOSE_WIN);
+ mplayer_put_key(vo->key_fifo, MP_KEY_CLOSE_WIN);
break;
case SDL_TEXTINPUT: {
int sdl_mod = SDL_GetModState();
@@ -513,11 +513,11 @@ static void check_events(struct vo *vo)
// we ignore KMOD_LSHIFT, KMOD_RSHIFT and KMOD_RALT because
// these are already factored into ev.text.text
if (sdl_mod & (KMOD_LCTRL | KMOD_RCTRL))
- mpv_mod |= KEY_MODIFIER_CTRL;
+ mpv_mod |= MP_KEY_MODIFIER_CTRL;
if (sdl_mod & KMOD_LALT)
- mpv_mod |= KEY_MODIFIER_ALT;
+ mpv_mod |= MP_KEY_MODIFIER_ALT;
if (sdl_mod & (KMOD_LGUI | KMOD_RGUI))
- mpv_mod |= KEY_MODIFIER_META;
+ mpv_mod |= MP_KEY_MODIFIER_META;
struct bstr t = {
ev.text.text, strlen(ev.text.text)
};
@@ -542,13 +542,13 @@ static void check_events(struct vo *vo)
}
if (keycode) {
if (ev.key.keysym.mod & (KMOD_LSHIFT | KMOD_RSHIFT))
- keycode |= KEY_MODIFIER_SHIFT;
+ keycode |= MP_KEY_MODIFIER_SHIFT;
if (ev.key.keysym.mod & (KMOD_LCTRL | KMOD_RCTRL))
- keycode |= KEY_MODIFIER_CTRL;
+ keycode |= MP_KEY_MODIFIER_CTRL;
if (ev.key.keysym.mod & (KMOD_LALT | KMOD_RALT))
- keycode |= KEY_MODIFIER_ALT;
+ keycode |= MP_KEY_MODIFIER_ALT;
if (ev.key.keysym.mod & (KMOD_LGUI | KMOD_RGUI))
- keycode |= KEY_MODIFIER_META;
+ keycode |= MP_KEY_MODIFIER_META;
mplayer_put_key(vo->key_fifo, keycode);
}
break;
@@ -568,7 +568,7 @@ static void check_events(struct vo *vo)
vc->mouse_timer = GetTimerMS();
}
mplayer_put_key(vo->key_fifo,
- (MOUSE_BTN0 + ev.button.button - 1) | MP_KEY_DOWN);
+ (MP_MOUSE_BTN0 + ev.button.button - 1) | MP_KEY_STATE_DOWN);
break;
case SDL_MOUSEBUTTONUP:
if (opts->cursor_autohide_delay >= 0) {
@@ -577,7 +577,7 @@ static void check_events(struct vo *vo)
vc->mouse_timer = GetTimerMS();
}
mplayer_put_key(vo->key_fifo,
- (MOUSE_BTN0 + ev.button.button - 1));
+ (MP_MOUSE_BTN0 + ev.button.button - 1));
break;
case SDL_MOUSEWHEEL:
break;
diff --git a/video/out/w32_common.c b/video/out/w32_common.c
index 113ca2dddd..343404abba 100644
--- a/video/out/w32_common.c
+++ b/video/out/w32_common.c
@@ -39,25 +39,25 @@ static const wchar_t classname[] = L"mpv";
static const struct mp_keymap vk_map[] = {
// special keys
- {VK_ESCAPE, KEY_ESC}, {VK_BACK, KEY_BS}, {VK_TAB, KEY_TAB},
- {VK_RETURN, KEY_ENTER}, {VK_PAUSE, KEY_PAUSE}, {VK_SNAPSHOT, KEY_PRINT},
+ {VK_ESCAPE, MP_KEY_ESC}, {VK_BACK, MP_KEY_BS}, {VK_TAB, MP_KEY_TAB},
+ {VK_RETURN, MP_KEY_ENTER}, {VK_PAUSE, MP_KEY_PAUSE}, {VK_SNAPSHOT, MP_KEY_PRINT},
// cursor keys
- {VK_LEFT, KEY_LEFT}, {VK_UP, KEY_UP}, {VK_RIGHT, KEY_RIGHT}, {VK_DOWN, KEY_DOWN},
+ {VK_LEFT, MP_KEY_LEFT}, {VK_UP, MP_KEY_UP}, {VK_RIGHT, MP_KEY_RIGHT}, {VK_DOWN, MP_KEY_DOWN},
// navigation block
- {VK_INSERT, KEY_INSERT}, {VK_DELETE, KEY_DELETE}, {VK_HOME, KEY_HOME}, {VK_END, KEY_END},
- {VK_PRIOR, KEY_PAGE_UP}, {VK_NEXT, KEY_PAGE_DOWN},
+ {VK_INSERT, MP_KEY_INSERT}, {VK_DELETE, MP_KEY_DELETE}, {VK_HOME, MP_KEY_HOME}, {VK_END, MP_KEY_END},
+ {VK_PRIOR, MP_KEY_PAGE_UP}, {VK_NEXT, MP_KEY_PAGE_DOWN},
// F-keys
- {VK_F1, KEY_F+1}, {VK_F2, KEY_F+2}, {VK_F3, KEY_F+3}, {VK_F4, KEY_F+4},
- {VK_F5, KEY_F+5}, {VK_F6, KEY_F+6}, {VK_F7, KEY_F+7}, {VK_F8, KEY_F+8},
- {VK_F9, KEY_F+9}, {VK_F10, KEY_F+10}, {VK_F11, KEY_F+11}, {VK_F12, KEY_F+12},
+ {VK_F1, MP_KEY_F+1}, {VK_F2, MP_KEY_F+2}, {VK_F3, MP_KEY_F+3}, {VK_F4, MP_KEY_F+4},
+ {VK_F5, MP_KEY_F+5}, {VK_F6, MP_KEY_F+6}, {VK_F7, MP_KEY_F+7}, {VK_F8, MP_KEY_F+8},
+ {VK_F9, MP_KEY_F+9}, {VK_F10, MP_KEY_F+10}, {VK_F11, MP_KEY_F+11}, {VK_F12, MP_KEY_F+12},
// numpad
- {VK_NUMPAD0, KEY_KP0}, {VK_NUMPAD1, KEY_KP1}, {VK_NUMPAD2, KEY_KP2},
- {VK_NUMPAD3, KEY_KP3}, {VK_NUMPAD4, KEY_KP4}, {VK_NUMPAD5, KEY_KP5},
- {VK_NUMPAD6, KEY_KP6}, {VK_NUMPAD7, KEY_KP7}, {VK_NUMPAD8, KEY_KP8},
- {VK_NUMPAD9, KEY_KP9}, {VK_DECIMAL, KEY_KPDEC},
+ {VK_NUMPAD0, MP_KEY_KP0}, {VK_NUMPAD1, MP_KEY_KP1}, {VK_NUMPAD2, MP_KEY_KP2},
+ {VK_NUMPAD3, MP_KEY_KP3}, {VK_NUMPAD4, MP_KEY_KP4}, {VK_NUMPAD5, MP_KEY_KP5},
+ {VK_NUMPAD6, MP_KEY_KP6}, {VK_NUMPAD7, MP_KEY_KP7}, {VK_NUMPAD8, MP_KEY_KP8},
+ {VK_NUMPAD9, MP_KEY_KP9}, {VK_DECIMAL, MP_KEY_KPDEC},
{0, 0}
};
@@ -103,11 +103,11 @@ static int mod_state(struct vo *vo)
{
int res = 0;
if (key_state(vo, VK_CONTROL))
- res |= KEY_MODIFIER_CTRL;
+ res |= MP_KEY_MODIFIER_CTRL;
if (key_state(vo, VK_SHIFT))
- res |= KEY_MODIFIER_SHIFT;
+ res |= MP_KEY_MODIFIER_SHIFT;
if (key_state(vo, VK_MENU))
- res |= KEY_MODIFIER_ALT;
+ res |= MP_KEY_MODIFIER_ALT;
return res;
}
@@ -171,7 +171,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
}
break;
case WM_CLOSE:
- mplayer_put_key(vo->key_fifo, KEY_CLOSE_WIN);
+ mplayer_put_key(vo->key_fifo, MP_KEY_CLOSE_WIN);
break;
case WM_SYSCOMMAND:
switch (wParam) {
@@ -198,15 +198,15 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
// E.g. AltGr+9 on a German keyboard would yield Ctrl+Alt+[
// Warning: wine handles this differently. Don't test this on wine!
if (key_state(vo, VK_RMENU))
- mods &= ~(KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT);
+ mods &= ~(MP_KEY_MODIFIER_CTRL | MP_KEY_MODIFIER_ALT);
// Apparently Ctrl+A to Ctrl+Z is special cased, and produces
// character codes from 1-26. Work it around.
// Also, enter/return (including the keypad variant) and CTRL+J both
// map to wParam==10. As a workaround, check VK_RETURN to
// distinguish these two key combinations.
- if ((mods & KEY_MODIFIER_CTRL) && code >= 1 && code <= 26
+ if ((mods & MP_KEY_MODIFIER_CTRL) && code >= 1 && code <= 26
&& !key_state(vo, VK_RETURN))
- code = code - 1 + (mods & KEY_MODIFIER_SHIFT ? 'A' : 'a');
+ code = code - 1 + (mods & MP_KEY_MODIFIER_SHIFT ? 'A' : 'a');
if (code >= 32 && code < (1<<21)) {
mplayer_put_key(vo->key_fifo, code | mods);
// At least with Alt+char, not calling DefWindowProcW stops
@@ -217,7 +217,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
}
case WM_LBUTTONDOWN:
if (!vo_nomouse_input && (vo_fs || (wParam & MK_CONTROL))) {
- mplayer_put_key(vo->key_fifo, MOUSE_BTN0 | mod_state(vo));
+ mplayer_put_key(vo->key_fifo, MP_MOUSE_BTN0 | mod_state(vo));
break;
}
if (!vo_fs) {
@@ -228,11 +228,11 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
break;
case WM_MBUTTONDOWN:
if (!vo_nomouse_input)
- mplayer_put_key(vo->key_fifo, MOUSE_BTN1 | mod_state(vo));
+ mplayer_put_key(vo->key_fifo, MP_MOUSE_BTN1 | mod_state(vo));
break;
case WM_RBUTTONDOWN:
if (!vo_nomouse_input)
- mplayer_put_key(vo->key_fifo, MOUSE_BTN2 | mod_state(vo));
+ mplayer_put_key(vo->key_fifo, MP_MOUSE_BTN2 | mod_state(vo));
break;
case WM_MOUSEMOVE:
vo_mouse_movement(vo, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
@@ -241,18 +241,18 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
if (!vo_nomouse_input) {
int x = GET_WHEEL_DELTA_WPARAM(wParam);
if (x > 0)
- mplayer_put_key(vo->key_fifo, MOUSE_BTN3 | mod_state(vo));
+ mplayer_put_key(vo->key_fifo, MP_MOUSE_BTN3 | mod_state(vo));
else
- mplayer_put_key(vo->key_fifo, MOUSE_BTN4 | mod_state(vo));
+ mplayer_put_key(vo->key_fifo, MP_MOUSE_BTN4 | mod_state(vo));
}
break;
case WM_XBUTTONDOWN:
if (!vo_nomouse_input) {
int x = HIWORD(wParam);
if (x == 1)
- mplayer_put_key(vo->key_fifo, MOUSE_BTN5 | mod_state(vo));
+ mplayer_put_key(vo->key_fifo, MP_MOUSE_BTN5 | mod_state(vo));
else // if (x == 2)
- mplayer_put_key(vo->key_fifo, MOUSE_BTN6 | mod_state(vo));
+ mplayer_put_key(vo->key_fifo, MP_MOUSE_BTN6 | mod_state(vo));
}
break;
}
@@ -302,7 +302,7 @@ int vo_w32_check_events(struct vo *vo)
MoveWindow(w32->window, 0, 0, r.right, r.bottom, FALSE);
if (!IsWindow(WIN_ID_TO_HWND(WinID)))
// Window has probably been closed, e.g. due to program crash
- mplayer_put_key(vo->key_fifo, KEY_CLOSE_WIN);
+ mplayer_put_key(vo->key_fifo, MP_KEY_CLOSE_WIN);
}
return w32->event_flags;
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 5768aaf99b..b3428feeaa 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -501,44 +501,50 @@ int vo_x11_init(struct vo *vo)
static const struct mp_keymap keymap[] = {
// special keys
- {XK_Pause, KEY_PAUSE}, {XK_Escape, KEY_ESC}, {XK_BackSpace, KEY_BS},
- {XK_Tab, KEY_TAB}, {XK_Return, KEY_ENTER},
- {XK_Menu, KEY_MENU}, {XK_Print, KEY_PRINT},
+ {XK_Pause, MP_KEY_PAUSE}, {XK_Escape, MP_KEY_ESC},
+ {XK_BackSpace, MP_KEY_BS}, {XK_Tab, MP_KEY_TAB}, {XK_Return, MP_KEY_ENTER},
+ {XK_Menu, MP_KEY_MENU}, {XK_Print, MP_KEY_PRINT},
// cursor keys
- {XK_Left, KEY_LEFT}, {XK_Right, KEY_RIGHT}, {XK_Up, KEY_UP}, {XK_Down, KEY_DOWN},
+ {XK_Left, MP_KEY_LEFT}, {XK_Right, MP_KEY_RIGHT}, {XK_Up, MP_KEY_UP},
+ {XK_Down, MP_KEY_DOWN},
// navigation block
- {XK_Insert, KEY_INSERT}, {XK_Delete, KEY_DELETE}, {XK_Home, KEY_HOME}, {XK_End, KEY_END},
- {XK_Page_Up, KEY_PAGE_UP}, {XK_Page_Down, KEY_PAGE_DOWN},
+ {XK_Insert, MP_KEY_INSERT}, {XK_Delete, MP_KEY_DELETE},
+ {XK_Home, MP_KEY_HOME}, {XK_End, MP_KEY_END}, {XK_Page_Up, MP_KEY_PAGE_UP},
+ {XK_Page_Down, MP_KEY_PAGE_DOWN},
// F-keys
- {XK_F1, KEY_F+1}, {XK_F2, KEY_F+2}, {XK_F3, KEY_F+3}, {XK_F4, KEY_F+4},
- {XK_F5, KEY_F+5}, {XK_F6, KEY_F+6}, {XK_F7, KEY_F+7}, {XK_F8, KEY_F+8},
- {XK_F9, KEY_F+9}, {XK_F10, KEY_F+10}, {XK_F11, KEY_F+11}, {XK_F12, KEY_F+12},
+ {XK_F1, MP_KEY_F+1}, {XK_F2, MP_KEY_F+2}, {XK_F3, MP_KEY_F+3},
+ {XK_F4, MP_KEY_F+4}, {XK_F5, MP_KEY_F+5}, {XK_F6, MP_KEY_F+6},
+ {XK_F7, MP_KEY_F+7}, {XK_F8, MP_KEY_F+8}, {XK_F9, MP_KEY_F+9},
+ {XK_F10, MP_KEY_F+10}, {XK_F11, MP_KEY_F+11}, {XK_F12, MP_KEY_F+12},
// numpad independent of numlock
- {XK_KP_Subtract, '-'}, {XK_KP_Add, '+'}, {XK_KP_Multiply, '*'}, {XK_KP_Divide, '/'},
- {XK_KP_Enter, KEY_KPENTER},
+ {XK_KP_Subtract, '-'}, {XK_KP_Add, '+'}, {XK_KP_Multiply, '*'},
+ {XK_KP_Divide, '/'}, {XK_KP_Enter, MP_KEY_KPENTER},
// numpad with numlock
- {XK_KP_0, KEY_KP0}, {XK_KP_1, KEY_KP1}, {XK_KP_2, KEY_KP2},
- {XK_KP_3, KEY_KP3}, {XK_KP_4, KEY_KP4}, {XK_KP_5, KEY_KP5},
- {XK_KP_6, KEY_KP6}, {XK_KP_7, KEY_KP7}, {XK_KP_8, KEY_KP8},
- {XK_KP_9, KEY_KP9}, {XK_KP_Decimal, KEY_KPDEC},
- {XK_KP_Separator, KEY_KPDEC},
+ {XK_KP_0, MP_KEY_KP0}, {XK_KP_1, MP_KEY_KP1}, {XK_KP_2, MP_KEY_KP2},
+ {XK_KP_3, MP_KEY_KP3}, {XK_KP_4, MP_KEY_KP4}, {XK_KP_5, MP_KEY_KP5},
+ {XK_KP_6, MP_KEY_KP6}, {XK_KP_7, MP_KEY_KP7}, {XK_KP_8, MP_KEY_KP8},
+ {XK_KP_9, MP_KEY_KP9}, {XK_KP_Decimal, MP_KEY_KPDEC},
+ {XK_KP_Separator, MP_KEY_KPDEC},
// numpad without numlock
- {XK_KP_Insert, KEY_KPINS}, {XK_KP_End, KEY_KP1}, {XK_KP_Down, KEY_KP2},
- {XK_KP_Page_Down, KEY_KP3}, {XK_KP_Left, KEY_KP4}, {XK_KP_Begin, KEY_KP5},
- {XK_KP_Right, KEY_KP6}, {XK_KP_Home, KEY_KP7}, {XK_KP_Up, KEY_KP8},
- {XK_KP_Page_Up, KEY_KP9}, {XK_KP_Delete, KEY_KPDEL},
+ {XK_KP_Insert, MP_KEY_KPINS}, {XK_KP_End, MP_KEY_KP1},
+ {XK_KP_Down, MP_KEY_KP2}, {XK_KP_Page_Down, MP_KEY_KP3},
+ {XK_KP_Left, MP_KEY_KP4}, {XK_KP_Begin, MP_KEY_KP5},
+ {XK_KP_Right, MP_KEY_KP6}, {XK_KP_Home, MP_KEY_KP7}, {XK_KP_Up, MP_KEY_KP8},
+ {XK_KP_Page_Up, MP_KEY_KP9}, {XK_KP_Delete, MP_KEY_KPDEL},
#ifdef XF86XK_AudioPause
- {XF86XK_MenuKB, KEY_MENU},
- {XF86XK_AudioPlay, KEY_PLAY}, {XF86XK_AudioPause, KEY_PAUSE}, {XF86XK_AudioStop, KEY_STOP},
- {XF86XK_AudioPrev, KEY_PREV}, {XF86XK_AudioNext, KEY_NEXT},
- {XF86XK_AudioMute, KEY_MUTE}, {XF86XK_AudioLowerVolume, KEY_VOLUME_DOWN}, {XF86XK_AudioRaiseVolume, KEY_VOLUME_UP},
+ {XF86XK_MenuKB, MP_KEY_MENU},
+ {XF86XK_AudioPlay, MP_KEY_PLAY}, {XF86XK_AudioPause, MP_KEY_PAUSE},
+ {XF86XK_AudioStop, MP_KEY_STOP}, {XF86XK_AudioPrev, MP_KEY_PREV},
+ {XF86XK_AudioNext, MP_KEY_NEXT}, {XF86XK_AudioMute, MP_KEY_MUTE},
+ {XF86XK_AudioLowerVolume, MP_KEY_VOLUME_DOWN},
+ {XF86XK_AudioRaiseVolume, MP_KEY_VOLUME_UP},
#endif
{0, 0}
@@ -729,13 +735,13 @@ int vo_x11_check_events(struct vo *vo)
KeySym keySym = 0;
int modifiers = 0;
if (Event.xkey.state & ShiftMask)
- modifiers |= KEY_MODIFIER_SHIFT;
+ modifiers |= MP_KEY_MODIFIER_SHIFT;
if (Event.xkey.state & ControlMask)
- modifiers |= KEY_MODIFIER_CTRL;
+ modifiers |= MP_KEY_MODIFIER_CTRL;
if (Event.xkey.state & Mod1Mask)
- modifiers |= KEY_MODIFIER_ALT;
+ modifiers |= MP_KEY_MODIFIER_ALT;
if (Event.xkey.state & Mod4Mask)
- modifiers |= KEY_MODIFIER_META;
+ modifiers |= MP_KEY_MODIFIER_META;
if (x11->xic) {
Status status;
int len = Xutf8LookupString(x11->xic, &Event.xkey, buf,
@@ -776,8 +782,8 @@ int vo_x11_check_events(struct vo *vo)
x11->mouse_timer = GetTimerMS();
}
mplayer_put_key(vo->key_fifo,
- (MOUSE_BTN0 + Event.xbutton.button - 1)
- | MP_KEY_DOWN);
+ (MP_MOUSE_BTN0 + Event.xbutton.button - 1)
+ | MP_KEY_STATE_DOWN);
break;
case ButtonRelease:
if (opts->cursor_autohide_delay > -2) {
@@ -786,7 +792,7 @@ int vo_x11_check_events(struct vo *vo)
x11->mouse_timer = GetTimerMS();
}
mplayer_put_key(vo->key_fifo,
- MOUSE_BTN0 + Event.xbutton.button - 1);
+ MP_MOUSE_BTN0 + Event.xbutton.button - 1);
break;
case PropertyNotify:
{
@@ -808,12 +814,12 @@ int vo_x11_check_events(struct vo *vo)
break;
case DestroyNotify:
mp_msg(MSGT_VO, MSGL_WARN, "Our window was destroyed, exiting\n");
- mplayer_put_key(vo->key_fifo, KEY_CLOSE_WIN);
+ mplayer_put_key(vo->key_fifo, MP_KEY_CLOSE_WIN);
break;
case ClientMessage:
if (Event.xclient.message_type == x11->XAWM_PROTOCOLS &&
Event.xclient.data.l[0] == x11->XAWM_DELETE_WINDOW)
- mplayer_put_key(vo->key_fifo, KEY_CLOSE_WIN);
+ mplayer_put_key(vo->key_fifo, MP_KEY_CLOSE_WIN);
break;
default:
if (Event.type == x11->ShmCompletionEvent)