diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-28 00:44:24 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-28 00:44:24 +0000 |
| commit | 9dc15d4b691501d1a91d76ba03b2bdf047a1d417 (patch) | |
| tree | 7f8a402f5dc3f0cb5f90a20d08701de047d8e1fe /Gui | |
| parent | 00bd3d61849aac4d16b7e183c86393ef23e36b31 (diff) | |
| download | mpv-9dc15d4b691501d1a91d76ba03b2bdf047a1d417.tar.bz2 mpv-9dc15d4b691501d1a91d76ba03b2bdf047a1d417.tar.xz | |
no exit on fulscreen if you press esc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8303 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/interface.c | 1 | ||||
| -rw-r--r-- | Gui/interface.h | 1 | ||||
| -rw-r--r-- | Gui/mplayer/mw.c | 10 |
3 files changed, 11 insertions, 1 deletions
diff --git a/Gui/interface.c b/Gui/interface.c index e378981ac2..c3ef86fbf4 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -426,6 +426,7 @@ int guiGetEvent( int type,char * arg ) switch ( type ) { case guiXEvent: + guiIntfStruct.event_struct=(void *)arg; wsEvents( wsDisplay,(XEvent *)arg,NULL ); gtkEventHandling(); break; diff --git a/Gui/interface.h b/Gui/interface.h index 5e1dd7829f..d16a86d618 100644 --- a/Gui/interface.h +++ b/Gui/interface.h @@ -59,6 +59,7 @@ typedef struct guiUnknowErrorStruct error; void * sh_video; + void * event_struct; int DiskChanged; 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; } |