[Mplayerxp-cvslog] CVS: mplayerxp/mplayerxp/libvo wskeys.h,1.1.1.1,1.2 x11_common.c,1.11,1.12

[Nick K. <nic...@us...>]

Update of /cvsroot/mplayerxp/mplayerxp/mplayerxp/libvo
In directory sc8-pr-cvs1:/tmp/cvs-serv4690/libvo

Modified Files:
	wskeys.h x11_common.c 
Log Message:
sync with mphq (for multimedia keyboard support under X11)

Index: wskeys.h
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libvo/wskeys.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -p -u -d -r1.1.1.1 -r1.2
--- wskeys.h	23 Mar 2002 11:09:21 -0000	1.1.1.1
+++ wskeys.h	19 Jun 2003 08:47:11 -0000	1.2
@@ -102,6 +102,28 @@
 #define wsGrayMinus     0xad + 256
 #define wsGrayMul       0xaa + 256
 #define wsGrayDiv       0xaf + 256
+#define wsGrayDecimal   0xae + 256
+#define wsGray0         0xb0 + 256
+#define wsGray1         0xb1 + 256
+#define wsGray2         0xb2 + 256
+#define wsGray3         0xb3 + 256
+#define wsGray4         0xb4 + 256
+#define wsGray5         0xb5 + 256
+#define wsGray6         0xb6 + 256
+#define wsGray7         0xb7 + 256
+#define wsGray8         0xb8 + 256
+#define wsGray9         0xb9 + 256
+#define wsGrayHome      0x95 + 256
+#define wsGrayLeft      0x96 + 256
+#define wsGrayUp        0x97 + 256
+#define wsGrayRight     0x98 + 256
+#define wsGrayDown      0x99 + 256
+#define wsGrayPgUp      0x9a + 256
+#define wsGrayPgDn      0x9b + 256
+#define wsGrayEnd       0x9c + 256
+#define wsGray5Dup      0x9d + 256
+#define wsGrayInsert    0x9e + 256
+#define wsGrayDelete    0x9f + 256
 
 #endif
 

Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayerxp/mplayerxp/mplayerxp/libvo/x11_common.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -p -u -d -r1.11 -r1.12
--- x11_common.c	29 Dec 2002 09:25:29 -0000	1.11
+++ x11_common.c	19 Jun 2003 08:47:11 -0000	1.12
@@ -27,6 +27,7 @@
 
 #ifdef HAVE_XF86VM
 #include <X11/extensions/xf86vmode.h>
+#include <X11/XF86keysym.h>
 #endif
 
 #include "../input/input.h"
@@ -281,6 +282,19 @@ int vo_x11_init( void )
 
 extern void mplayer_put_key(int code);
 
+#ifdef XF86XK_AudioPause
+void vo_x11_putkey_ext(int keysym){
+ switch ( keysym )
+  {
+   case XF86XK_AudioPause:    mplayer_put_key(KEY_XF86_PAUSE); break;
+   case XF86XK_AudioStop:     mplayer_put_key(KEY_XF86_STOP); break;
+   case XF86XK_AudioPrev:     mplayer_put_key(KEY_XF86_PREV); break;
+   case XF86XK_AudioNext:     mplayer_put_key(KEY_XF86_NEXT); break;
+   default:
+  }
+}
+#endif
+
 void vo_x11_putkey(int key){
  switch ( key )
   {
@@ -291,8 +305,23 @@ void vo_x11_putkey(int key){
    case wsSpace:     mplayer_put_key(' '); break;
    case wsEscape:    mplayer_put_key(KEY_ESC); break;
    case wsEnter:     mplayer_put_key(KEY_ENTER); break;
+   case wsBackSpace: mplayer_put_key(KEY_BS); break;
+   case wsDelete:    mplayer_put_key(KEY_DELETE); break;
+   case wsInsert:    mplayer_put_key(KEY_INSERT); break;
+   case wsHome:      mplayer_put_key(KEY_HOME); break;
+   case wsEnd:       mplayer_put_key(KEY_END); break;
    case wsPageUp:    mplayer_put_key(KEY_PAGE_UP); break;
    case wsPageDown:  mplayer_put_key(KEY_PAGE_DOWN); break;
+   case wsF1:        mplayer_put_key(KEY_F+1); break;
+   case wsF2:        mplayer_put_key(KEY_F+2); break;
+   case wsF3:        mplayer_put_key(KEY_F+3); break;
+   case wsF4:        mplayer_put_key(KEY_F+4); break;
+   case wsF5:        mplayer_put_key(KEY_F+5); break;
+   case wsF6:        mplayer_put_key(KEY_F+6); break;
+   case wsF7:        mplayer_put_key(KEY_F+7); break;
+   case wsF8:        mplayer_put_key(KEY_F+8); break;
+   case wsF9:        mplayer_put_key(KEY_F+9); break;
+   case wsF10:       mplayer_put_key(KEY_F+10); break;
    case wsq:
    case wsQ:         mplayer_put_key('q'); break;
    case wsp:
@@ -307,6 +336,29 @@ void vo_x11_putkey(int key){
    case wsDiv:       mplayer_put_key('/'); break;
    case wsLess:      mplayer_put_key('<'); break;
    case wsMore:      mplayer_put_key('>'); break;
+   case wsGray0:     mplayer_put_key(KEY_KP0); break;
+   case wsGrayEnd:
+   case wsGray1:     mplayer_put_key(KEY_KP1); break;
+   case wsGrayDown:
+   case wsGray2:     mplayer_put_key(KEY_KP2); break;
+   case wsGrayPgDn:
+   case wsGray3:     mplayer_put_key(KEY_KP3); break;
+   case wsGrayLeft:
+   case wsGray4:     mplayer_put_key(KEY_KP4); break;
+   case wsGray5Dup:
+   case wsGray5:     mplayer_put_key(KEY_KP5); break;
+   case wsGrayRight:
+   case wsGray6:     mplayer_put_key(KEY_KP6); break;
+   case wsGrayHome:
+   case wsGray7:     mplayer_put_key(KEY_KP7); break;
+   case wsGrayUp:
+   case wsGray8:     mplayer_put_key(KEY_KP8); break;
+   case wsGrayPgUp:
+   case wsGray9:     mplayer_put_key(KEY_KP9); break;
+   case wsGrayDecimal: mplayer_put_key(KEY_KPDEC); break;
+   case wsGrayInsert: mplayer_put_key(KEY_KPINS); break;
+   case wsGrayDelete: mplayer_put_key(KEY_KPDEL); break;
+   case wsGrayEnter: mplayer_put_key(KEY_KPENTER); break;
    case wsm:
    case wsM:	     mplayer_put_key('m'); break;
    case wso:
@@ -515,6 +567,9 @@ uint32_t vo_x11_check_events(Display *my
            { 
 	    int key;
             XLookupString( &Event.xkey,buf,sizeof(buf),&keySym,&stat );
+#ifdef XF86XK_AudioPause
+             vo_x11_putkey_ext( keySym );
+#endif
 	    key=( (keySym&0xff00) != 0?( (keySym&0x00ff) + 256 ):( keySym ) );
             vo_x11_putkey( key );
             ret|=VO_EVENT_KEYPRESS;