# HG changeset patch # User pontscho # Date 1080251388 0 # Node ID df423e2d71dc170306d468c85dfe750068a30eed # Parent 22c74dfb2bafa0e65e9f58234d4b62d64111f404 patch from Rune diff -r 22c74dfb2baf -r df423e2d71dc Gui/interface.c --- a/Gui/interface.c Thu Mar 25 21:46:21 2004 +0000 +++ b/Gui/interface.c Thu Mar 25 21:49:48 2004 +0000 @@ -135,7 +135,7 @@ 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 @@ 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 -r 22c74dfb2baf -r df423e2d71dc Gui/mplayer/play.c --- a/Gui/mplayer/play.c Thu Mar 25 21:46:21 2004 +0000 +++ b/Gui/mplayer/play.c Thu Mar 25 21:49:48 2004 +0000 @@ -95,11 +95,12 @@ 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 -r 22c74dfb2baf -r df423e2d71dc Gui/wm/wsxdnd.c --- a/Gui/wm/wsxdnd.c Thu Mar 25 21:46:21 2004 +0000 +++ b/Gui/wm/wsxdnd.c Thu Mar 25 21:49:48 2004 +0000 @@ -122,7 +122,7 @@ /* Handle the files */ if(wnd->DandDHandler){ - wnd->DandDHandler(num,files); + wnd->DandDHandler(num-1,files); } }