no exit on fulscreen if you press esc

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

1 files changed, 9 insertions, 1 deletions

diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c
index 9d0a6fb6ae..678685d4c4 100644
--- a/Gui/mplayer/mw.c
+++ b/Gui/mplayer/mw.c
@@ -640,7 +640,7 @@ void mplMainKeyHandle( int KeyCode,int Type,int Key )
    {
     switch ( Key )
      {
-      case wsEnter:     msg=evPlay; break;
+      case wsEnter:            msg=evPlay; break;
       case wsXF86LowerVolume:  msg=evDecVolume; break;
       case wsXF86RaiseVolume:  msg=evIncVolume; break;
       case wsXF86Mute:         msg=evMute; break;
@@ -649,6 +649,14 @@ void mplMainKeyHandle( int KeyCode,int Type,int Key )
       case wsXF86Prev:         msg=evPrev; break;
       case wsXF86Next:         msg=evNext; break;
       case wsXF86Media:        msg=evLoad; break;
+      case wsEscape:
+    	    if ( appMPlayer.subWindow.isFullScreen )
+	     { 
+	      if ( guiIntfStruct.event_struct )
+	       { memset( guiIntfStruct.event_struct,0,sizeof( XEvent ) ); guiIntfStruct.event_struct=NULL; }
+	      mplEventHandling( evNormalSize,0 ); 
+	      break; 
+	     }
 
       default:          vo_x11_putkey( Key ); return;
      }