Mercurial > mplayer.hg

changeset 8302:c7fa49f1de0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
no exit on fulscreen if you press esc
author pontscho
date Thu, 28 Nov 2002 00:44:24 +0000
parents d867439e3940
children 322f1a91a5e7
files Gui/interface.c Gui/interface.h Gui/mplayer/mw.c
diffstat 3 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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;
 
--- 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;
      }