devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Finally, the new button action system is here, thanks to Jonathan Gordon. Some button mappings have changed and other things may break. Comments should go to the forum, http://forums.rockbox.org/index.php?topic=5829.0 or the mailing list.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10582 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2006-08-15 12:27:07 +00:00
parent c0f8b18770
commit 224c0a13eb
47 changed files with 1986 additions and 1846 deletions
Download patch file Download diff file Expand all files Collapse all files

42
apps/menu.c
View file

@ -40,6 +40,7 @@
#include "talk.h"
#include "lang.h"
#include "misc.h"
#include "action.h"
#ifdef HAVE_LCD_BITMAP
#include "icons.h"
@ -124,13 +125,12 @@ int menu_show(int m)
#endif
bool exit = false;
int key;
unsigned lastbutton = 0;
gui_synclist_draw(&(menus[m].synclist));
gui_syncstatusbar_draw(&statusbars, true);
menu_talk_selected(m);
while (!exit) {
key = button_get_w_tmo(HZ/2);
key = get_action(CONTEXT_MAINMENU,HZ/2);
/*
* "short-circuit" the default keypresses by running the
* callback function
@ -144,40 +144,13 @@ int menu_show(int m)
if(gui_synclist_do_button(&(menus[m].synclist), key))
menu_talk_selected(m);
switch( key ) {
case MENU_ENTER | BUTTON_REL:
if (lastbutton != MENU_ENTER)
break;
#ifdef MENU_ENTER2
case MENU_ENTER2:
#endif
#ifdef MENU_RC_ENTER
case MENU_RC_ENTER:
#endif
#ifdef MENU_RC_ENTER2
case MENU_RC_ENTER2:
#endif
case ACTION_STD_OK:
action_signalscreenchange();
return gui_synclist_get_sel_pos(&(menus[m].synclist));
case MENU_EXIT | BUTTON_REL:
if (lastbutton != MENU_EXIT)
break;
#ifdef MENU_EXIT2
case MENU_EXIT2:
#endif
#ifdef MENU_EXIT_MENU
case MENU_EXIT_MENU | BUTTON_REL:
/* This is important for the Ondio's */
if ((key == (MENU_EXIT_MENU | BUTTON_REL)) &&
(lastbutton != MENU_EXIT_MENU))
break;
#endif
#ifdef MENU_RC_EXIT
case MENU_RC_EXIT:
#endif
#ifdef MENU_RC_EXIT_MENU
case MENU_RC_EXIT_MENU:
#endif
case ACTION_STD_CANCEL:
case ACTION_STD_MENU:
exit = true;
break;
@ -187,9 +160,8 @@ int menu_show(int m)
break;
}
gui_syncstatusbar_draw(&statusbars, false);
if ( key )
lastbutton = key;
}
action_signalscreenchange();
return MENU_SELECTED_EXIT;
}