summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Ferrare <kevin@rockbox.org>2005-10-31 18:38:48 +0000
committerKevin Ferrare <kevin@rockbox.org>2005-10-31 18:38:48 +0000
commitb83dc3861e5552a802767f37cb97d6b41c9f01cc (patch)
treedcfe714d3aa403127617e7668deacb1acc795e6a
parent65fe5f144d939533e29f0e07b99915a7d997d448 (diff)
downloadrockbox-b83dc3861e5552a802767f37cb97d6b41c9f01cc.tar.gz
rockbox-b83dc3861e5552a802767f37cb97d6b41c9f01cc.zip
Corrected a small bug about status bar not refreshing the clock in menus on archos, added some H1x0 remote key bindings (thanks Stephan Wezel for the patch ! )
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7698 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/menu.c12
-rw-r--r--apps/menu.h7
-rw-r--r--apps/onplay.c8
-rw-r--r--apps/tree.c6
-rw-r--r--apps/tree.h3
5 files changed, 28 insertions, 8 deletions
diff --git a/apps/menu.c b/apps/menu.c
index 4c394bc578..90a3c89d75 100644
--- a/apps/menu.c
+++ b/apps/menu.c
@@ -43,7 +43,6 @@
#ifdef HAVE_LCD_BITMAP
#include "icons.h"
-//#include "widgets.h"
#endif
/* gui api */
@@ -157,7 +156,12 @@ int menu_show(int m)
#ifdef MENU_RC_ENTER
case MENU_RC_ENTER:
#endif
+#ifdef MENU_RC_ENTER2
+ case MENU_RC_ENTER2:
+#endif
return gui_synclist_get_sel_pos(&(menus[m].synclist));
+
+
case MENU_EXIT:
#ifdef MENU_EXIT2
case MENU_EXIT2:
@@ -168,7 +172,10 @@ int menu_show(int m)
#ifdef MENU_RC_EXIT
case MENU_RC_EXIT:
#endif
- lcd_stop_scroll();
+#ifdef MENU_RC_EXIT_MENU
+ case MENU_RC_EXIT_MENU:
+#endif
+ //lcd_stop_scroll();
exit = true;
break;
@@ -177,6 +184,7 @@ int menu_show(int m)
return MENU_ATTACHED_USB;
break;
}
+ gui_syncstatusbar_draw(&statusbars, false);
}
return MENU_SELECTED_EXIT;
}
diff --git a/apps/menu.h b/apps/menu.h
index afc65a5b9b..08cd70fcda 100644
--- a/apps/menu.h
+++ b/apps/menu.h
@@ -31,8 +31,11 @@
#define MENU_ENTER BUTTON_RIGHT
#define MENU_ENTER2 BUTTON_SELECT
-#define MENU_RC_EXIT BUTTON_RC_STOP
-#define MENU_RC_ENTER BUTTON_RC_ON
+#define MENU_RC_EXIT BUTTON_RC_STOP
+#define MENU_RC_EXIT_MENU BUTTON_RC_MODE
+#define MENU_RC_ENTER BUTTON_RC_ON
+#define MENU_RC_ENTER2 BUTTON_RC_MENU
+
#elif CONFIG_KEYPAD == RECORDER_PAD
diff --git a/apps/onplay.c b/apps/onplay.c
index 76bc72a048..df23c42443 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -7,7 +7,7 @@
* \/ \/ \/ \/ \/
* $Id$
*
- * Copyright (C) 2002 Björn Stenberg
+ * Copyright (C) 2002 Bj�n Stenberg
*
* All files in this archive are subject to the GNU General Public License.
* See the file COPYING in the source tree root for full license agreement.
@@ -510,7 +510,11 @@ static int onplay_callback(int key, int menu)
{
(void)menu;
- if (key == MENU_EXIT_MENU)
+ if (key == MENU_EXIT_MENU
+#ifdef MENU_RC_EXIT_MENU
+ || key == MENU_RC_EXIT_MENU
+#endif
+ )
exit_to_main = true;
return key;
diff --git a/apps/tree.c b/apps/tree.c
index 46981ed452..4134c942d8 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -683,7 +683,11 @@ static bool dirbrowse(void)
case TREE_RC_MENU:
#endif
#ifdef TREE_MENU_PRE
- if (lastbutton != TREE_MENU_PRE)
+ if (lastbutton != TREE_MENU_PRE
+#ifdef TREE_RC_MENU_PRE
+ && lastbutton != TREE_RC_MENU_PRE
+#endif
+ )
break;
#endif
/* don't enter menu from plugin browser */
diff --git a/apps/tree.h b/apps/tree.h
index 00d22c4d24..ae2cc0bc00 100644
--- a/apps/tree.h
+++ b/apps/tree.h
@@ -53,7 +53,8 @@
#define TREE_RC_EXIT BUTTON_RC_STOP
#define TREE_RC_RUN (BUTTON_RC_MENU | BUTTON_REL)
#define TREE_RC_RUN_PRE BUTTON_RC_MENU
-#define TREE_RC_MENU BUTTON_RC_MODE
+#define TREE_RC_MENU ( BUTTON_RC_MODE | BUTTON_REL)
+#define TREE_RC_MENU_PRE BUTTON_RC_MODE
#define TREE_RC_WPS (BUTTON_RC_ON | BUTTON_REL)
#define TREE_RC_WPS_PRE BUTTON_RC_ON
#define TREE_RC_CONTEXT (BUTTON_RC_ON | BUTTON_REPEAT)