aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-01-03 14:57:44 -05:00
Code

Factor try_menu out of send_kbd_event

Browse Source 
Try to make the code a little clearer by pulling try_menu out of
send_kbd_event.  try_menu calls the BFU code and tells send_kbd_event
whether the BFU code did something with the event (i.e. opened a menu)
or whether the event still needs to be handled.
This commit is contained in:
Miciah Dashiel Butler Masters 2011-01-19 03:52:08 +00:00
parent af5e54d95f
commit dfc666dd75
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/viewer/text/view.c
View File

@ -1474,6 +1474,31 @@ try_typeahead(struct session *ses, struct document_view *doc_view,
term_send_event(ses->tab->term, ev); term_send_event(ses->tab->term, ev);
} }
/** See whether the BFU (in particular the menu system) is interested in
* the event. */
static enum frame_event_status
try_menu(struct session *ses, struct term_event *ev)
{
struct window *win;
get_kbd_modifier(ev) &= ~KBD_MOD_ALT;
activate_bfu_technology(ses, -1);
win = ses->tab->term->windows.next;
win->handler(win, ev);
if (ses->tab->term->windows.next == win) {
deselect_mainmenu(win->term, win->data);
print_screen_status(ses);
}
if (!tabs_are_on_top(ses->tab->term)) {
/* The event opened a menu; we're done. */
return FRAME_EVENT_OK;
}
/* Otherwise, the event still needs to be handled. */
get_kbd_modifier(ev) |= KBD_MOD_ALT;
return FRAME_EVENT_IGNORED;
}
/** @returns the session if event cleanup should be done or NULL if no /** @returns the session if event cleanup should be done or NULL if no
* cleanup is needed. */ * cleanup is needed. */
static struct session * static struct session *
@ -1515,22 +1540,10 @@ quit:
/* Ctrl-Alt-F should not open the File menu like Alt-f does. */ /* Ctrl-Alt-F should not open the File menu like Alt-f does. */
if (check_kbd_modifier(ev, KBD_MOD_ALT)) { if (check_kbd_modifier(ev, KBD_MOD_ALT)) {
struct window *win; if (try_menu(ses, ev) != FRAME_EVENT_IGNORED) {
/* The BFU ate the key! */
get_kbd_modifier(ev) &= ~KBD_MOD_ALT;
activate_bfu_technology(ses, -1);
win = ses->tab->term->windows.next;
win->handler(win, ev);
if (ses->tab->term->windows.next == win) {
deselect_mainmenu(win->term, win->data);
print_screen_status(ses);
}
if (!tabs_are_on_top(ses->tab->term)) {
/* The event opened a menu; we're done. */
return NULL; return NULL;
} }
/* Otherwise, the event still needs to be handled. */
get_kbd_modifier(ev) |= KBD_MOD_ALT;
if (doc_view if (doc_view
&& get_opt_int("document.browse.accesskey" && get_opt_int("document.browse.accesskey"