# HG changeset patch
# User pontscho
# Date 1038444264 0
# Node ID c7fa49f1de0afacd2d53e13a41edde82945e3ea4
# Parent  d867439e39403a8f60adaf6c3a6bdbe03e27c518
no exit on fulscreen if you press esc

diff -r d867439e3940 -r c7fa49f1de0a Gui/interface.c
--- a/Gui/interface.c	Wed Nov 27 23:47:14 2002 +0000
+++ b/Gui/interface.c	Thu Nov 28 00:44:24 2002 +0000
@@ -426,6 +426,7 @@
  switch ( type )
   {
    case guiXEvent:
+	guiIntfStruct.event_struct=(void *)arg;
         wsEvents( wsDisplay,(XEvent *)arg,NULL );
         gtkEventHandling();
         break;
diff -r d867439e3940 -r c7fa49f1de0a Gui/interface.h
--- a/Gui/interface.h	Wed Nov 27 23:47:14 2002 +0000
+++ b/Gui/interface.h	Thu Nov 28 00:44:24 2002 +0000
@@ -59,6 +59,7 @@
    guiUnknowErrorStruct error;
    
    void * sh_video;
+   void * event_struct;
 
    int    DiskChanged;
 
diff -r d867439e3940 -r c7fa49f1de0a Gui/mplayer/mw.c
--- a/Gui/mplayer/mw.c	Wed Nov 27 23:47:14 2002 +0000
+++ b/Gui/mplayer/mw.c	Thu Nov 28 00:44:24 2002 +0000
@@ -640,7 +640,7 @@
    {
     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 @@
       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;
      }