X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fgui%2Fmenu.h;h=b3ada468f2b2cdbe3cc4ff5ed7f38d30e761a94b;hb=52dc681d37e2d83df0ab5450584c7591e219a8d6;hp=d4d4c0c6b0c16e34117579436b82a2814fce61f2;hpb=4cc44c9888a0336b9d01121ec0b7ad95f4a76195;p=bertos.git

diff --git a/bertos/gui/menu.h b/bertos/gui/menu.h
index d4d4c0c6..b3ada468 100644
--- a/bertos/gui/menu.h
+++ b/bertos/gui/menu.h
@@ -26,85 +26,33 @@
  * 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 2003, 2004, 2006, 2010 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000 Bernie Innocenti <bernie@codewiz.org>
  * All Rights Reserved.
  * -->
  *
- * \version $Id$
- *
+ * \defgroup menu Menu handling module
+ * \ingroup gui
+ * \{
  * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Stefano Fedrigo <aleph@develer.com>
  *
  * \brief Common menu handling API
+ *
+ * $WIZ$ module_name = "menu"
+ * $WIZ$ module_depends = "text", "gfx", "timer", "kbd"
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.5  2007/09/19 16:23:27  batt
- *#* Fix doxygen warnings.
- *#*
- *#* Revision 1.4  2006/09/13 13:58:33  bernie
- *#* Add RenderHook support.
- *#*
- *#* Revision 1.3  2006/07/19 12:56:27  bernie
- *#* Convert to new Doxygen style.
- *#*
- *#* Revision 1.2  2006/06/03 13:58:02  bernie
- *#* Fix recursive timeout and add exit status information.
- *#*
- *#* Revision 1.1  2006/05/15 07:20:54  bernie
- *#* Move menu to gui/.
- *#*
- *#* Revision 1.4  2006/04/11 00:07:32  bernie
- *#* Implemenent MF_SAVESEL flag.
- *#*
- *#* Revision 1.3  2006/03/22 09:49:51  bernie
- *#* Simplifications from project_grl.
- *#*
- *#* Revision 1.2  2006/03/20 17:48:35  bernie
- *#* Implement support for ROM menus.
- *#*
- *#* Revision 1.1  2006/02/10 12:29:36  bernie
- *#* Add menu system.
- *#*
- *#* Revision 1.20  2005/11/16 18:10:19  bernie
- *#* Move top-level headers to cfg/ as in DevLib.
- *#*
- *#* Revision 1.19  2005/02/11 19:11:38  aleph
- *#* Move menu_displaymsg() in new displaymsg module
- *#*
- *#* Revision 1.18  2005/01/13 16:56:36  aleph
- *#* Fix progmem includes.
- *#*
- *#* Revision 1.17  2004/12/14 12:52:45  aleph
- *#* Add exclude menu flags
- *#*
- *#* Revision 1.16  2004/10/01 14:04:59  customer_pw
- *#* Add accessor functions for menu flags
- *#*
- *#* Revision 1.15  2004/09/09 08:31:36  customer_pw
- *#* Add disabled item type
- *#*
- *#* Revision 1.14  2004/08/29 21:46:12  bernie
- *#* CVSSILENT: Mark CVS log blocks.
- *#*
- *#* Revision 1.13  2004/08/25 15:35:23  customer_pw
- *#* IPTR -> iptr_t conversion.
- *#*
- *#* Revision 1.12  2004/08/25 13:23:45  bernie
- *#* IPTR -> iptr_t conversion.
- *#*/
-#ifndef MWARE_MENU_H
-#define MWARE_MENU_H
+#ifndef GUI_MENU_H
+#define GUI_MENU_H
 
 #include <cfg/compiler.h>
 
-/* Fwd decl */
-struct Bitmap;
+#include <gfx/gfx.h>
 
 /** Menu callback function */
 typedef iptr_t (*MenuHook)(iptr_t userdata);
+typedef void (*BlitBitmap)(const Bitmap *bm);
 
 /**
  * Menu item description.
@@ -154,6 +102,7 @@ typedef struct Menu
 	int              flags;    /**< See MF_#? definitions below */
 	struct Bitmap   *bitmap;   /**< Bitmap where the menu is rendered */
 	int              selected; /**< Initial selection (written to if MF_SAVESEL is set). */
+	BlitBitmap       lcd_blitBitmap; /**< Callback to call to do smooth the display */
 } Menu;
 
 /**
@@ -182,4 +131,5 @@ iptr_t menu_handle(const struct Menu *menu);
 int menu_setFlags(struct Menu *menu, int idx, int flags);
 int menu_clearFlags(struct Menu *menu, int idx, int flags);
 
-#endif /* MWARE_MENU_H */
+/** \} */ //defgroup menu
+#endif /* GUI_MENU_H */