I had a commit message but my commit got stepped on so fuck it. No one cares what I think anyway. If the menu navigation isn't EXACTLY FUCKING RIGHT I WILL REMOVE IT AND SOME OTHER POOR FUCK CAN PUT UP WITH ALL THE FUCKING BULLSHIT.
Scott Moynes smoynes@nexus.carleton.ca
5 files changed,
72 insertions(+),
174 deletions(-)
M
openbox/event.c
→
openbox/event.c
@@ -986,24 +986,16 @@ if (e->xkey.keycode == ob_keycode(OB_KEY_DOWN))
over = menu_control_keyboard_nav(over, OB_KEY_DOWN); else if (e->xkey.keycode == ob_keycode(OB_KEY_UP)) over = menu_control_keyboard_nav(over, OB_KEY_UP); - else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN)) - over = menu_control_keyboard_nav(over, OB_KEY_RETURN); - else if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) - over = menu_control_keyboard_nav(over, OB_KEY_ESCAPE); + else if (e->xkey.keycode == ob_keycode(OB_KEY_RIGHT)) /* fuck */ + over = menu_control_keyboard_nav(over, OB_KEY_RIGHT); + else if (e->xkey.keycode == ob_keycode(OB_KEY_LEFT)) /* users */ + over = menu_control_keyboard_nav(over, OB_KEY_LEFT); else { if (over) { - if (over->parent->mouseover) - over->parent->mouseover(over, FALSE); - else - menu_control_mouseover(over, FALSE); - menu_entry_render(over); + over->parent->mouseover(over, FALSE); over = NULL; } -/* - if (top->hide) - top->hide(top); - else -*/ + menu_hide(top); } break;@@ -1013,8 +1005,6 @@
ob_debug("BUTTON PRESS\n"); break; case ButtonRelease: - if (e->xbutton.button > 3) break; - ob_debug("BUTTON RELEASED\n"); for (it = menu_visible; it; it = g_list_next(it)) {@@ -1031,14 +1021,13 @@ m->location.x,
e->xbutton.y_root - m->location.y))) { if (over) { - if (over->parent->mouseover) - over->parent->mouseover(over, FALSE); - else - menu_control_mouseover(over, FALSE); - menu_entry_render(over); + over->parent->mouseover(over, FALSE); + /* this hides the menu */ + + over->parent->selected(entry, e->xbutton.button, + e->xbutton.x_root, + e->xbutton.y_root); over = NULL; - /* this hides the menu */ - menu_entry_fire(entry); } } break;@@ -1046,11 +1035,7 @@ }
} if (!it) { if (over) { - if (over->parent->mouseover) - over->parent->mouseover(over, FALSE); - else - menu_control_mouseover(over, FALSE); - menu_entry_render(over); + over->parent->mouseover(over, FALSE); over = NULL; } /*@@ -1072,28 +1057,16 @@ m->location.x,
e->xmotion.y_root - m->location.y))) { if (over && entry != over) { - if (over->parent->mouseover) - over->parent->mouseover(over, FALSE); - else - menu_control_mouseover(over, FALSE); - menu_entry_render(over); + over->parent->mouseover(over, FALSE); } over = entry; - if (over->parent->mouseover) - over->parent->mouseover(over, TRUE); - else - menu_control_mouseover(over, TRUE); - menu_entry_render(over); + over->parent->mouseover(over, TRUE); break; } } if (!it && over) { - if (over->parent->mouseover) - over->parent->mouseover(over, FALSE); - else - menu_control_mouseover(over, FALSE); - menu_entry_render(over); + over->parent->mouseover(over, FALSE); over = NULL; } break;