[Mplayer-cvslog] CVS: main/libvo vo_sdl.c,1.101,1.102 wskeys.h,1.5,1.6 x11_common.c,1.142,1.143
Alex Beregszaszi
alex at mplayerhq.hu
Wed Apr 9 19:06:11 CEST 2003
Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv14625/libvo
Modified Files:
vo_sdl.c wskeys.h x11_common.c
Log Message:
keypad and function (f1-f10) suppport (currently only vo_sdl and the terminal input code supports it). Patch by Vladimir Mosgalin <mosgalin at VM10124.spb.edu>
Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- vo_sdl.c 23 Mar 2003 17:35:26 -0000 1.101
+++ vo_sdl.c 9 Apr 2003 17:05:35 -0000 1.102
@@ -1256,6 +1256,16 @@
case SDLK_RETURN: mplayer_put_key(KEY_ENTER);break;
case SDLK_ESCAPE: mplayer_put_key(KEY_ESC);break;
case SDLK_q: mplayer_put_key('q');break;
+ case SDLK_F1: mplayer_put_key(KEY_F+1);break;
+ case SDLK_F2: mplayer_put_key(KEY_F+2);break;
+ case SDLK_F3: mplayer_put_key(KEY_F+3);break;
+ case SDLK_F4: mplayer_put_key(KEY_F+4);break;
+ case SDLK_F5: mplayer_put_key(KEY_F+5);break;
+ case SDLK_F6: mplayer_put_key(KEY_F+6);break;
+ case SDLK_F7: mplayer_put_key(KEY_F+7);break;
+ case SDLK_F8: mplayer_put_key(KEY_F+8);break;
+ case SDLK_F9: mplayer_put_key(KEY_F+9);break;
+ case SDLK_F10: mplayer_put_key(KEY_F+10);break;
/*case SDLK_o: mplayer_put_key('o');break;
case SDLK_SPACE: mplayer_put_key(' ');break;
case SDLK_p: mplayer_put_key('p');break;*/
@@ -1289,6 +1299,18 @@
case SDLK_SLASH:
case SDLK_KP_DIVIDE: mplayer_put_key('/'); break;
#endif
+ case SDLK_KP0: mplayer_put_key(KEY_KP0); break;
+ case SDLK_KP1: mplayer_put_key(KEY_KP1); break;
+ case SDLK_KP2: mplayer_put_key(KEY_KP2); break;
+ case SDLK_KP3: mplayer_put_key(KEY_KP3); break;
+ case SDLK_KP4: mplayer_put_key(KEY_KP4); break;
+ case SDLK_KP5: mplayer_put_key(KEY_KP5); break;
+ case SDLK_KP6: mplayer_put_key(KEY_KP6); break;
+ case SDLK_KP7: mplayer_put_key(KEY_KP7); break;
+ case SDLK_KP8: mplayer_put_key(KEY_KP8); break;
+ case SDLK_KP9: mplayer_put_key(KEY_KP9); break;
+ case SDLK_KP_PERIOD: mplayer_put_key(KEY_KPDEC); break;
+ case SDLK_KP_ENTER: mplayer_put_key(KEY_KPENTER); break;
default:
//printf("got scancode: %d keysym: %d mod: %d %d\n", event.key.keysym.scancode, keypressed, event.key.keysym.mod);
mplayer_put_key(keypressed);
Index: wskeys.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/wskeys.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wskeys.h 14 Dec 2001 17:37:45 -0000 1.5
+++ wskeys.h 9 Apr 2003 17:05:35 -0000 1.6
@@ -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/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- x11_common.c 4 Apr 2003 15:04:10 -0000 1.142
+++ x11_common.c 9 Apr 2003 17:05:35 -0000 1.143
@@ -434,6 +434,16 @@
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:
@@ -448,6 +458,29 @@
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:
More information about the MPlayer-cvslog
mailing list