X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fmenu.h;h=893a6c72f1dc06b1fab102fc3669b087fa989ad8;hb=c49c99e64ee64ad490b2aea2d6c6d8f9f6d225db;hp=06e412039764d776b541b5ed63148a9eef047522;hpb=a00d0340b2444546e5b666bdc86128c5d8cacf10;p=bertos.git

diff --git a/mware/menu.h b/mware/menu.h
index 06e41203..893a6c72 100755
--- a/mware/menu.h
+++ b/mware/menu.h
@@ -16,6 +16,9 @@
 
 /*#*
  *#* $Log$
+ *#* 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.
  *#*
@@ -57,10 +60,12 @@
 /* Fwd decl */
 struct Bitmap;
 
-/*! Menu callback function */
+/** Menu callback function */
 typedef void (*MenuHook)(iptr_t userdata);
 
-/*! Menu item description */
+/**
+ * Menu item description.
+ */
 typedef struct MenuItem
 {
 	const_iptr_t label;    /*!< Item label (ID or ptr to string, 0 to disable) */
@@ -69,8 +74,13 @@ typedef struct MenuItem
 	iptr_t       userdata; /*!< User data to be passed back to the hook */
 } MenuItem;
 
-/*! Flags for MenuItem.flags */
-#define MIF_EXCLUDE_MASK    0x00FF
+/**
+ * \name Flags for MenuItem.flags.
+ * \{
+ */
+#define MIF_EXCLUDE_MASK    0x00FF /**< Mask for mutual exclusion map (shared with priority). */
+#define MIF_PRI_MASK        0x00FF /**< Mask for priority value (shared with mutual exclusion). */
+#define MIF_PRI(x)          ((x) & MIF_PRI_MASK) /**< Set menu item priority. */
 #define MIF_EXCLUDE_0       BV(0)  /*!< Exclude item 0 when this item is checked */
 #define MIF_EXCLUDE_1       BV(1)  /*!< Exclude item 1 when this item is checked */
 #define MIF_EXCLUDE_2       BV(2)  /*!< Exclude item 2 when this item is checked */
@@ -85,9 +95,11 @@ typedef struct MenuItem
 #define MIF_HIDDEN          BV(11) /*!< This menu item is not visible */
 #define MIF_DISABLED        BV(12) /*!< This menu item is not visible */
 #define MIF_RAMLABEL        BV(13) /*!< Item label is stored in RAM, not in program memory */
+/* \} */
 
-
-/*! Menu description */
+/**
+ * Menu description.
+ */
 typedef struct Menu
 {
 	MenuItem        *items;    /*!< Array of items (end with a NULL hook) */
@@ -97,11 +109,14 @@ typedef struct Menu
 	int              startrow; /*!< Display starting row */
 } Menu;
 
-
+/**
+ * \name Flags for Menu.flags.
+ * \{
+ */
 #define MF_STICKY    BV(0)  /*!< Stay in the menu when the items called return */
 #define MF_TOPLEVEL  BV(1)  /*!< Top-level menu (do not display "back" label) */
 #define MF_ROMITEMS  BV(2)  /*!< Menu is in ROM (default is RAM) */
-
+/* \} */
 
 /* Function prototypes */
 iptr_t menu_handle(const struct Menu *menu);