RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

fix other bugs 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2046 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pontscho 2001-10-02 15:01:56 +00:00
parent d65a7da221
commit 218548d50c
4 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gui/mplayer/mw.h
View File

@ -17,7 +17,7 @@ char * Translate( char * str )
static char trbuf[512];
char tmp[128];
int i,c;
int t,h,m,s;
int t;
memset( trbuf,0,512 );
memset( tmp,0,128 );
for ( c=0,i=0;i < strlen( str );i++ )

4
Gui/mplayer/play.c
View File

@ -52,6 +52,8 @@ void mplFullScreen( void )
wsWindowDecoration( &appMPlayer.subWindow,0 );
appMPlayer.subWindow.isFullScreen=1;
}
if ( mplShMem->Playing ) wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 );
else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
mplResize( 0,0,appMPlayer.subWindow.Width,appMPlayer.subWindow.Height );
}
@ -71,8 +73,8 @@ void mplStop()
wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
}
mplSubRender=1;
wsClearWindow( appMPlayer.subWindow );
wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
wsClearWindow( appMPlayer.subWindow );
wsPostRedisplay( &appMPlayer.subWindow );
}

15
Gui/mplayer/sw.h
View File

@ -6,7 +6,8 @@ int SubVisible = 0;
void mplSubDraw( wsParamDisplay )
{
if ( appMPlayer.subWindow.State == wsWindowFocusIn ) SubVisible=0;
if ( appMPlayer.subWindow.State == wsWindowFocusIn ) SubVisible++;
if ( !appMPlayer.subWindow.Mapped ||
appMPlayer.subWindow.Visible == wsWindowNotVisible ) return;
@ -64,8 +65,16 @@ void mplSubMouseHandle( int Button,int X,int Y,int RX,int RY )
// if ( ( !mplSubMoved )&&( ( SubVisible++%2 ) ) ) wsMoveTopWindow( &appMPlayer.mainWindow );
if ( !mplSubMoved )
{
if( SubVisible++%2 ) wsMoveTopWindow( &appMPlayer.subWindow );
else wsMoveTopWindow( &appMPlayer.mainWindow );
if( SubVisible++%2 )
{
wsMoveTopWindow( &appMPlayer.mainWindow );
fprintf( stderr,"[sw] MAIN TOP\n" );
}
else
{
wsMoveTopWindow( &appMPlayer.subWindow );
fprintf( stderr,"[sw] SUB TOP\n" );
}
}
msButton=0;
mplSubMoved=0;

16
Gui/wm/ws.c
View File

@ -613,8 +613,10 @@ buttonreleased:
break;
case PropertyNotify:
break;
fprintf(stderr,"[ws] PropertyNotify %s\n",XGetAtomName( wsDisplay,Event->xproperty.atom ) );
// break;
// #ifdef DEBUG
// fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",wsWindowList[l]->WindowID,XGetAtomName( wsDisplay,Event->xproperty.atom ),Event->xproperty.atom );
// #endif
if ( Event->xproperty.atom == wsWindowList[l]->AtomRemote )
{
Atom type;
@ -634,6 +636,9 @@ buttonreleased:
{
args[strlen( args ) - 1]=0;
wsWindowList[l]->RemoteHandler( args );
#ifdef DEBUG
fprintf( stderr,"[ws] args: '%s'\n",args );
#endif
args[strlen( args ) - 1]=1;
XFree( args );
}
@ -856,8 +861,10 @@ void wsIconify( wsTWindow win )
// Move top the window.
// ----------------------------------------------------------------------------------------------
void wsMoveTopWindow( wsTWindow * win )
{ XRaiseWindow( wsDisplay,win->WindowID ); }
//{ XUnmapWindow( wsDisplay,win->WindowID ); XMapWindow( wsDisplay,win->WindowID ); }
{
// XUnmapWindow( wsDisplay,win->WindowID ); XMapWindow( wsDisplay,win->WindowID );
XRaiseWindow( wsDisplay,win->WindowID );
}
// ----------------------------------------------------------------------------------------------
// Set window background to 'color'.
@ -897,7 +904,6 @@ void wsSetForegroundRGB( wsTWindow * win,int r,int g,int b )
case wsBGR15: PACK_RGB15( b,g,r,color ); break;
}
XSetForeground( wsDisplay,win->wGC,color );
// XSetWindowBackground( wsDisplay,win->WindowID,color );
}
// ----------------------------------------------------------------------------------------------