mirror of
https://github.com/mpv-player/mpv
synced 2025-02-17 04:58:06 +00:00
no exit on fulscreen if you press esc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8303 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
00bd3d6184
commit
9dc15d4b69
@ -426,6 +426,7 @@ int guiGetEvent( int type,char * arg )
|
|||||||
switch ( type )
|
switch ( type )
|
||||||
{
|
{
|
||||||
case guiXEvent:
|
case guiXEvent:
|
||||||
|
guiIntfStruct.event_struct=(void *)arg;
|
||||||
wsEvents( wsDisplay,(XEvent *)arg,NULL );
|
wsEvents( wsDisplay,(XEvent *)arg,NULL );
|
||||||
gtkEventHandling();
|
gtkEventHandling();
|
||||||
break;
|
break;
|
||||||
|
@ -59,6 +59,7 @@ typedef struct
|
|||||||
guiUnknowErrorStruct error;
|
guiUnknowErrorStruct error;
|
||||||
|
|
||||||
void * sh_video;
|
void * sh_video;
|
||||||
|
void * event_struct;
|
||||||
|
|
||||||
int DiskChanged;
|
int DiskChanged;
|
||||||
|
|
||||||
|
@ -640,7 +640,7 @@ void mplMainKeyHandle( int KeyCode,int Type,int Key )
|
|||||||
{
|
{
|
||||||
switch ( Key )
|
switch ( Key )
|
||||||
{
|
{
|
||||||
case wsEnter: msg=evPlay; break;
|
case wsEnter: msg=evPlay; break;
|
||||||
case wsXF86LowerVolume: msg=evDecVolume; break;
|
case wsXF86LowerVolume: msg=evDecVolume; break;
|
||||||
case wsXF86RaiseVolume: msg=evIncVolume; break;
|
case wsXF86RaiseVolume: msg=evIncVolume; break;
|
||||||
case wsXF86Mute: msg=evMute; break;
|
case wsXF86Mute: msg=evMute; break;
|
||||||
@ -649,6 +649,14 @@ void mplMainKeyHandle( int KeyCode,int Type,int Key )
|
|||||||
case wsXF86Prev: msg=evPrev; break;
|
case wsXF86Prev: msg=evPrev; break;
|
||||||
case wsXF86Next: msg=evNext; break;
|
case wsXF86Next: msg=evNext; break;
|
||||||
case wsXF86Media: msg=evLoad; 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;
|
default: vo_x11_putkey( Key ); return;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user