X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Fmenu.h;h=0227d52c942531a219ddb705ccc7ee68e5464f9e;hb=1fb0dd88aa0c2a05a54f1f3aead0542521285f6c;hp=bfa05c45b9f4aed0f0be96390bba548cbb711305;hpb=053fd9b42f2cf38194f78e37c373363fc9cb9933;p=picodrive.git

diff --git a/platform/common/menu.h b/platform/common/menu.h
index bfa05c4..0227d52 100644
--- a/platform/common/menu.h
+++ b/platform/common/menu.h
@@ -6,14 +6,16 @@ void text_out16(int x, int y, const char *texto, ...);
 void smalltext_out16(int x, int y, const char *texto, int color);
 void smalltext_out16_lim(int x, int y, const char *texto, int color, int max);
 void menu_draw_selection(int x, int y, int w);
+void debug_menu_loop(void);
 
 extern char menuErrorMsg[64];
 
 typedef enum
 {
 	MB_NONE = 1,		/* no auto processing */
-	MB_ONOFF,		/* ON/OFF setting */
-	MB_RANGE,		/* [min-max] setting */
+	MB_OPT_ONOFF,		/* ON/OFF setting */
+	MB_OPT_RANGE,		/* [min-max] setting */
+	MB_OPT_CUSTOM,
 } menu_behavior;
 
 typedef enum
@@ -51,6 +53,7 @@ typedef enum
 	MA_OPT_SAVECFG_GAME,
 	MA_OPT_LOADCFG,
 	MA_OPT_INTERLACED,	/* giz */
+	MA_OPT_ROTATION,	/* uiq */
 	MA_OPT2_GAMMA,
 	MA_OPT2_A_SN_GAMMA,
 	MA_OPT2_DBLBUFF,	/* giz */
@@ -90,6 +93,11 @@ typedef enum
 	MA_CDOPT_SCALEROT_CHIP,
 	MA_CDOPT_BETTER_SYNC,
 	MA_CDOPT_DONE,
+	MA_CTRL_PLAYER1,
+	MA_CTRL_PLAYER2,
+	MA_CTRL_EMU,
+	MA_CTRL_TURBO_RATE,
+	MA_CTRL_DONE,
 } menu_id;
 
 typedef struct
@@ -97,32 +105,46 @@ typedef struct
 	char *name;
 	menu_behavior beh;
 	menu_id id;
-	void *var;		/* for on-off settings */
-	int mask;
+	void *var;		/* for on-off/range settings */
+	int mask;		/* bit to toggle for on/off */
 	signed char min;	/* for ranged integer settings, to be sign-extended */
 	signed char max;
 	char enabled;
 	char need_to_save;
+	int (*submenu_handler)(menu_id id);
+	const char * (*generate_name)(int is_left);
 } menu_entry;
 
+#define mee_submenu_id(name, id, handler) \
+	{ name, MB_NONE, id, NULL, 0, 0, 0, 1, 0, handler, NULL }
+
+#define mee_submenu(name, handler) \
+	mee_submenu_id(name, MA_NONE, handler)
+
+#define mee_end \
+	{ NULL, 0, 0, NULL, 0, 0, 0, 0, 0, NULL, NULL }
+
 typedef struct
 {
 	char *name;
 	int mask;
 } me_bind_action;
 
-extern me_bind_action me_ctrl_actions[12];
+extern me_bind_action me_ctrl_actions[15];
 extern me_bind_action emuctrl_actions[];	// platform code
 
 
 typedef void (me_draw_custom_f)(const menu_entry *entry, int x, int y, void *param);
 
-int     me_id2offset(const menu_entry *entries, int count, menu_id id);
-void    me_enable(menu_entry *entries, int count, menu_id id, int enable);
-int     me_count_enabled(const menu_entry *entries, int count);
-menu_id me_index2id(const menu_entry *entries, int count, int index);
+/* TODO: move? */
+int     me_id2offset(const menu_entry *entries, menu_id id);
+void    me_enable(menu_entry *entries, menu_id id, int enable);
+int     me_count_enabled(const menu_entry *ent);
+menu_id me_index2id(const menu_entry *entries, int index);
 void    me_draw(const menu_entry *entries, int count, int x, int y, me_draw_custom_f *cust_draw, void *param);
-int     me_process(menu_entry *entries, int count, menu_id id, int is_next);
+int     me_process(menu_entry *entries, menu_id id, int is_next);
 
 const char *me_region_name(unsigned int code, int auto_order);
 
+void menu_darken_bg(void *dst, int pixels, int darker);
+