X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fmenu.c;h=1349f215b664896140a2127c3a25637ac8fc08d1;hb=ed5f76b3d2ed4a7d68aef19981a873f12acabba0;hp=89d889307263e02c9475b35b79b83314f4c9a04a;hpb=9f6832426387c3730bf2c9b6202db9eb8d159f42;p=bertos.git

diff --git a/mware/menu.c b/mware/menu.c
index 89d88930..1349f215 100755
--- a/mware/menu.c
+++ b/mware/menu.c
@@ -16,6 +16,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.4  2006/03/20 17:48:35  bernie
+ *#* Implement support for ROM menus.
+ *#*
+ *#* Revision 1.3  2006/02/20 14:34:32  bernie
+ *#* Include appconfig.h before using its definitions.
+ *#*
  *#* Revision 1.2  2006/02/15 09:10:51  bernie
  *#* Make title bold; Fix height when we have no menubar.
  *#*
@@ -67,16 +73,13 @@
 
 #include "menu.h"
 
-#if CONFIG_MENU_MENUBAR
-#include "menubar.h"
-#endif
-
 #include <gfx/gfx.h>
 #include <gfx/font.h>
 #include <gfx/text.h>
 #include <drv/kbd.h>
 #include <cfg/compiler.h>
 #include <cfg/debug.h>
+#include <appconfig.h>
 
 #if CPU_HARVARD
 #include <avr/pgmspace.h> /* strncpy_P() */
@@ -84,6 +87,10 @@
 
 #include <string.h> /* strcpy() */
 
+#if CONFIG_MENU_MENUBAR
+#include "menubar.h"
+#endif
+
 #if defined(CONFIG_LOCALE) && (CONFIG_LOCALE == 1)
 #include "msg.h"
 #else
@@ -99,16 +106,27 @@
 
 
 #ifdef _DEBUG
-/*!
+/**
  * Count the items present in a menu.
  */
-static int UNUSED_FUNC menu_count(const struct Menu *menu)
+static int menu_count(const struct Menu *menu)
 {
 	int cnt = 0;
-	struct MenuItem *item;
 
-	for (item = menu->items; item->label; ++item)
-		cnt++;
+	for (cnt = 0; /*NOP*/; ++cnt)
+	{
+		const MenuItem *item = &menu->items[cnt];
+#if CPU_HARVARD
+		MenuItem ram_item;
+		if (menu->flags & MF_ROMITEMS)
+		{
+			memcpy_P(&ram_item, item, sizeof(ram_item));
+			item = &ram_item;
+		}
+#endif
+		if (!(item->label || item->hook))
+			break;
+	}
 
 	return cnt;
 }
@@ -126,7 +144,17 @@ static void menu_update_menubar(
 		struct MenuBar *mb,
 		int selected)
 {
-	int item_flags = menu->items[selected].flags;
+	int item_flags;
+#if CPU_HARVARD
+	if (menu->flags & MF_ROMITEMS)
+	{
+		ASSERT(sizeof(menu->items[selected].flags) == sizeof(int));
+		item_flags = pgm_read_int(&menu->items[selected].flags);
+	}
+	else
+#endif
+		item_flags = menu->items[selected].flags;
+
 	const_iptr_t newlabel = (const_iptr_t)LABEL_OK;
 
 	if (item_flags & MIF_DISABLED)
@@ -154,7 +182,6 @@ static void menu_layout(
 		int items_per_page,
 		int selected)
 {
-	const MenuItem *item;
 	int ypos, cnt;
 	const char * PROGMEM title = PTRMSG(menu->title);
 
@@ -163,11 +190,18 @@ static void menu_layout(
 	if (title)
 		text_xprintf(menu->bitmap, ypos++, 0, STYLEF_BOLD | TEXT_FILL, title);
 
-	for (
-		cnt = 0, item = &menu->items[first_item];
-		cnt < items_per_page;
-		++cnt, ++item)
+	for (cnt = 0; cnt < items_per_page; ++cnt)
 	{
+		const MenuItem *item = &menu->items[first_item + cnt];
+#if CPU_HARVARD
+		MenuItem ram_item;
+		if (menu->flags & MF_ROMITEMS)
+		{
+			memcpy_P(&ram_item, item, sizeof(ram_item));
+			item = &ram_item;
+		}
+#endif
+
 		/* Check for end of menu */
 		if (!(item->label || item->hook))
 			break;
@@ -183,7 +217,7 @@ static void menu_layout(
 			(
 				menu->bitmap, ypos++, 0,
 				(first_item + cnt == selected) ? (STYLEF_INVERT | TEXT_FILL) : TEXT_FILL,
-				(item->flags & MIF_RAMLABEL) ? PSTR("%s%s") : PSTR("%S%s"),
+				(item->flags & MIF_RAMLABEL) ? PSTR("%s%S") : PSTR("%S%S"),
 				PTRMSG(item->label),
 				(item->flags & MIF_TOGGLE) ?
 					( (item->flags & MIF_CHECKED) ? PSTR(":ON") : PSTR(":OFF") )
@@ -230,32 +264,56 @@ static void menu_doselect(const struct Menu *menu, struct MenuItem *item)
 
 
 /*!
- * Return the previous visible item (rolls back to the last item)
+ * Return the next visible item (rolls back to the first item)
  */
 static int menu_next_visible_item(const struct Menu *menu, int index, int total)
 {
+	int item_flags;
+
 	do
 	{
 		if (++index >= total)
 		   index = 0;
+
+#if CPU_HARVARD
+		if (menu->flags & MF_ROMITEMS)
+		{
+			ASSERT(sizeof(menu->items[index].flags) == sizeof(int));
+			item_flags = pgm_read_int(&menu->items[index].flags);
+		}
+		else
+#endif
+			item_flags = menu->items[index].flags;
 	}
-	while (menu->items[index].flags & MIF_HIDDEN);
+	while (item_flags & MIF_HIDDEN);
 
 	return index;
 }
 
 
 /*!
- * Return the next visible item (rolls back to the first item)
+ * Return the previous visible item (rolls back to the last item)
  */
 static int menu_prev_visible_item(const struct Menu *menu, int index, int total)
 {
+	int item_flags;
+
 	do
 	{
 		if (--index < 0)
 			index = total - 1;
+
+#if CPU_HARVARD
+		if (menu->flags & MF_ROMITEMS)
+		{
+			ASSERT(sizeof(menu->items[index].flags) == sizeof(int));
+			item_flags = pgm_read_int(&menu->items[index].flags);
+		}
+		else
+#endif
+			item_flags = menu->items[index].flags;
 	}
-	while (menu->items[index].flags & MIF_HIDDEN);
+	while (item_flags & MIF_HIDDEN);
 
 	return index;
 }
@@ -289,22 +347,28 @@ iptr_t menu_handle(const struct Menu *menu)
 #endif /* CONFIG_MENU_MENUBAR */
 
 
-	/* Compute total number of items in menu (entries) and
+	/*
+	 * Compute total number of items in menu (entries) and
 	 * the number of visible entries, which excludes items
 	 * without a label.
 	 */
+	for (entries = 0, visible_entries = 0; /*NOP*/; ++entries)
 	{
-		struct MenuItem *item;
-
-		entries = 0;
-		visible_entries = 0;
-
-		for (item = menu->items; (item->label || item->hook); ++item)
+		const MenuItem *item = &menu->items[entries];
+#if CPU_HARVARD
+		MenuItem ram_item;
+		if (menu->flags & MF_ROMITEMS)
 		{
-			++entries;
-			if (!(item->flags & MIF_HIDDEN))
-				++visible_entries;
+			memcpy_P(&ram_item, item, sizeof(ram_item));
+			item = &ram_item;
 		}
+#endif
+
+		if (!(item->flags & MIF_HIDDEN))
+			++visible_entries;
+
+		if (!(item->label || item->hook))
+			break;
 	}
 
 	items_per_page =
@@ -343,6 +407,14 @@ iptr_t menu_handle(const struct Menu *menu)
 		if (key & K_OK)
 		{
 			struct MenuItem *item = &(menu->items[selected]);
+#if CPU_HARVARD
+			MenuItem ram_item;
+			if (menu->flags & MF_ROMITEMS)
+			{
+				memcpy_P(&ram_item, item, sizeof(ram_item));
+				item = &ram_item;
+			}
+#endif
 			menu_doselect(menu, item);
 
 			/* Return userdata as result */
@@ -377,6 +449,7 @@ iptr_t menu_handle(const struct Menu *menu)
 int menu_setFlags(struct Menu *menu, int idx, int flags)
 {
 	ASSERT(idx < menu_count(menu));
+	ASSERT(!(menu->flags & MF_ROMITEMS));
 
 	int old = menu->items[idx].flags;
 	menu->items[idx].flags |= flags;
@@ -396,6 +469,7 @@ int menu_setFlags(struct Menu *menu, int idx, int flags)
 int menu_clearFlags(struct Menu *menu, int idx, int flags)
 {
 	ASSERT(idx < menu_count(menu));
+	ASSERT(!(menu->flags & MF_ROMITEMS));
 
 	int old = menu->items[idx].flags;
 	menu->items[idx].flags &= ~flags;