Mercurial > mplayer.hg

comparison Gui/mplayer/menu.h @ 3476:d8e46c2576c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix black ize
author pontscho
date Wed, 12 Dec 2001 22:42:38 +0000
parents fd44ecf77f8d
children a97f908988ed
comparison
equal deleted inserted replaced
3475:390388c75209 3476:d8e46c2576c5
12 unsigned long * buf = NULL; 12 unsigned long * buf = NULL;
13 unsigned long * drw = NULL; 13 unsigned long * drw = NULL;
14 unsigned long x,y,tmp; 14 unsigned long x,y,tmp;
15 15
16 if ( !appMPlayer.menuBase.Bitmap.Image ) return; 16 if ( !appMPlayer.menuBase.Bitmap.Image ) return;
17 if ( !appMPlayer.menuWindow.Visible ) return; 17 if ( !mplMenuRender && !appMPlayer.menuWindow.Visible ) return;
18 18
19 if ( mplMenuRender || mplMenuItem != mplOldMenuItem ) 19 if ( mplMenuRender || mplMenuItem != mplOldMenuItem )
20 { 20 {
21 memcpy( mplMenuDrawBuffer,appMPlayer.menuBase.Bitmap.Image,appMPlayer.menuBase.Bitmap.ImageSize ); 21 memcpy( mplMenuDrawBuffer,appMPlayer.menuBase.Bitmap.Image,appMPlayer.menuBase.Bitmap.ImageSize );
22 // --- 22 // ---
32 } 32 }
33 } 33 }
34 mplOldMenuItem=mplMenuItem; 34 mplOldMenuItem=mplMenuItem;
35 // --- 35 // ---
36 wsConvert( &appMPlayer.menuWindow,mplMenuDrawBuffer,appMPlayer.menuBase.Bitmap.ImageSize ); 36 wsConvert( &appMPlayer.menuWindow,mplMenuDrawBuffer,appMPlayer.menuBase.Bitmap.ImageSize );
37 // wsConvert( &appMPlayer.menuWindow,mplMenuDrawBuffer,appMPlayer.menuBase.Bitmap.Height * appMPlayer.menuBase.Bitmap.Width );
38 mplMenuRender=0; 37 mplMenuRender=0;
39 } 38 }
40 wsPutImage( &appMPlayer.menuWindow ); 39 wsPutImage( &appMPlayer.menuWindow );
41 } 40 }
42 41
78 mplMenuX=x; mplMenuY=y; 77 mplMenuX=x; mplMenuY=y;
79 78
80 mplMenuItem = 0; 79 mplMenuItem = 0;
81 80
82 wsMoveWindow( &appMPlayer.menuWindow,False,x,y ); 81 wsMoveWindow( &appMPlayer.menuWindow,False,x,y );
82 wsMoveTopWindow( &appMPlayer.menuWindow );
83 mplMenuRender=1;
83 wsVisibleWindow( &appMPlayer.menuWindow,wsShowWindow ); 84 wsVisibleWindow( &appMPlayer.menuWindow,wsShowWindow );
84 wsMoveTopWindow( &appMPlayer.menuWindow ); 85 wsPostRedisplay( &appMPlayer.menuWindow );
85 } 86 }
86 87
87 void mplHideMenu( int mx,int my ) 88 void mplHideMenu( int mx,int my )
88 { 89 {
89 int x,y,i=mplMenuItem; 90 int x,y,i=mplMenuItem;
97 98
98 wsVisibleWindow( &appMPlayer.menuWindow,wsHideWindow ); 99 wsVisibleWindow( &appMPlayer.menuWindow,wsHideWindow );
99 100
100 if ( ( x < 0 ) || ( y < 0 ) ) return; 101 if ( ( x < 0 ) || ( y < 0 ) ) return;
101 102
102 printf( "---------> %d %d,%d\n",i,x,y ); 103 // printf( "---------> %d %d,%d\n",i,x,y );
103 printf( "--------> mi: %d,%d %dx%d\n",appMPlayer.MenuItems[i].x,appMPlayer.MenuItems[i].y,appMPlayer.MenuItems[i].width,appMPlayer.MenuItems[i].height ); 104 // printf( "--------> mi: %d,%d %dx%d\n",appMPlayer.MenuItems[i].x,appMPlayer.MenuItems[i].y,appMPlayer.MenuItems[i].width,appMPlayer.MenuItems[i].height );
104 if ( wgIsRect( x,y, 105 if ( wgIsRect( x,y,
105 appMPlayer.MenuItems[i].x,appMPlayer.MenuItems[i].y, 106 appMPlayer.MenuItems[i].x,appMPlayer.MenuItems[i].y,
106 appMPlayer.MenuItems[i].x+appMPlayer.MenuItems[i].width, 107 appMPlayer.MenuItems[i].x+appMPlayer.MenuItems[i].width,
107 appMPlayer.MenuItems[i].y+appMPlayer.MenuItems[i].height ) ) 108 appMPlayer.MenuItems[i].y+appMPlayer.MenuItems[i].height ) )
108 { 109 {
136 #endif 137 #endif
137 138
138 appMPlayer.menuWindow.ReDraw=mplMenuDraw; 139 appMPlayer.menuWindow.ReDraw=mplMenuDraw;
139 // appMPlayer.menuWindow.MouseHandler=mplMenuMouseHandle; 140 // appMPlayer.menuWindow.MouseHandler=mplMenuMouseHandle;
140 // appMPlayer.menuWindow.KeyHandler=mplMainKeyHandle; 141 // appMPlayer.menuWindow.KeyHandler=mplMainKeyHandle;
141 142 mplMenuRender=1; wsPostRedisplay( &appMPlayer.menuWindow );
142 wsPostRedisplay( &appMPlayer.menuWindow );
143 } 143 }