gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

Made the menus be mapped on the center of the screen when invoked with the

Browse Source 
keyboard shortcuts.
This commit is contained in:
dan
2001-04-20 01:22:41 +00:00
parent 656a1c17e4
commit eb11184ef0
3 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/event.c
View File

@@ -1359,11 +1359,13 @@ handleKeyPress(XEvent *event)
switch (command) { switch (command) {
#ifndef LITE #ifndef LITE
case WKBD_ROOTMENU: case WKBD_ROOTMENU:
OpenRootMenu(scr, event->xkey.x_root, event->xkey.y_root, True); /*OpenRootMenu(scr, event->xkey.x_root, event->xkey.y_root, True);*/
break; OpenRootMenu(scr, scr->scr_width/2, scr->scr_height/2, True);
break;
case WKBD_WINDOWLIST: case WKBD_WINDOWLIST:
OpenSwitchMenu(scr, event->xkey.x_root, event->xkey.y_root, True); /*OpenSwitchMenu(scr, event->xkey.x_root, event->xkey.y_root, True);*/
break; OpenSwitchMenu(scr, scr->scr_width/2, scr->scr_height/2, True);
break;
#endif /* !LITE */ #endif /* !LITE */
case WKBD_WINDOWMENU: case WKBD_WINDOWMENU:
if (ISMAPPED(wwin) && ISFOCUSED(wwin)) if (ISMAPPED(wwin) && ISFOCUSED(wwin))

13
src/rootmenu.c
View File

@@ -1803,7 +1803,18 @@ OpenRootMenu(WScreen *scr, int x, int y, int keyboard)
scr->root_menu = menu; scr->root_menu = menu;
} }
if (menu) { if (menu) {
wMenuMapAt(menu, x-menu->frame->core->width/2, y, keyboard); int newx, newy;
if (keyboard && x==0 && y==0) {
newx = newy = 0;
} else if (keyboard && x==scr->scr_width/2 && y==scr->scr_height/2) {
newx = x - menu->frame->core->width/2;
newy = y - menu->frame->core->height/2;
} else {
newx = x - menu->frame->core->width/2;
newy = y;
}
wMenuMapAt(menu, newx, newy, keyboard);
} }
if (scr->flags.root_menu_changed_shortcuts) if (scr->flags.root_menu_changed_shortcuts)

15
src/switchmenu.c
View File

@@ -123,10 +123,21 @@ OpenSwitchMenu(WScreen *scr, int x, int y, int keyboard)
} }
if (switchmenu) { if (switchmenu) {
int newx, newy;
if (!switchmenu->flags.realized) if (!switchmenu->flags.realized)
wMenuRealize(switchmenu); wMenuRealize(switchmenu);
wMenuMapAt(switchmenu, x-switchmenu->frame->core->width/2, y,
keyboard); if (keyboard && x==0 && y==0) {
newx = newy = 0;
} else if (keyboard && x==scr->scr_width/2 && y==scr->scr_height/2) {
newx = x - switchmenu->frame->core->width/2;
newy = y - switchmenu->frame->core->height/2;
} else {
newx = x - switchmenu->frame->core->width/2;
newy = y;
}
wMenuMapAt(switchmenu, newx, newy, keyboard);
} }
} }