diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-03-25 21:49:48 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-03-25 21:49:48 +0000 |
| commit | d1d9313755f0300713bb2fa5ce721a3f24e60a12 (patch) | |
| tree | e0f4cf0a3311aedcfaea23b98f3b92ce0679870f /Gui | |
| parent | bf08296b42fd9a63c618d4ab2bc6b96342170de9 (diff) | |
| download | mpv-d1d9313755f0300713bb2fa5ce721a3f24e60a12.tar.bz2 mpv-d1d9313755f0300713bb2fa5ce721a3f24e60a12.tar.xz | |
patch from Rune <runner@mail.tele.dk>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12069 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/interface.c | 4 | ||||
| -rw-r--r-- | Gui/mplayer/play.c | 3 | ||||
| -rw-r--r-- | Gui/wm/wsxdnd.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/Gui/interface.c b/Gui/interface.c index 801176f812..8778002c05 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -135,7 +135,7 @@ char * gconvert_uri_to_filename( char * str ) if ( out[i] != '%' ) t[c++]=out[i]; else { - char tmp[4] = "0xXX"; + char tmp[5] = "0xXX"; // if ( out[++i] == '%' ) { t[c++]='%'; continue; }; tmp[2]=out[++i]; tmp[3]=out[++i]; t[c++]=(char)strtol( tmp,(char **)NULL,0 ); @@ -520,7 +520,7 @@ int guiGetEvent( int type,char * arg ) break; case guiSetStop: guiIntfStruct.Playing=0; - if ( !gtkShowVideoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow ); +// if ( !gtkShowVideoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow ); break; case guiSetPause: guiIntfStruct.Playing=2; break; } diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index 37d4cb6782..c784e7d58e 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -95,11 +95,12 @@ void mplEnd( void ) guiIntfStruct.DVD.current_angle=1; #endif - if ( !appMPlayer.subWindow.isFullScreen ) + if ( !appMPlayer.subWindow.isFullScreen && gtkShowVideoWindow) { wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height ); wsMoveWindow( &appMPlayer.subWindow,True,appMPlayer.sub.x,appMPlayer.sub.y ); } + else wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow ); guiGetEvent( guiCEvent,guiSetStop ); mplSubRender=1; wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.sub.R,appMPlayer.sub.G,appMPlayer.sub.B ); diff --git a/Gui/wm/wsxdnd.c b/Gui/wm/wsxdnd.c index cc755e6e4b..b05c65abb5 100644 --- a/Gui/wm/wsxdnd.c +++ b/Gui/wm/wsxdnd.c @@ -122,7 +122,7 @@ wsXDNDProcessSelection(wsTWindow* wnd, XEvent *event) /* Handle the files */ if(wnd->DandDHandler){ - wnd->DandDHandler(num,files); + wnd->DandDHandler(num-1,files); } } |