mirror of
https://github.com/morgant/mlvwm.git
synced 2024-11-22 01:31:16 +00:00
Renamed misspelled ChoiseMenu() to ChooseMenu() in functions.c & menus.c. Issue #48
This commit is contained in:
parent
cbab6e0fa5
commit
add1272285
@ -125,7 +125,7 @@ void MapIt( MlvwmWindow *t )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
MlvwmWindow *ChoiseWindow( XEvent *ev, int cursor )
|
MlvwmWindow *ChooseWindow( XEvent *ev, int cursor )
|
||||||
{
|
{
|
||||||
Bool loop=True;
|
Bool loop=True;
|
||||||
MlvwmWindow *tmp_win;
|
MlvwmWindow *tmp_win;
|
||||||
@ -160,7 +160,7 @@ void MoveWindowFunction( char *action )
|
|||||||
MlvwmWindow *tmp_win;
|
MlvwmWindow *tmp_win;
|
||||||
XEvent ev;
|
XEvent ev;
|
||||||
|
|
||||||
tmp_win = ChoiseWindow( &ev, MOVE );
|
tmp_win = ChooseWindow( &ev, MOVE );
|
||||||
if( !tmp_win ){
|
if( !tmp_win ){
|
||||||
XBell( dpy, 30 );
|
XBell( dpy, 30 );
|
||||||
return;
|
return;
|
||||||
@ -173,7 +173,7 @@ void ResizeWindowFunction( char *action )
|
|||||||
MlvwmWindow *tmp_win;
|
MlvwmWindow *tmp_win;
|
||||||
XEvent ev;
|
XEvent ev;
|
||||||
|
|
||||||
tmp_win = ChoiseWindow( &ev, MOVE );
|
tmp_win = ChooseWindow( &ev, MOVE );
|
||||||
if( !tmp_win ){
|
if( !tmp_win ){
|
||||||
XBell( dpy, 30 );
|
XBell( dpy, 30 );
|
||||||
return;
|
return;
|
||||||
@ -190,7 +190,7 @@ void KillWindowFunction( char *action )
|
|||||||
Window JunkRoot;
|
Window JunkRoot;
|
||||||
unsigned int JunkWidth, JunkHeight, JunkBW, JunkDepth;
|
unsigned int JunkWidth, JunkHeight, JunkBW, JunkDepth;
|
||||||
|
|
||||||
tmp_win = ChoiseWindow( &ev, DESTROY );
|
tmp_win = ChooseWindow( &ev, DESTROY );
|
||||||
if( !tmp_win ){
|
if( !tmp_win ){
|
||||||
XBell( dpy, 30 );
|
XBell( dpy, 30 );
|
||||||
return;
|
return;
|
||||||
@ -209,7 +209,7 @@ void ToggleScrollFunction( char *action )
|
|||||||
MlvwmWindow *tmp_win;
|
MlvwmWindow *tmp_win;
|
||||||
XEvent ev;
|
XEvent ev;
|
||||||
|
|
||||||
tmp_win = ChoiseWindow( &ev, SELECT );
|
tmp_win = ChooseWindow( &ev, SELECT );
|
||||||
if( !tmp_win ){
|
if( !tmp_win ){
|
||||||
XBell( dpy, 30 );
|
XBell( dpy, 30 );
|
||||||
return;
|
return;
|
||||||
|
@ -492,7 +492,7 @@ void DrawMenuItemAll( MenuLabel *ml )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Bool ChoiseMenu( MenuLabel *m, Window *entwin, int ignore, Bool side )
|
Bool ChooseMenu( MenuLabel *m, Window *entwin, int ignore, Bool side )
|
||||||
{
|
{
|
||||||
Bool isEnd = False, finishall=False, Release=False, ChildSide=True;
|
Bool isEnd = False, finishall=False, Release=False, ChildSide=True;
|
||||||
XEvent Event;
|
XEvent Event;
|
||||||
@ -515,7 +515,7 @@ Bool ChoiseMenu( MenuLabel *m, Window *entwin, int ignore, Bool side )
|
|||||||
if( XFindContext( dpy, Event.xcrossing.window, MenuContext,
|
if( XFindContext( dpy, Event.xcrossing.window, MenuContext,
|
||||||
(caddr_t *)&tmp_menu )!=XCNOENT ){
|
(caddr_t *)&tmp_menu )!=XCNOENT ){
|
||||||
if( mapped && (mapped == tmp_menu) ) {
|
if( mapped && (mapped == tmp_menu) ) {
|
||||||
finishall = ChoiseMenu( mapped, entwin, ignore, ChildSide );
|
finishall = ChooseMenu( mapped, entwin, ignore, ChildSide );
|
||||||
if ( entwin && (*entwin != m->PullWin) ) isEnd = True;
|
if ( entwin && (*entwin != m->PullWin) ) isEnd = True;
|
||||||
}
|
}
|
||||||
else if( m && ((tmp_menu != m) || (Event.xcrossing.window == m->LabelWin)) ) {
|
else if( m && ((tmp_menu != m) || (Event.xcrossing.window == m->LabelWin)) ) {
|
||||||
@ -651,7 +651,7 @@ void press_menu( MenuLabel *m )
|
|||||||
MENUB_H-1, True );
|
MENUB_H-1, True );
|
||||||
}
|
}
|
||||||
else if( Event.xcrossing.window==mapped->PullWin ){
|
else if( Event.xcrossing.window==mapped->PullWin ){
|
||||||
isEnd = ChoiseMenu( mapped, &entwin, ignore, Side );
|
isEnd = ChooseMenu( mapped, &entwin, ignore, Side );
|
||||||
if ( entwin && (entwin == Scr.MenuBar) ) {
|
if ( entwin && (entwin == Scr.MenuBar) ) {
|
||||||
UnmapMenu( mapped, UNMAP_ALL );
|
UnmapMenu( mapped, UNMAP_ALL );
|
||||||
mapped = NULL;
|
mapped = NULL;
|
||||||
|
Loading…
Reference in New Issue
Block a user