X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=gui%2Fmenu.c;h=f02324ecf2c2b02e4738cb500dcc5f8b18a73fdd;hb=07382ad480794063a2d5be63547eb288034d9832;hp=3710bbcf472c9f66420ebd937b5ee1395a38e5f8;hpb=d8f0e85da0918ce2f7569b81ff1e544b96557d1a;p=bertos.git

diff --git a/gui/menu.c b/gui/menu.c
old mode 100755
new mode 100644
index 3710bbcf..f02324ec
--- a/gui/menu.c
+++ b/gui/menu.c
@@ -1,9 +1,34 @@
-/*!
+/**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
- * All Rights Reserved.
+ *
  * -->
  *
  * \version $Id$
@@ -16,6 +41,24 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.8  2006/09/13 13:58:32  bernie
+ *#* Add RenderHook support.
+ *#*
+ *#* Revision 1.7  2006/08/01 12:22:46  bernie
+ *#* Mention DevLib license.
+ *#*
+ *#* Revision 1.6  2006/07/19 12:56:27  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.5  2006/06/03 13:58:01  bernie
+ *#* Fix recursive timeout and add exit status information.
+ *#*
+ *#* Revision 1.4  2006/06/02 12:26:18  bernie
+ *#* Draw graphical checkmarks.
+ *#*
+ *#* Revision 1.3  2006/05/28 15:03:31  bernie
+ *#* Avoid unnecessary rendering.
+ *#*
  *#* Revision 1.2  2006/05/25 23:34:38  bernie
  *#* Implement menu timeouts.
  *#*
@@ -42,6 +85,7 @@
  *#*/
 
 #include "menu.h"
+
 #include <gfx/gfx.h>
 #include <gfx/font.h>
 #include <gfx/text.h>
@@ -73,6 +117,7 @@
 #define PTRMSG(x) ((const char *)x)
 #endif
 
+
 /* Temporary fake defines for ABORT stuff... */
 #define abort_top  0
 #define PUSH_ABORT false
@@ -81,7 +126,7 @@
 
 
 /**
- * Count the items present in a menu.
+ * Return the total number of items in in a menu.
  */
 static int menu_count(const struct Menu *menu)
 {
@@ -107,9 +152,8 @@ static int menu_count(const struct Menu *menu)
 
 #if CONFIG_MENU_MENUBAR
 
-/*!
- * Update the menu bar according to the selected item
- * and redraw it.
+/**
+ * Update the menu bar according to the selected item and redraw it.
  */
 static void menu_update_menubar(
 		const struct Menu *menu,
@@ -145,24 +189,67 @@ static void menu_update_menubar(
 #endif /* CONFIG_MENU_MENUBAR */
 
 
+static void menu_defaultRenderHook(struct Bitmap *bm, int ypos, bool selected, const struct MenuItem *item)
+{
+	if (item->flags & MIF_CHECKIT)
+	{
+		gfx_rectClear(bm, 0, ypos,
+				bm->font->height, ypos + bm->font->height);
+
+		if (item->flags & MIF_TOGGLE)
+			gfx_rectDraw(bm, 2, ypos + 2,
+					bm->font->height - 2, ypos + bm->font->height - 2);
+		if (item->flags & MIF_CHECKED)
+		{
+			gfx_line(bm,
+					3, ypos + 3,
+					bm->font->height - 3, ypos + bm->font->height - 3);
+			gfx_line(bm,
+					bm->font->height - 3, ypos + 3,
+					3, ypos + bm->font->height - 3);
+		}
+	}
+
+#if CPU_HARVARD
+	((item->flags & MIF_RAMLABEL) ? text_xyprintf : text_xyprintf_P)
+#else
+	text_xyprintf
+#endif
+	(
+		bm, (item->flags & MIF_CHECKIT) ? bm->font->height : 0, ypos,
+		selected ? (STYLEF_INVERT | TEXT_FILL) : TEXT_FILL,
+		PTRMSG(item->label)
+	);
+}
+
 /**
  * Show a menu on the display.
  */
 static void menu_layout(
 		const struct Menu *menu,
 		int first_item,
-		int items_per_page,
-		int selected)
+		int selected,
+		bool redraw)
 {
-	int ypos, cnt;
+	coord_t ypos;
+	int i;
 	const char * PROGMEM title = PTRMSG(menu->title);
 	Bitmap *bm = menu->bitmap;
 
 	ypos = bm->cr.ymin;
 
+#if 0
+	if (redraw)
+	{
+		/* Clear screen */
+		text_clear(menu->bitmap);
+	}
+#endif
+
 	if (title)
 	{
-		text_xyprintf(bm, 0, ypos, STYLEF_UNDERLINE | STYLEF_BOLD | TEXT_CENTER | TEXT_FILL, title);
+		if (redraw)
+			text_xyprintf(bm, 0, ypos, STYLEF_UNDERLINE | STYLEF_BOLD | TEXT_CENTER | TEXT_FILL, title);
 		ypos += bm->font->height;
 	}
 
@@ -172,12 +259,14 @@ static void menu_layout(
 	static int speed;
 	coord_t old_ymin = bm->cr.ymin;
 
+	/* Clip drawing inside menu items area */
 	gfx_setClipRect(bm,
 		bm->cr.xmin, bm->cr.ymin + ypos,
-		bm->cr.xmax, MIN(bm->cr.ymax, bm->cr.ymin + ypos + items_per_page * bm->font->height));
+		bm->cr.xmax, bm->cr.ymax);
 
 	if (old_first_item != first_item)
 	{
+		/* Speed proportional to distance */
 		speed = ABS(old_first_item - first_item) * 3;
 
 		if (old_first_item > first_item)
@@ -198,15 +287,16 @@ static void menu_layout(
 					++old_first_item;
 			}
 		}
-		first_item = old_first_item;
+		first_item = MIN(old_first_item, menu_count(menu));
 
 		ypos += yoffset;
+		redraw = true;
 	}
-#endif
+#endif /* CONFIG_MENU_SMOOTH */
 
-	for (cnt = 0; cnt < items_per_page; ++cnt)
+	if (redraw) for (i = first_item; /**/; ++i)
 	{
-		const MenuItem *item = &menu->items[first_item + cnt];
+		const MenuItem *item = &menu->items[i];
 #if CPU_HARVARD
 		MenuItem ram_item;
 		if (menu->flags & MF_ROMITEMS)
@@ -214,7 +304,11 @@ static void menu_layout(
 			memcpy_P(&ram_item, item, sizeof(ram_item));
 			item = &ram_item;
 		}
-#endif
+#endif /* CPU_HARVARD */
+
+		/* Check for end of room */
+		if (ypos > bm->cr.ymax)
+			break;
 
 		/* Check for end of menu */
 		if (!(item->label || item->hook))
@@ -223,40 +317,41 @@ static void menu_layout(
 		/* Only print visible items */
 		if (!(item->flags & MIF_HIDDEN))
 		{
-#if CPU_HARVARD
-			text_xyprintf_P
-#else
-			text_xyprintf
-#endif
-			(
-				bm, 0, ypos,
-				(first_item + cnt == selected) ? (STYLEF_INVERT | TEXT_FILL) : TEXT_FILL,
-				(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") )
-					: ( (item->flags & MIF_CHECKED) ? PSTR("\04") : PSTR("") )
-			);
+			/* Check if a special render function is supplied, otherwise use defaults */
+			RenderHook renderhook = (item->flags & MIF_RENDERHOOK) ? (RenderHook)item->label : menu_defaultRenderHook;
+
+			/* Render menuitem */
+			renderhook(menu->bitmap, ypos++, (i == selected), item);
+
 			ypos += bm->font->height;
 		}
 	}
 
 #if CONFIG_MENU_SMOOTH
+	if (redraw)
+	{
+		/* Clear rest of area */
+		gfx_rectClear(bm, bm->cr.xmin, ypos, bm->cr.xmax, bm->cr.ymax);
+
+		lcd_blitBitmap(&lcd_bitmap);
+	}
+
 	/* Restore old cliprect */
 	gfx_setClipRect(bm,
 			bm->cr.xmin, old_ymin,
 			bm->cr.xmax, bm->cr.ymax);
 
-	lcd_blitBitmap(&lcd_bitmap);
-#endif
+#endif /* CONFIG_MENU_SMOOTH */
 }
 
 
-/*!
+/**
  * Handle menu item selection
  */
-static void menu_doselect(const struct Menu *menu, struct MenuItem *item)
+static iptr_t menu_doselect(const struct Menu *menu, struct MenuItem *item)
 {
+	iptr_t result = 0;
+
 	/* Exclude other items */
 	int mask, i;
 	for (mask = item->flags & MIF_EXCLUDE_MASK, i = 0; mask; mask >>= 1, ++i)
@@ -266,7 +361,7 @@ static void menu_doselect(const struct Menu *menu, struct MenuItem *item)
 	}
 
 	if (item->flags & MIF_DISABLED)
-		return;
+		return MENU_DISABLED;
 
 	/* Handle checkable items */
 	if (item->flags & MIF_TOGGLE)
@@ -277,13 +372,17 @@ static void menu_doselect(const struct Menu *menu, struct MenuItem *item)
 	/* Handle items with callback hooks */
 	if (item->hook)
 	{
-		/* Push a jmp buffer to abort the operation with the STOP key */
+		/* Push a jmp buffer to abort the operation with the STOP/CANCEL key */
 		if (!PUSH_ABORT)
 		{
-			item->hook(item->userdata);
+			result = item->hook(item->userdata);
 			POP_ABORT;
 		}
 	}
+	else
+		result = item->userdata;
+
+	return result;
 }
 
 
@@ -351,7 +450,10 @@ static int menu_prev_visible_item(const struct Menu *menu, int index)
 iptr_t menu_handle(const struct Menu *menu)
 {
 	uint8_t items_per_page;
-	uint8_t first_item, selected;
+	uint8_t first_item = 0;
+	uint8_t selected;
+	iptr_t result = 0;
+	bool redraw = true;
 
 #if (CONFIG_MENU_TIMEOUT != 0)
 	ticks_t now, menu_idle_time = timer_clock();
@@ -385,10 +487,9 @@ iptr_t menu_handle(const struct Menu *menu)
 		- (menu->title ? 1 : 0);
 
 	/* Selected item should be a visible entry */
-	first_item = selected = menu_next_visible_item(menu, menu->selected - 1);
-
-	/* Clear screen */
-	text_clear(menu->bitmap);
+	//first_item = selected = menu_next_visible_item(menu, menu->selected - 1);
+	selected = menu->selected;
+	first_item = 0;
 
 	for(;;)
 	{
@@ -402,7 +503,8 @@ iptr_t menu_handle(const struct Menu *menu)
 		while (selected >= first_item + items_per_page)
 			first_item = menu_next_visible_item(menu, first_item);
 
-		menu_layout(menu, first_item, items_per_page, selected);
+		menu_layout(menu, first_item, selected, redraw);
+		redraw = false;
 
 		#if CONFIG_MENU_MENUBAR
 			menu_update_menubar(menu, &mb, selected);
@@ -432,45 +534,59 @@ iptr_t menu_handle(const struct Menu *menu)
 				item = &ram_item;
 			}
 #endif
-			menu_doselect(menu, item);
+			result = menu_doselect(menu, item);
+			redraw = true;
 
-			/* Return userdata as result */
-			if (!menu->flags & MF_STICKY)
-			{
-				/* Store currently selected item before leaving. */
-				if (menu->flags & MF_SAVESEL)
-					CONST_CAST(struct Menu *, menu)->selected = selected;
-				return item->userdata;
-			}
+			/* Return immediately */
+			if (!(menu->flags & MF_STICKY))
+				break;
+
+			#if (CONFIG_MENU_TIMEOUT != 0)
+				/* Chain timeout */
+				if ((result == MENU_TIMEOUT) && !(menu->flags & MF_TOPLEVEL))
+					break;
 
-			/* Clear screen */
-			text_clear(menu->bitmap);
+				/* Reset timeout */
+				menu_idle_time = timer_clock();
+			#endif
 		}
 		else if (key & K_UP)
 		{
 			selected = menu_prev_visible_item(menu, selected);
+			redraw = true;
 		}
 		else if (key & K_DOWN)
 		{
 			selected = menu_next_visible_item(menu, selected);
+			redraw = true;
 		}
-		else if (((key & K_CANCEL)
+		else if (!(menu->flags & MF_TOPLEVEL))
+		{
+			if (key & K_CANCEL)
+			{
+				result = MENU_CANCEL;
+				break;
+			}
+
 			#if CONFIG_MENU_TIMEOUT != 0
-				|| (now - menu_idle_time > ms_to_ticks(CONFIG_MENU_TIMEOUT))
+				if (now - menu_idle_time > ms_to_ticks(CONFIG_MENU_TIMEOUT))
+				{
+					result = MENU_TIMEOUT;
+					break;
+				}
 			#endif
-				) && !(menu->flags & MF_TOPLEVEL)
-		)
-		{
-			/* Store currently selected item before leaving. */
-			if (menu->flags & MF_SAVESEL)
-				CONST_CAST(struct Menu *, menu)->selected = selected;
-			return 0;
 		}
 	}
+
+	/* Store currently selected item before leaving. */
+	if (menu->flags & MF_SAVESEL)
+		CONST_CAST(struct Menu *, menu)->selected = selected;
+
+	return result;
 }
 
 
-/*!
+/**
  * Set flags on a menuitem.
  *
  * \param menu  Menu owner of the item to change.
@@ -490,7 +606,7 @@ int menu_setFlags(struct Menu *menu, int idx, int flags)
 }
 
 
-/*!
+/**
  * Clear flags on a menuitem.
  *
  * \param menu  Menu owner of the item to change.