annotate gui/ui/menu.c @ 35802:2849b02700e5

Remove pointless menuIsInitialized. The draw handler won't be called prior to the initialization, because it is set only during initialization.
author ib
date Sat, 26 Jan 2013 00:45:58 +0000
parents 497a1c45a597
children 8e5a3da0a858
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26458
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
1 /*
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
2 * This file is part of MPlayer.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
3 *
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
5 * it under the terms of the GNU General Public License as published by
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
7 * (at your option) any later version.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
8 *
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
12 * GNU General Public License for more details.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
13 *
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
14 * You should have received a copy of the GNU General Public License along
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
b0a7b35b78d2 Add standard GPL header to individual files.
diego
parents: 26382
diff changeset
17 */
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
18
34699
ed0e00db4306 Cosmetic: Move, change and add some comments on GUI windows.
ib
parents: 34684
diff changeset
19 /* menu window */
ed0e00db4306 Cosmetic: Move, change and add some comments on GUI windows.
ib
parents: 34684
diff changeset
20
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
21 #include <stdlib.h>
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
22 #include <stdio.h>
33123
9566100d88a1 Replace inttypes.h by stdint.h and remove inttypes.h where unneeded.
ib
parents: 33084
diff changeset
23 #include <stdint.h>
33738
998f94e62a61 Remove unnecessary #include "gui/interface.h".
ib
parents: 33556
diff changeset
24 #include <string.h>
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
25
26382
b2f4abcf20ed Make include paths consistent; do not use ../ in them.
diego
parents: 26365
diff changeset
26 #include "help_mp.h"
b2f4abcf20ed Make include paths consistent; do not use ../ in them.
diego
parents: 26365
diff changeset
27 #include "mp_msg.h"
35525
e27855a45128 Rebuild GUI directory structure.
ib
parents: 35493
diff changeset
28 #include "gui/app/app.h"
e27855a45128 Rebuild GUI directory structure.
ib
parents: 35493
diff changeset
29 #include "gui/app/gui.h"
35772
3fec1d4b2736 Relocate uiMainEvent() prototype.
ib
parents: 35768
diff changeset
30 #include "actions.h"
35528
ab07b17fddfb Rebuild GUI directory structure.
ib
parents: 35525
diff changeset
31 #include "ui.h"
35796
497a1c45a597 Add uiMainDone(), uiVideoDone(), uiPlaybarDone() and uiMenuDone().
ib
parents: 35782
diff changeset
32 #include "gui/util/mem.h"
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
33
35529
8ad4d2fb46e8 Rebuild GUI directory structure.
ib
parents: 35528
diff changeset
34 #include "gui/dialog/dialog.h"
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
35
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
36 unsigned char * menuDrawBuffer = NULL;
35750
b4599f797483 Rename menuRender uiMenuRender and make it static.
ib
parents: 35744
diff changeset
37 static int uiMenuRender = True;
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
38 int menuItem = -1;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
39 int oldMenuItem = -1;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
40 int menuX,menuY;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
41
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
42 static void uiMenuDraw( void )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
43 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
44 uint32_t * buf = NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
45 uint32_t * drw = NULL;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
46 int x,y,tmp;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
47
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
48 if ( !guiApp.menuIsPresent || !guiApp.menu.Bitmap.Image ) return;
35750
b4599f797483 Rename menuRender uiMenuRender and make it static.
ib
parents: 35744
diff changeset
49 if ( !uiMenuRender && !guiApp.menuWindow.Visible ) return;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
50
35750
b4599f797483 Rename menuRender uiMenuRender and make it static.
ib
parents: 35744
diff changeset
51 if ( uiMenuRender || menuItem != oldMenuItem )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
52 {
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
53 memcpy( menuDrawBuffer,guiApp.menu.Bitmap.Image,guiApp.menu.Bitmap.ImageSize );
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34472
diff changeset
54 /* --- */
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
55 if ( menuItem != -1 )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
56 {
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
57 buf=(uint32_t *)menuDrawBuffer;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
58 drw=(uint32_t *)guiApp.menuSelected.Bitmap.Image;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
59 for ( y=guiApp.menuItems[ menuItem ].y; y < guiApp.menuItems[ menuItem ].y + guiApp.menuItems[ menuItem ].height; y++ )
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
60 for ( x=guiApp.menuItems[ menuItem ].x; x < guiApp.menuItems[ menuItem ].x + guiApp.menuItems[ menuItem ].width; x++ )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
61 {
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
62 tmp=drw[ y * guiApp.menuSelected.width + x ];
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
63 if ( !IS_TRANSPARENT ( tmp ) ) buf[ y * guiApp.menu.width + x ]=tmp;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
64 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
65 }
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
66 oldMenuItem=menuItem;
34684
b03481253518 Cosmetic: Prefer C style for single line comments.
ib
parents: 34472
diff changeset
67 /* --- */
35744
bfe51acc36fb Cosmetic: Rename wsImageConvert() wsImageRender().
ib
parents: 35683
diff changeset
68 wsImageRender( &guiApp.menuWindow,menuDrawBuffer );
35750
b4599f797483 Rename menuRender uiMenuRender and make it static.
ib
parents: 35744
diff changeset
69 uiMenuRender=False;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
70 }
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35675
diff changeset
71 wsImageDraw( &guiApp.menuWindow );
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
72 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
73
35778
8ba56e7c14fb Set MouseHandler for menu window.
ib
parents: 35773
diff changeset
74 static void uiMenuMouse( int Button,int X,int Y,int RX,int RY )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
75 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
76 int x,y,i;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
77
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
78 if ( !guiApp.menu.Bitmap.Image ) return;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
79
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
80 menuItem=-1;
35778
8ba56e7c14fb Set MouseHandler for menu window.
ib
parents: 35773
diff changeset
81 x=X - guiApp.menuWindow.X;
8ba56e7c14fb Set MouseHandler for menu window.
ib
parents: 35773
diff changeset
82 y=Y - guiApp.menuWindow.Y;
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
83 if ( ( x < 0 ) || ( y < 0 ) || ( x > guiApp.menu.width ) || ( y > guiApp.menu.height ) )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
84 {
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35675
diff changeset
85 wsWindowRedraw( &guiApp.menuWindow );
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
86 return;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
87 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
88
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
89 for( i=0;i<=guiApp.IndexOfMenuItems;i++ )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
90 {
35675
9e2183017f1f Move wgIsRect from ws.h to gui.h.
ib
parents: 35658
diff changeset
91 if ( isInside( x,y,
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
92 guiApp.menuItems[i].x,guiApp.menuItems[i].y,
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
93 guiApp.menuItems[i].x+guiApp.menuItems[i].width,guiApp.menuItems[i].y+guiApp.menuItems[i].height ) ) { menuItem=i; break; }
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
94 }
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35675
diff changeset
95 wsWindowRedraw( &guiApp.menuWindow );
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
96 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
97
35767
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
98 void uiMenuInit( void )
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
99 {
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
100
35802
2849b02700e5 Remove pointless menuIsInitialized.
ib
parents: 35796
diff changeset
101 if ( !guiApp.menuIsPresent || !guiApp.menu.Bitmap.Image ) return;
35767
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
102
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
103 guiApp.menu.x=0;
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
104 guiApp.menu.y=0;
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
105
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
106 if ( ( menuDrawBuffer = calloc( 1,guiApp.menu.Bitmap.ImageSize ) ) == NULL )
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
107 {
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
108 mp_msg( MSGT_GPLAYER,MSGL_DBG2,MSGTR_NEMFMR );
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
109 gtkMessageBox( GTK_MB_FATAL,MSGTR_NEMFMR );
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
110 return;
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
111 }
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
112
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
113 wsWindowCreate( &guiApp.menuWindow,
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
114 guiApp.menu.x,guiApp.menu.y,guiApp.menu.width,guiApp.menu.height,
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
115 wsOverredirect|wsHideFrame|wsMaxSize|wsMinSize|wsHideWindow,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,"MPlayer menu" );
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
116
35782
e30d541b3ea6 Relocate menu window initialization debug message.
ib
parents: 35780
diff changeset
117 mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[menu] menuWindow ID: 0x%x\n",(int)guiApp.menuWindow.WindowID );
35767
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
118
35782
e30d541b3ea6 Relocate menu window initialization debug message.
ib
parents: 35780
diff changeset
119 wsWindowShape( &guiApp.menuWindow,guiApp.menu.Mask.Image );
35767
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
120
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
121 guiApp.menuWindow.DrawHandler=uiMenuDraw;
35778
8ba56e7c14fb Set MouseHandler for menu window.
ib
parents: 35773
diff changeset
122 guiApp.menuWindow.MouseHandler=uiMenuMouse;
35780
4073fff5efc7 Add new functions uiMainInit() and uiVideoInit().
ib
parents: 35778
diff changeset
123 // guiApp.menuWindow.KeyHandler=guiApp.mainWindow.KeyHandler;
35767
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
124 uiMenuRender=True; wsWindowRedraw( &guiApp.menuWindow );
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
125 }
23e241430e9c Cosmetic: Replace uiMenuInit().
ib
parents: 35766
diff changeset
126
35796
497a1c45a597 Add uiMainDone(), uiVideoDone(), uiPlaybarDone() and uiMenuDone().
ib
parents: 35782
diff changeset
127 void uiMenuDone( void )
497a1c45a597 Add uiMainDone(), uiVideoDone(), uiPlaybarDone() and uiMenuDone().
ib
parents: 35782
diff changeset
128 {
497a1c45a597 Add uiMainDone(), uiVideoDone(), uiPlaybarDone() and uiMenuDone().
ib
parents: 35782
diff changeset
129 nfree(menuDrawBuffer);
497a1c45a597 Add uiMainDone(), uiVideoDone(), uiPlaybarDone() and uiMenuDone().
ib
parents: 35782
diff changeset
130 wsWindowDestroy(&guiApp.menuWindow);
497a1c45a597 Add uiMainDone(), uiVideoDone(), uiPlaybarDone() and uiMenuDone().
ib
parents: 35782
diff changeset
131 }
497a1c45a597 Add uiMainDone(), uiVideoDone(), uiPlaybarDone() and uiMenuDone().
ib
parents: 35782
diff changeset
132
35766
16ed8155439b Rename uiShowMenu() uiMenuShow() and uiHideMenu() uiMenuHide().
ib
parents: 35762
diff changeset
133 void uiMenuShow( int mx,int my )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
134 {
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
135 int x,y;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
136
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
137 if ( !guiApp.menuIsPresent || !guiApp.menu.Bitmap.Image ) return;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
138
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
139 x=mx;
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
140 if ( x + guiApp.menuWindow.Width > wsMaxX ) x=wsMaxX - guiApp.menuWindow.Width - 1 + wsOrgX;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
141 y=my;
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
142 if ( y + guiApp.menuWindow.Height > wsMaxY ) y=wsMaxY - guiApp.menuWindow.Height - 1 + wsOrgY;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
143
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
144 menuX=x; menuY=y;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
145
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
146 menuItem = 0;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
147
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35675
diff changeset
148 wsWindowMove( &guiApp.menuWindow,True,x,y );
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35675
diff changeset
149 wsWindowRaiseTop( wsDisplay,guiApp.menuWindow.WindowID );
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35675
diff changeset
150 wsWindowLayer( wsDisplay,guiApp.menuWindow.WindowID,1 );
35750
b4599f797483 Rename menuRender uiMenuRender and make it static.
ib
parents: 35744
diff changeset
151 uiMenuRender=True;
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35675
diff changeset
152 wsWindowVisibility( &guiApp.menuWindow,wsShowWindow );
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35675
diff changeset
153 wsWindowRedraw( &guiApp.menuWindow );
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
154 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
155
35766
16ed8155439b Rename uiShowMenu() uiMenuShow() and uiHideMenu() uiMenuHide().
ib
parents: 35762
diff changeset
156 void uiMenuHide( int mx,int my,int w )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
157 {
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
158 int x,y,i=menuItem;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
159
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
160 if ( !guiApp.menuIsPresent || !guiApp.menu.Bitmap.Image ) return;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
161
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
162 x=mx-menuX;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
163 y=my-menuY;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
164 // x=RX - guiApp.menuWindow.X;
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
165 // y=RY - guiApp.menuWindow.Y;
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
166
35681
80c5c89f77d6 Cosmetic: Rename ws functions for the sake of consistency.
ib
parents: 35675
diff changeset
167 wsWindowVisibility( &guiApp.menuWindow,wsHideWindow );
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
168
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
169 if ( ( x < 0 ) || ( y < 0 ) ) return;
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
170
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
171 // printf( "---------> %d %d,%d\n",i,x,y );
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
172 // printf( "--------> mi: %d,%d %dx%d\n",guiApp.menuItems[i].x,guiApp.menuItems[i].y,guiApp.menuItems[i].width,guiApp.menuItems[i].height );
35675
9e2183017f1f Move wgIsRect from ws.h to gui.h.
ib
parents: 35658
diff changeset
173 if ( isInside( x,y,
33555
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
174 guiApp.menuItems[i].x,guiApp.menuItems[i].y,
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
175 guiApp.menuItems[i].x+guiApp.menuItems[i].width,
c5a19bbeac2b Cosmetic: Rename some GUI variables and functions.
ib
parents: 33548
diff changeset
176 guiApp.menuItems[i].y+guiApp.menuItems[i].height ) )
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
177 {
35773
c688b0dcbe66 Cosmetic: Rename uiMainEvent() uiEvent().
ib
parents: 35772
diff changeset
178 uiEvent( guiApp.menuItems[i].message,(float)w );
23077
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
179 }
17bf4f4b0715 Gui --> gui
diego
parents:
diff changeset
180 }