Doc fixes.

[bertos.git] / gui / menu.c

diff --git a/gui/menu.c b/gui/menu.c
old mode 100755 (executable)
new mode 100644 (file)
index 756aba5..f02324e
--- 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>
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \version $Id$
@@ -16,6 +41,9 @@
 
 /*#*
  *#* $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.
  *#*
@@ -57,6 +85,7 @@
  *#*/
 
 #include "menu.h"
+
 #include <gfx/gfx.h>
 #include <gfx/font.h>
 #include <gfx/text.h>
@@ -88,6 +117,7 @@
 #define PTRMSG(x) ((const char *)x)
 #endif
 
+
 /* Temporary fake defines for ABORT stuff... */
 #define abort_top  0
 #define PUSH_ABORT false
@@ -159,6 +189,39 @@ 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.
  */
@@ -254,35 +317,11 @@ static void menu_layout(
                /* Only print visible items */
                if (!(item->flags & MIF_HIDDEN))
                {
-                       if (item->flags & MIF_CHECKIT)
-                       {
-                               gfx_rectClear(bm, 0, ypos,
-                                               bm->font->height, ypos + bm->font->height);
+                       /* Check if a special render function is supplied, otherwise use defaults */
+                       RenderHook renderhook = (item->flags & MIF_RENDERHOOK) ? (RenderHook)item->label : menu_defaultRenderHook;
 
-                               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,
-                               (i == selected) ? (STYLEF_INVERT | TEXT_FILL) : TEXT_FILL,
-                               PTRMSG(item->label)
-                       );
+                       /* Render menuitem */
+                       renderhook(menu->bitmap, ypos++, (i == selected), item);
 
                        ypos += bm->font->height;
                }