summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2011-06-14 12:13:47 +0000
committerUoti Urpala <uau@mplayer2.org>2011-07-06 13:01:07 +0300
commitd6e34fe91a5bf8a7a65e1e9ee7837612241f8ce8 (patch)
tree99ddd746c55c180791891291a44fdc89d48f8538 /libvo
parent0cace1d72251d0a5be79e58c6e8001406cb1da4e (diff)
downloadmpv-d6e34fe91a5bf8a7a65e1e9ee7837612241f8ce8.tar.bz2
mpv-d6e34fe91a5bf8a7a65e1e9ee7837612241f8ce8.tar.xz
VO: support Pause/Break key in X11 input
Allow Pause/Break key to be bound as MPlayer input key under X11. patch by Steaphan Greene, sgreene cs.binghamton edu git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33609 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/wskeys.h1
-rw-r--r--libvo/x11_common.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/libvo/wskeys.h b/libvo/wskeys.h
index ef372e5c7f..10d9b8b4e4 100644
--- a/libvo/wskeys.h
+++ b/libvo/wskeys.h
@@ -19,6 +19,7 @@
#ifndef MPLAYER_WSKEYS_H
#define MPLAYER_WSKEYS_H
+#define wsPause 0x13 + 256
#define wsUp 0x52 + 256
#define wsDown 0x54 + 256
#define wsLeft 0x51 + 256
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index c576839ddb..0a193fb0d3 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -550,7 +550,8 @@ static void vo_x11_putkey_ext(struct vo *vo, int keysym, int modifiers)
static const struct mp_keymap keymap[] = {
// special keys
- {wsEscape, KEY_ESC}, {wsBackSpace, KEY_BS}, {wsTab, KEY_TAB}, {wsEnter, KEY_ENTER},
+ {wsPause, KEY_PAUSE}, {wsEscape, KEY_ESC}, {wsBackSpace, KEY_BS},
+ {wsTab, KEY_TAB}, {wsEnter, KEY_ENTER},
// cursor keys
{wsLeft, KEY_LEFT}, {wsRight, KEY_RIGHT}, {wsUp, KEY_UP}, {wsDown, KEY_DOWN},