libvo input cleanup: remove the dependency on libinput,

remove most of the crappy mappings (like O->o or ESC->q).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16893 b3059339-0415-0410-9bf9-f77b7e298cf2

8 files changed, 33 insertions, 37 deletions

diff --git a/libvo/vo_dfbmga.c b/libvo/vo_dfbmga.c
index 1de69db2d1..2c852d59d4 100644
--- a/libvo/vo_dfbmga.c
+++ b/libvo/vo_dfbmga.c
@@ -1439,7 +1439,7 @@ check_events( void )
           if (event.type == DIET_KEYPRESS) {
                switch (event.key_symbol) {
                case DIKS_ESCAPE:
-                    mplayer_put_key( 'q' );
+                    mplayer_put_key( KEY_ESC );
                     break;
                case DIKS_PAGE_UP:
                     mplayer_put_key( KEY_PAGE_UP );
@@ -1473,33 +1473,43 @@ check_events( void )
                     break;
 
                case DIKS_POWER:
-                    mplayer_put_key( 'q' );
+                    mplayer_put_key( KEY_POWER );
                     break;
                case DIKS_MENU:
-                    mplayer_put_key( 'o' );
+                    mplayer_put_key( KEY_MENU );
                     break;
                case DIKS_PLAY:
+                    mplayer_put_key( KEY_PLAY );
+                    break;
                case DIKS_STOP:
+                    mplayer_put_key( KEY_STOP );
+                    break;
                case DIKS_PAUSE:
+                    mplayer_put_key( KEY_PAUSE );
+                    break;
                case DIKS_PLAYPAUSE:
-                    mplayer_put_key( ' ' );
+                    mplayer_put_key( KEY_PLAYPAUSE );
                     break;
                case DIKS_FORWARD:
+                    mplayer_put_key( KEY_FORWARD );
+                    break;
                case DIKS_NEXT:
-                    mplayer_put_key( KEY_PAGE_UP );
+                    mplayer_put_key( KEY_NEXT );
                     break;
                case DIKS_REWIND:
+                    mplayer_put_key( KEY_REWIND );
+                    break;
                case DIKS_PREVIOUS:
-                    mplayer_put_key( KEY_PAGE_DOWN );
+                    mplayer_put_key( KEY_PREVIOUS );
                     break;
                case DIKS_VOLUME_UP:
-                    mplayer_put_key( '0' );
+                     mplayer_put_key( KEY_VOLUME_UP );
                     break;
                case DIKS_VOLUME_DOWN:
-                    mplayer_put_key( '9' );
+                    mplayer_put_key( KEY_VOLUME_DOWN );
                     break;
                case DIKS_MUTE:
-                    mplayer_put_key( 'm' );
+                    mplayer_put_key( KEY_MUTE );
                     break;
 
                default:
diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c
index 3a38eb7408..f34399879f 100644
--- a/libvo/vo_directfb2.c
+++ b/libvo/vo_directfb2.c
@@ -909,7 +909,7 @@ if (buffer) {
      if (event.type == DIET_KEYPRESS) { 
     		switch (event.key_symbol) {
                                 case DIKS_ESCAPE:
-					mplayer_put_key('q');
+					mplayer_put_key(KEY_ESC);
 				break;
 				case DIKS_PAGE_UP: mplayer_put_key(KEY_PAGE_UP);break;
 				case DIKS_PAGE_DOWN: mplayer_put_key(KEY_PAGE_DOWN);break;
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c
index 16a5db166a..4b9528464f 100644
--- a/libvo/vo_directx.c
+++ b/libvo/vo_directx.c
@@ -889,7 +889,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
 		}
         case WM_CLOSE:
 		{
-			mp_input_queue_cmd(mp_input_parse_cmd("quit"));
+			mplayer_put_key(KEY_CLOSE_WIN);
 			return 0;
 		}
         case WM_WINDOWPOSCHANGED:
diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c
index d070a1960c..4bc8558e63 100644
--- a/libvo/vo_quartz.c
+++ b/libvo/vo_quartz.c
@@ -378,7 +378,7 @@ static OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, EventRef eve
 		switch ( theHICommand.commandID )
 		{
 			case kHICommandQuit:
-				mplayer_put_key(KEY_ESC);
+				mplayer_put_key(KEY_CLOSE_WIN);
 				break;
 				
 			case kHalfScreenCmd:
@@ -476,7 +476,7 @@ static OSStatus WindowEventHandler(EventHandlerCallRef nextHandler, EventRef eve
 		{
 			case kEventWindowClosed:
 				theWindow = NULL;
-				mplayer_put_key(KEY_ESC);
+				mplayer_put_key(KEY_CLOSE_WIN);
 				break;
 				
 			//resize window
diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c
index c13ba4bcd5..2d64e0c06c 100644
--- a/libvo/vo_sdl.c
+++ b/libvo/vo_sdl.c
@@ -1320,7 +1320,7 @@ static void check_events (void)
                                 }
                                 
 				break;
-				case SDL_QUIT: mplayer_put_key('q');break;
+				case SDL_QUIT: mplayer_put_key(KEY_CLOSE_WIN);break;
 		}
 	}
 }
diff --git a/libvo/vo_winvidix.c b/libvo/vo_winvidix.c
index 2f75d88c66..6cefdd5a3d 100644
--- a/libvo/vo_winvidix.c
+++ b/libvo/vo_winvidix.c
@@ -65,7 +65,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM l
 			PostQuitMessage(0);
 			return 0;
 	    case WM_CLOSE:
-			mp_input_queue_cmd(mp_input_parse_cmd("quit"));
+			mplayer_put_key(KEY_CLOSE_WIN);
 			break;
 		case WM_WINDOWPOSCHANGED:
            {
diff --git a/libvo/w32_common.c b/libvo/w32_common.c
index a58cf7976f..f2db75a40c 100644
--- a/libvo/w32_common.c
+++ b/libvo/w32_common.c
@@ -25,7 +25,7 @@ static int cursor = 1;
 static LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
     switch (message) {
 	case WM_CLOSE:
-	    mp_input_queue_cmd(mp_input_parse_cmd("quit"));
+	    mplayer_put_key(KEY_CLOSE_WIN);
 	    break;
         case WM_SYSCOMMAND:
 	    switch (wParam) {
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 3225eff464..e1272a090d 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -548,16 +548,16 @@ void vo_x11_putkey_ext(int keysym)
     switch (keysym)
     {
         case XF86XK_AudioPause:
-            mplayer_put_key(KEY_XF86_PAUSE);
+            mplayer_put_key(KEY_PAUSE);
             break;
         case XF86XK_AudioStop:
-            mplayer_put_key(KEY_XF86_STOP);
+            mplayer_put_key(KEY_STOP);
             break;
         case XF86XK_AudioPrev:
-            mplayer_put_key(KEY_XF86_PREV);
+            mplayer_put_key(KEY_PREV);
             break;
         case XF86XK_AudioNext:
-            mplayer_put_key(KEY_XF86_NEXT);
+            mplayer_put_key(KEY_NEXT);
             break;
         default:
             break;
@@ -587,6 +587,9 @@ void vo_x11_putkey(int key)
         case wsEscape:
             mplayer_put_key(KEY_ESC);
             break;
+        case wsTab:
+            mplayer_put_key(KEY_TAB);
+            break;
         case wsEnter:
             mplayer_put_key(KEY_ENTER);
             break;
@@ -647,14 +650,6 @@ void vo_x11_putkey(int key)
         case wsF12:
             mplayer_put_key(KEY_F + 12);
             break;
-        case wsq:
-        case wsQ:
-            mplayer_put_key('q');
-            break;
-        case wsp:
-        case wsP:
-            mplayer_put_key('p');
-            break;
         case wsMinus:
         case wsGrayMinus:
             mplayer_put_key('-');
@@ -728,15 +723,6 @@ void vo_x11_putkey(int key)
         case wsGrayEnter:
             mplayer_put_key(KEY_KPENTER);
             break;
-        case wsm:
-        case wsM:
-            mplayer_put_key('m');
-            break;
-        case wso:
-        case wsO:
-            mplayer_put_key('o');
-            break;
-
         case wsGrave:
             mplayer_put_key('`');
             break;