summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorlumag <lumag@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-09-24 07:38:57 +0000
committerlumag <lumag@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-09-24 07:38:57 +0000
commit3edb02e5e4e038e1c4691881e5f06b17baad9bba (patch)
tree3c53db14f7478495376c9862f2ae8772ea4c01cb /libvo
parent6ebdf741f7d9d7836f00618b6140f4d2981c2310 (diff)
downloadmpv-3edb02e5e4e038e1c4691881e5f06b17baad9bba.tar.bz2
mpv-3edb02e5e4e038e1c4691881e5f06b17baad9bba.tar.xz
Get more keys from X window (punctuation, etc.) Hopefully, all alnum keys
will work now. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10937 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/wskeys.h25
-rw-r--r--libvo/x11_common.c29
2 files changed, 54 insertions, 0 deletions
diff --git a/libvo/wskeys.h b/libvo/wskeys.h
index 18eae2465c..6faef6dac4 100644
--- a/libvo/wskeys.h
+++ b/libvo/wskeys.h
@@ -65,6 +65,31 @@
#define wsLess '<'
#define wsMore '>'
+#define wsGrave '`'
+#define wsTilde '~'
+#define wsExclSign '!'
+#define wsAt '@'
+#define wsHash '#'
+#define wsDollar '$'
+#define wsPercent '%'
+#define wsCircumflex '^'
+#define wsAmpersand '&'
+#define wsobracket '('
+#define wscbracket ')'
+#define wsUnder '_'
+#define wsocbracket '{'
+#define wsccbracket '}'
+#define wsColon ':'
+#define wsSemicolon ';'
+#define wsDblQuote '\"'
+#define wsAcute '\''
+#define wsComma ','
+#define wsPoint '.'
+#define wsQuestSign '?'
+#define wsBSlash '\\'
+#define wsPipe '|'
+#define wsEqual '='
+
#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 b704a7b1a0..2f08c375d0 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -520,6 +520,35 @@ void vo_x11_putkey(int key){
case wsM: mplayer_put_key('m'); break;
case wso:
case wsO: mplayer_put_key('o'); break;
+
+ case wsGrave: mplayer_put_key('`'); break;
+ case wsTilde: mplayer_put_key('~'); break;
+ case wsExclSign: mplayer_put_key('!'); break;
+ case wsAt: mplayer_put_key('@'); break;
+ case wsHash: mplayer_put_key('#'); break;
+ case wsDollar: mplayer_put_key('$'); break;
+ case wsPercent: mplayer_put_key('%'); break;
+ case wsCircumflex: mplayer_put_key('^'); break;
+ case wsAmpersand: mplayer_put_key('&'); break;
+ case wsobracket: mplayer_put_key('('); break;
+ case wscbracket: mplayer_put_key(')'); break;
+ case wsUnder: mplayer_put_key('_'); break;
+ case wsocbracket: mplayer_put_key('{'); break;
+ case wsccbracket: mplayer_put_key('}'); break;
+ case wsColon: mplayer_put_key(':'); break;
+ case wsSemicolon: mplayer_put_key(';'); break;
+ case wsDblQuote: mplayer_put_key('\"'); break;
+ case wsAcute: mplayer_put_key('\''); break;
+ case wsComma: mplayer_put_key(','); break;
+ case wsPoint: mplayer_put_key('.'); break;
+ case wsQuestSign: mplayer_put_key('?'); break;
+ case wsBSlash: mplayer_put_key('\\'); break;
+ case wsPipe: mplayer_put_key('|'); break;
+ case wsEqual: mplayer_put_key('='); break;
+ case wsosbrackets: mplayer_put_key('['); break;
+ case wscsbrackets: mplayer_put_key(']'); break;
+
+
default: if((key>='a' && key<='z')||(key>='A' && key<='Z')||
(key>='0' && key<='9')) mplayer_put_key(key);
}