Mercurial > mplayer.hg
diff Gui/interface.c @ 8973:0a665389cf2b
- add playbar
- add vpotmeter
- fix gtk menu's pixel bug
- fix some critical (10l) bug
author | pontscho |
---|---|
date | Fri, 17 Jan 2003 22:39:43 +0000 |
parents | d07ab8e088a9 |
children | 4a42c0604ce1 |
line wrap: on
line diff
--- a/Gui/interface.c Fri Jan 17 21:44:58 2003 +0000 +++ b/Gui/interface.c Fri Jan 17 22:39:43 2003 +0000 @@ -203,6 +203,9 @@ wsCreateImage( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Width,appMPlayer.sub.Bitmap.Height ); wsXDNDMakeAwareness(&appMPlayer.subWindow); + mplMenuInit(); + mplPBInit(); + vo_setwindow( appMPlayer.subWindow.WindowID, appMPlayer.subWindow.wGC ); // i=wsHideFrame|wsMaxSize|wsHideWindow; @@ -215,8 +218,6 @@ wsSetShape( &appMPlayer.mainWindow,appMPlayer.main.Mask.Image ); wsXDNDMakeAwareness(&appMPlayer.mainWindow); - mplMenuInit(); - #ifdef DEBUG mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] Depth on screen: %d\n",wsDepthOnScreen ); mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[main] parent: 0x%x\n",(int)appMPlayer.mainWindow.WindowID ); @@ -233,7 +234,7 @@ appMPlayer.subWindow.KeyHandler=mplMainKeyHandle; appMPlayer.subWindow.DandDHandler=mplDandDHandler; - wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB ); + wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.sub.R,appMPlayer.sub.G,appMPlayer.sub.B ); wsClearWindow( appMPlayer.subWindow ); if ( appMPlayer.sub.Bitmap.Image ) wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize ); @@ -433,7 +434,7 @@ switch ( type ) { case guiXEvent: - guiIntfStruct.event_struct=(void *)arg; + guiIntfStruct.event_struct=(void *)arg; wsEvents( wsDisplay,(XEvent *)arg,NULL ); gtkEventHandling(); break;