X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Fmenu.c;h=3acab62c34ffdb2f685e55bb84bd14596707c5ba;hb=9934732a09e9249757fb683e5d323d64e54ed543;hp=688d5389b932bb20da19e3204255e4322df2253c;hpb=3d792006acf30d67362146f9f448f753064a6fcf;p=libpicofe.git

diff --git a/common/menu.c b/common/menu.c
index 688d538..3acab62 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -1,34 +1,39 @@
-// (c) Copyright 2006-2009 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
+/*
+ * (C) Gražvydas "notaz" Ignotas, 2006-2011
+ *
+ * This work is licensed under the terms of any of these licenses
+ * (at your option):
+ *  - GNU GPL, version 2 or later.
+ *  - GNU LGPL, version 2.1 or later.
+ * See the COPYING file in the top-level directory.
+ */
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <time.h>
+#include <locale.h> // savestate date
 
 #include "menu.h"
 #include "fonts.h"
 #include "readpng.h"
 #include "lprintf.h"
 #include "input.h"
-#include "emu.h"
 #include "plat.h"
 #include "posix.h"
-#include <version.h>
-#include <revision.h>
-
-#include <pico/pico_int.h>
-#include <pico/patch.h>
-
-#define array_size(x) (sizeof(x) / sizeof(x[0]))
 
 static char static_buff[64];
-static char menu_error_msg[64] = { 0, };
 static int  menu_error_time = 0;
-
-#ifndef UIQ3
+char menu_error_msg[64] = { 0, };
+void *g_menuscreen_ptr;
+void *g_menubg_src_ptr;
+void *g_menubg_ptr;
+
+#if !MSCREEN_SIZE_FIXED
+int g_menuscreen_w;
+int g_menuscreen_h;
+#endif
 
 static unsigned char *menu_font_data = NULL;
 static int menu_text_color = 0xffff; // default to white
@@ -46,8 +51,8 @@ static const int me_sfont_w = 6, me_sfont_h = 10;
 // draws text to current bbp16 screen
 static void text_out16_(int x, int y, const char *text, int color)
 {
-	int i, l, u, tr, tg, tb, len;
-	unsigned short *dest = (unsigned short *)g_screen_ptr + x + y * g_screen_width;
+	int i, lh, tr, tg, tb, len;
+	unsigned short *dest = (unsigned short *)g_menuscreen_ptr + x + y * g_menuscreen_w;
 	tr = (color & 0xf800) >> 8;
 	tg = (color & 0x07e0) >> 3;
 	tb = (color & 0x001f) << 3;
@@ -66,11 +71,17 @@ static void text_out16_(int x, int y, const char *text, int color)
 		len = p - text;
 	}
 
+	lh = me_mfont_h;
+	if (y + lh > g_menuscreen_h)
+		lh = g_menuscreen_h - y;
+
 	for (i = 0; i < len; i++)
 	{
 		unsigned char  *src = menu_font_data + (unsigned int)text[i] * me_mfont_w * me_mfont_h / 2;
 		unsigned short *dst = dest;
-		for (l = 0; l < me_mfont_h; l++, dst += g_screen_width - me_mfont_w)
+		int u, l;
+
+		for (l = 0; l < lh; l++, dst += g_menuscreen_w - me_mfont_w)
 		{
 			for (u = me_mfont_w / 2; u > 0; u--, src++)
 			{
@@ -101,7 +112,7 @@ void text_out16(int x, int y, const char *texto, ...)
 {
 	va_list args;
 	char    buffer[256];
-	int     maxw = (g_screen_width - x) / me_mfont_w;
+	int     maxw = (g_menuscreen_w - x) / me_mfont_w;
 
 	if (maxw < 0)
 		return;
@@ -134,7 +145,7 @@ static void smalltext_out16_(int x, int y, const char *texto, int color)
 			break;
 
 		src = fontdata6x8[c];
-		dst = (unsigned short *)g_screen_ptr + x + y * g_screen_width;
+		dst = (unsigned short *)g_menuscreen_ptr + x + y * g_menuscreen_w;
 
 		while (h--)
 		{
@@ -149,7 +160,7 @@ static void smalltext_out16_(int x, int y, const char *texto, int color)
 						dst += multiplier;
 				}
 
-				dst += g_screen_width - me_sfont_w;
+				dst += g_menuscreen_w - me_sfont_w;
 			}
 			src++;
 		}
@@ -159,7 +170,7 @@ static void smalltext_out16_(int x, int y, const char *texto, int color)
 static void smalltext_out16(int x, int y, const char *texto, int color)
 {
 	char buffer[128];
-	int maxw = (g_screen_width - x) / 6;
+	int maxw = (g_menuscreen_w - x) / me_sfont_w;
 
 	if (maxw < 0)
 		return;
@@ -182,13 +193,13 @@ static void menu_draw_selection(int x, int y, int w)
 	if (menu_sel_color < 0) return; // no selection hilight
 
 	if (y > 0) y--;
-	dest = (unsigned short *)g_screen_ptr + x + y * g_screen_width + 14;
+	dest = (unsigned short *)g_menuscreen_ptr + x + y * g_menuscreen_w + me_mfont_w * 2 - 2;
 	for (h = me_mfont_h + 1; h > 0; h--)
 	{
 		dst = dest;
-		for (i = w - 14; i > 0; i--)
+		for (i = w - (me_mfont_w * 2 - 2); i > 0; i--)
 			*dst++ = menu_sel_color;
-		dest += g_screen_width;
+		dest += g_menuscreen_w;
 	}
 }
 
@@ -205,6 +216,13 @@ static int parse_hex_color(char *buff)
 	return -1;
 }
 
+static char tolower_simple(char c)
+{
+	if ('A' <= c && c <= 'Z')
+		c = c - 'A' + 'a';
+	return c;
+}
+
 void menu_init(void)
 {
 	int i, c, l;
@@ -263,12 +281,13 @@ void menu_init(void)
 
 	// load custom font and selector (stored as 1st symbol in font table)
 	emu_make_path(buff, "skin/font.png", sizeof(buff));
-	readpng(menu_font_data, buff, READPNG_FONT);
+	readpng(menu_font_data, buff, READPNG_FONT,
+		MENU_X2 ? 256 : 128, MENU_X2 ? 320 : 160);
 	// default selector symbol is '>'
 	memcpy(menu_font_data, menu_font_data + ((int)'>') * me_mfont_w * me_mfont_h / 2,
 		me_mfont_w * me_mfont_h / 2);
 	emu_make_path(buff, "skin/selector.png", sizeof(buff));
-	readpng(menu_font_data, buff, READPNG_SELECTOR);
+	readpng(menu_font_data, buff, READPNG_SELECTOR, me_mfont_w, me_mfont_h);
 
 	// load custom colors
 	emu_make_path(buff, "skin/skin.txt", sizeof(buff));
@@ -278,7 +297,8 @@ void menu_init(void)
 		lprintf("found skin.txt\n");
 		while (!feof(f))
 		{
-			fgets(buff, sizeof(buff), f);
+			if (fgets(buff, sizeof(buff), f) == NULL)
+				break;
 			if (buff[0] == '#'  || buff[0] == '/')  continue; // comment
 			if (buff[0] == '\r' || buff[0] == '\n') continue; // empty line
 			if (strncmp(buff, "text_color=", 11) == 0)
@@ -298,8 +318,45 @@ void menu_init(void)
 		}
 		fclose(f);
 	}
+
+	// use user's locale for savestate date display
+	setlocale(LC_TIME, "");
+}
+
+static void menu_draw_begin(int need_bg)
+{
+	plat_video_menu_begin();
+	if (need_bg)
+		memcpy(g_menuscreen_ptr, g_menubg_ptr, g_menuscreen_w * g_menuscreen_h * 2);
+}
+
+static void menu_draw_end(void)
+{
+	plat_video_menu_end();
 }
 
+static void menu_darken_bg(void *dst, void *src, int pixels, int darker)
+{
+	unsigned int *dest = dst;
+	unsigned int *sorc = src;
+	pixels /= 2;
+	if (darker)
+	{
+		while (pixels--)
+		{
+			unsigned int p = *sorc++;
+			*dest++ = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3);
+		}
+	}
+	else
+	{
+		while (pixels--)
+		{
+			unsigned int p = *sorc++;
+			*dest++ = (p&0xf79ef79e)>>1;
+		}
+	}
+}
 
 static int me_id2offset(const menu_entry *ent, menu_id id)
 {
@@ -327,13 +384,35 @@ static int me_count(const menu_entry *ent)
 	return ret;
 }
 
+static unsigned int me_read_onoff(const menu_entry *ent)
+{
+	// guess var size based on mask to avoid reading too much
+	if (ent->mask & 0xffff0000)
+		return *(unsigned int *)ent->var & ent->mask;
+	else if (ent->mask & 0xff00)
+		return *(unsigned short *)ent->var & ent->mask;
+	else
+		return *(unsigned char *)ent->var & ent->mask;
+}
+
+static void me_toggle_onoff(menu_entry *ent)
+{
+	// guess var size based on mask to avoid reading too much
+	if (ent->mask & 0xffff0000)
+		*(unsigned int *)ent->var ^= ent->mask;
+	else if (ent->mask & 0xff00)
+		*(unsigned short *)ent->var ^= ent->mask;
+	else
+		*(unsigned char *)ent->var ^= ent->mask;
+}
+
 static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
 {
-	const menu_entry *ent;
+	const menu_entry *ent, *ent_sel = entries;
 	int x, y, w = 0, h = 0;
 	int offs, col2_offs = 27 * me_mfont_w;
+	int vi_sel_ln = 0;
 	const char *name;
-	int asel = 0;
 	int i, n;
 
 	/* calculate size of menu rect */
@@ -344,8 +423,10 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
 		if (!ent->enabled)
 			continue;
 
-		if (i == sel)
-			asel = n;
+		if (i == sel) {
+			ent_sel = ent;
+			vi_sel_ln = n;
+		}
 
 		name = NULL;
 		wt = strlen(ent->name) * me_mfont_w;
@@ -361,9 +442,12 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
 			wt = col2_offs;
 
 			switch (ent->beh) {
-			case MB_NONE: break;
+			case MB_NONE:
+				break;
 			case MB_OPT_ONOFF:
-			case MB_OPT_RANGE: wt += me_mfont_w * 3; break;
+			case MB_OPT_RANGE:
+				wt += me_mfont_w * 3;
+				break;
 			case MB_OPT_CUSTOM:
 			case MB_OPT_CUSTONOFF:
 			case MB_OPT_CUSTRANGE:
@@ -374,6 +458,9 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
 				if (name != NULL)
 					wt += (strlen(name) + offs) * me_mfont_w;
 				break;
+			case MB_OPT_ENUM:
+				wt += 10 * me_mfont_w;
+				break;
 			}
 		}
 
@@ -384,25 +471,31 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
 	h = n * me_mfont_h;
 	w += me_mfont_w * 2; /* selector */
 
-	if (w > g_screen_width) {
-		lprintf("width %d > %d\n", w, g_screen_width);
-		w = g_screen_width;
+	if (w > g_menuscreen_w) {
+		lprintf("width %d > %d\n", w, g_menuscreen_w);
+		w = g_menuscreen_w;
 	}
-	if (h > g_screen_height) {
-		lprintf("height %d > %d\n", w, g_screen_height);
-		h = g_screen_height;
+	if (h > g_menuscreen_h) {
+		lprintf("height %d > %d\n", w, g_menuscreen_h);
+		h = g_menuscreen_h;
 	}
 
-	x = g_screen_width  / 2 - w / 2;
-	y = g_screen_height / 2 - h / 2;
+	x = g_menuscreen_w / 2 - w / 2;
+	y = g_menuscreen_h / 2 - h / 2;
+#ifdef MENU_ALIGN_LEFT
+	if (x > 12) x = 12;
+#endif
 
 	/* draw */
-	plat_video_menu_begin();
-	menu_draw_selection(x, y + asel * me_mfont_h, w);
+	menu_draw_begin(1);
+	menu_draw_selection(x, y + vi_sel_ln * me_mfont_h, w);
 	x += me_mfont_w * 2;
 
 	for (ent = entries; ent->name; ent++)
 	{
+		const char **names;
+		int len, leftname_end = 0;
+
 		if (!ent->enabled)
 			continue;
 
@@ -411,14 +504,16 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
 			if (ent->generate_name)
 				name = ent->generate_name(ent->id, &offs);
 		}
-		if (name != NULL)
+		if (name != NULL) {
 			text_out16(x, y, name);
+			leftname_end = x + (strlen(name) + 1) * me_mfont_w;
+		}
 
 		switch (ent->beh) {
 		case MB_NONE:
 			break;
 		case MB_OPT_ONOFF:
-			text_out16(x + col2_offs, y, (*(int *)ent->var & ent->mask) ? "ON" : "OFF");
+			text_out16(x + col2_offs, y, me_read_onoff(ent) ? "ON" : "OFF");
 			break;
 		case MB_OPT_RANGE:
 			text_out16(x + col2_offs, y, "%i", *(int *)ent->var);
@@ -433,36 +528,62 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
 			if (name != NULL)
 				text_out16(x + col2_offs + offs * me_mfont_w, y, "%s", name);
 			break;
+		case MB_OPT_ENUM:
+			names = (const char **)ent->data;
+			for (i = 0; names[i] != NULL; i++) {
+				offs = x + col2_offs;
+				len = strlen(names[i]);
+				if (len > 10)
+					offs += (10 - len - 2) * me_mfont_w;
+				if (offs < leftname_end)
+					offs = leftname_end;
+				if (i == *(unsigned char *)ent->var) {
+					text_out16(offs, y, "%s", names[i]);
+					break;
+				}
+			}
+			break;
 		}
 
 		y += me_mfont_h;
 	}
 
-	/* display message if we have one */
+	/* display help or message if we have one */
+	h = (g_menuscreen_h - h) / 2; // bottom area height
 	if (menu_error_msg[0] != 0) {
-		if (g_screen_height - h >= 2 * me_mfont_h)
-			text_out16(5, g_screen_height - me_mfont_h - 4, menu_error_msg);
+		if (h >= me_mfont_h + 4)
+			text_out16(5, g_menuscreen_h - me_mfont_h - 4, menu_error_msg);
 		else
 			lprintf("menu msg doesn't fit!\n");
 
 		if (plat_get_ticks_ms() - menu_error_time > 2048)
 			menu_error_msg[0] = 0;
 	}
+	else if (ent_sel->help != NULL) {
+		const char *tmp = ent_sel->help;
+		int l;
+		for (l = 0; tmp != NULL && *tmp != 0; l++)
+			tmp = strchr(tmp + 1, '\n');
+		if (h >= l * me_sfont_h + 4)
+			for (tmp = ent_sel->help; l > 0; l--, tmp = strchr(tmp, '\n') + 1)
+				smalltext_out16(5, g_menuscreen_h - (l * me_sfont_h + 4), tmp, 0xffff);
+	}
 
 	if (draw_more != NULL)
 		draw_more();
 
-	plat_video_menu_end();
+	menu_draw_end();
 }
 
 static int me_process(menu_entry *entry, int is_next, int is_lr)
 {
+	const char **names;
 	int c;
 	switch (entry->beh)
 	{
 		case MB_OPT_ONOFF:
 		case MB_OPT_CUSTONOFF:
-			*(int *)entry->var ^= entry->mask;
+			me_toggle_onoff(entry);
 			return 1;
 		case MB_OPT_RANGE:
 		case MB_OPT_CUSTRANGE:
@@ -473,6 +594,16 @@ static int me_process(menu_entry *entry, int is_next, int is_lr)
 			if (*(int *)entry->var > (int)entry->max)
 				*(int *)entry->var = (int)entry->min;
 			return 1;
+		case MB_OPT_ENUM:
+			names = (const char **)entry->data;
+			for (c = 0; names[c] != NULL; c++)
+				;
+			*(signed char *)entry->var += is_next ? 1 : -1;
+			if (*(signed char *)entry->var < 0)
+				*(signed char *)entry->var = 0;
+			if (*(signed char *)entry->var >= c)
+				*(signed char *)entry->var = c - 1;
+			return 1;
 		default:
 			return 0;
 	}
@@ -480,14 +611,14 @@ static int me_process(menu_entry *entry, int is_next, int is_lr)
 
 static void debug_menu_loop(void);
 
-static void me_loop(menu_entry *menu, int *menu_sel, void (*draw_more)(void))
+static int me_loop_d(menu_entry *menu, int *menu_sel, void (*draw_prep)(void), void (*draw_more)(void))
 {
-	int ret, inp, sel = *menu_sel, menu_sel_max;
+	int ret = 0, inp, sel = *menu_sel, menu_sel_max;
 
 	menu_sel_max = me_count(menu) - 1;
 	if (menu_sel_max < 0) {
 		lprintf("no enabled menu entries\n");
-		return;
+		return 0;
 	}
 
 	while ((!menu[sel].enabled || !menu[sel].selectable) && sel < menu_sel_max)
@@ -495,13 +626,16 @@ static void me_loop(menu_entry *menu, int *menu_sel, void (*draw_more)(void))
 
 	/* make sure action buttons are not pressed on entering menu */
 	me_draw(menu, sel, NULL);
-	while (in_menu_wait_any(50) & (PBTN_MOK|PBTN_MBACK|PBTN_MENU));
+	while (in_menu_wait_any(NULL, 50) & (PBTN_MOK|PBTN_MBACK|PBTN_MENU));
 
 	for (;;)
 	{
+		if (draw_prep != NULL)
+			draw_prep();
+
 		me_draw(menu, sel, draw_more);
 		inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|
-					PBTN_MOK|PBTN_MBACK|PBTN_MENU|PBTN_L|PBTN_R, 70);
+			PBTN_MOK|PBTN_MBACK|PBTN_MENU|PBTN_L|PBTN_R, NULL, 70);
 		if (inp & (PBTN_MENU|PBTN_MBACK))
 			break;
 
@@ -532,30 +666,34 @@ static void me_loop(menu_entry *menu, int *menu_sel, void (*draw_more)(void))
 				continue;
 		}
 
-		if (inp & (PBTN_MOK|PBTN_LEFT|PBTN_RIGHT))
+		if (inp & (PBTN_MOK|PBTN_LEFT|PBTN_RIGHT|PBTN_L|PBTN_R))
 		{
-			if (menu[sel].handler != NULL) {
+			/* require PBTN_MOK for MB_NONE */
+			if (menu[sel].handler != NULL && (menu[sel].beh != MB_NONE || (inp & PBTN_MOK))) {
 				ret = menu[sel].handler(menu[sel].id, inp);
 				if (ret) break;
-				menu_sel_max = me_count(menu) - 1; /* might change */
+				menu_sel_max = me_count(menu) - 1; /* might change, so update */
 			}
 		}
 	}
 	*menu_sel = sel;
+
+	return ret;
 }
 
-/* ***************************************** */
+static int me_loop(menu_entry *menu, int *menu_sel)
+{
+	return me_loop_d(menu, menu_sel, NULL, NULL);
+}
 
-/* platform specific options and handlers */
-#include "../gp2x/menu.c"
+/* ***************************************** */
 
-static void draw_menu_credits(void)
+static void draw_menu_message(const char *msg, void (*draw_more)(void))
 {
-	const char *creds, *p;
 	int x, y, h, w, wt;
+	const char *p;
 
-	p = creds = plat_get_credits();
-
+	p = msg;
 	for (h = 1, w = 0; *p != 0; h++) {
 		for (wt = 0; *p != 0 && *p != '\n'; p++)
 			wt++;
@@ -567,14 +705,14 @@ static void draw_menu_credits(void)
 		p++;
 	}
 
-	x = g_screen_width  / 2 - w * me_mfont_w / 2;
-	y = g_screen_height / 2 - h * me_mfont_h / 2;
+	x = g_menuscreen_w / 2 - w * me_mfont_w / 2;
+	y = g_menuscreen_h / 2 - h * me_mfont_h / 2;
 	if (x < 0) x = 0;
 	if (y < 0) y = 0;
 
-	plat_video_menu_begin();
+	menu_draw_begin(1);
 
-	for (p = creds; *p != 0 && y <= g_screen_height - me_mfont_h; y += me_mfont_h) {
+	for (p = msg; *p != 0 && y <= g_menuscreen_h - me_mfont_h; y += me_mfont_h) {
 		text_out16(x, y, p);
 
 		for (; *p != 0 && *p != '\n'; p++)
@@ -583,75 +721,10 @@ static void draw_menu_credits(void)
 			p++;
 	}
 
-	plat_video_menu_end();
-}
-
-// --------- loading ROM screen ----------
-
-static int cdload_called = 0;
-
-static void load_progress_cb(int percent)
-{
-	int ln, len = percent * g_screen_width / 100;
-	unsigned short *dst = (unsigned short *)g_screen_ptr + g_screen_width * 10 * 2;
-
-	if (len > g_screen_width)
-		len = g_screen_width;
-	for (ln = 10 - 2; ln > 0; ln--, dst += g_screen_width)
-		memset(dst, 0xff, len * 2);
-	plat_video_menu_end();
-}
-
-static void cdload_progress_cb(const char *fname, int percent)
-{
-	int ln, len = percent * g_screen_width / 100;
-	unsigned short *dst = (unsigned short *)g_screen_ptr + g_screen_width * 10 * 2;
-
-	memset(dst, 0xff, g_screen_width * (me_sfont_h - 2) * 2);
-
-	smalltext_out16(1, 3 * me_sfont_h, "Processing CD image / MP3s", 0xffff);
-	smalltext_out16(1, 4 * me_sfont_h, fname, 0xffff);
-	dst += g_screen_width * me_sfont_h * 3;
-
-	if (len > g_screen_width)
-		len = g_screen_width;
-	for (ln = (me_sfont_h - 2); ln > 0; ln--, dst += g_screen_width)
-		memset(dst, 0xff, len * 2);
-
-	plat_video_menu_end();
-	cdload_called = 1;
-}
-
-void menu_romload_prepare(const char *rom_name)
-{
-	const char *p = rom_name + strlen(rom_name);
-
-	while (p > rom_name && *p != '/')
-		p--;
-
-	/* fill both buffers, callbacks won't update in full */
-	plat_video_menu_begin();
-	smalltext_out16(1, 1, "Loading", 0xffff);
-	smalltext_out16(1, me_sfont_h, p, 0xffff);
-	plat_video_menu_end();
-
-	plat_video_menu_begin();
-	smalltext_out16(1, 1, "Loading", 0xffff);
-	smalltext_out16(1, me_sfont_h, p, 0xffff);
-	plat_video_menu_end();
+	if (draw_more != NULL)
+		draw_more();
 
-	PicoCartLoadProgressCB = load_progress_cb;
-	PicoCDLoadProgressCB = cdload_progress_cb;
-	cdload_called = 0;
-}
-
-void menu_romload_end(void)
-{
-	PicoCartLoadProgressCB = NULL;
-	PicoCDLoadProgressCB = NULL;
-	smalltext_out16(1, (cdload_called ? 6 : 3) * me_sfont_h,
-		"Starting emulation...", 0xffff);
-	plat_video_menu_end();
+	menu_draw_end();
 }
 
 // -------------- del confirm ---------------
@@ -662,16 +735,13 @@ static void do_delete(const char *fpath, const char *fname)
 	const char *nm;
 	char tmp[64];
 
-	plat_video_menu_begin();
-
-	if (!rom_loaded)
-		menu_darken_bg(g_screen_ptr, g_screen_width * g_screen_height, 0);
+	menu_draw_begin(1);
 
 	len = strlen(fname);
-	if (len > g_screen_width/6)
-		len = g_screen_width/6;
+	if (len > g_menuscreen_w / me_sfont_w)
+		len = g_menuscreen_w / me_sfont_w;
 
-	mid = g_screen_width / 2;
+	mid = g_menuscreen_w / 2;
 	text_out16(mid - me_mfont_w * 15 / 2,  8 * me_mfont_h, "About to delete");
 	smalltext_out16(mid - len * me_sfont_w / 2, 9 * me_mfont_h + 5, fname, 0xbdff);
 	text_out16(mid - me_mfont_w * 13 / 2, 11 * me_mfont_h, "Are you sure?");
@@ -684,46 +754,32 @@ static void do_delete(const char *fpath, const char *fname)
 	len = strlen(tmp);
 
 	text_out16(mid - me_mfont_w * len / 2, 12 * me_mfont_h, tmp);
-	plat_video_menu_end();
+	menu_draw_end();
 
-	while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MA2));
-	inp = in_menu_wait(PBTN_MA3|PBTN_MBACK, 100);
+	while (in_menu_wait_any(NULL, 50) & (PBTN_MENU|PBTN_MA2));
+	inp = in_menu_wait(PBTN_MA3|PBTN_MBACK, NULL, 100);
 	if (inp & PBTN_MA3)
 		remove(fpath);
 }
 
 // -------------- ROM selector --------------
 
-// rrrr rggg gggb bbbb
-static unsigned short file2color(const char *fname)
-{
-	const char *ext = fname + strlen(fname) - 3;
-	static const char *rom_exts[]   = { "zip", "bin", "smd", "gen", "iso", "cso", "cue" };
-	static const char *other_exts[] = { "gmv", "pat" };
-	int i;
-
-	if (ext < fname) ext = fname;
-	for (i = 0; i < array_size(rom_exts); i++)
-		if (strcasecmp(ext, rom_exts[i]) == 0) return 0xbdff; // FIXME: mk defines
-	for (i = 0; i < array_size(other_exts); i++)
-		if (strcasecmp(ext, other_exts[i]) == 0) return 0xaff5;
-	return 0xffff;
-}
-
 static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
 {
 	int max_cnt, start, i, x, pos;
+	void *darken_ptr;
 
-	max_cnt = g_screen_height / me_sfont_h;
+	max_cnt = g_menuscreen_h / me_sfont_h;
 	start = max_cnt / 2 - sel;
 	n--; // exclude current dir (".")
 
-	plat_video_menu_begin();
+	menu_draw_begin(1);
 
 //	if (!rom_loaded)
 //		menu_darken_bg(gp2x_screen, 320*240, 0);
 
-	menu_darken_bg((short *)g_screen_ptr + g_screen_width * max_cnt/2 * 10, g_screen_width * 8, 0);
+	darken_ptr = (short *)g_menuscreen_ptr + g_menuscreen_w * max_cnt/2 * me_sfont_h;
+	menu_darken_bg(darken_ptr, darken_ptr, g_menuscreen_w * me_sfont_h * 8 / 10, 0);
 
 	x = 5 + me_mfont_w + 1;
 	if (start - 2 >= 0)
@@ -736,28 +792,28 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
 			smalltext_out16(x, pos * me_sfont_h, "/", 0xfff6);
 			smalltext_out16(x + me_sfont_w, pos * me_sfont_h, namelist[i+1]->d_name, 0xfff6);
 		} else {
-			unsigned short color = file2color(namelist[i+1]->d_name);
+			unsigned short color = fname2color(namelist[i+1]->d_name);
 			smalltext_out16(x, pos * me_sfont_h, namelist[i+1]->d_name, color);
 		}
 	}
 	smalltext_out16(5, max_cnt/2 * me_sfont_h, ">", 0xffff);
-	plat_video_menu_end();
+	menu_draw_end();
 }
 
 static int scandir_cmp(const void *p1, const void *p2)
 {
-	struct dirent **d1 = (struct dirent **)p1, **d2 = (struct dirent **)p2;
-	if ((*d1)->d_type == (*d2)->d_type) return alphasort(d1, d2);
-	if ((*d1)->d_type == DT_DIR) return -1; // put before
-	if ((*d2)->d_type == DT_DIR) return  1;
+	const struct dirent **d1 = (const struct dirent **)p1;
+	const struct dirent **d2 = (const struct dirent **)p2;
+	if ((*d1)->d_type == (*d2)->d_type)
+		return alphasort(d1, d2);
+	if ((*d1)->d_type == DT_DIR)
+		return -1; // put before
+	if ((*d2)->d_type == DT_DIR)
+		return  1;
+
 	return alphasort(d1, d2);
 }
 
-static const char *filter_exts[] = {
-	".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds",	"bcfg", ".txt", ".htm", "html",
-	".jpg", ".gpe"
-};
-
 static int scandir_filter(const struct dirent *ent)
 {
 	const char *p;
@@ -775,11 +831,28 @@ static int scandir_filter(const struct dirent *ent)
 	return 1;
 }
 
+static int dirent_seek_char(struct dirent **namelist, int len, int sel, char c)
+{
+	int i;
+
+	sel++;
+	for (i = sel + 1; i != sel; i++) {
+		if (i >= len)
+			i = 1;
+
+		if (tolower_simple(namelist[i]->d_name[0]) == c)
+			break;
+	}
+
+	return i - 1;
+}
+
 static char *menu_loop_romsel(char *curr_path, int len)
 {
 	struct dirent **namelist;
 	int n, inp, sel = 0;
 	char *ret = NULL, *fname = NULL;
+	char cinp;
 
 rescan:
 	// is this a dir or a full path?
@@ -791,13 +864,16 @@ rescan:
 		fname = p+1;
 	}
 
-	n = scandir(curr_path, &namelist, scandir_filter, scandir_cmp);
+	n = scandir(curr_path, &namelist, scandir_filter, (void *)scandir_cmp);
 	if (n < 0) {
+		char *t;
 		lprintf("menu_loop_romsel failed, dir: %s\n", curr_path);
 
 		// try root
-		getcwd(curr_path, len);
-		n = scandir(curr_path, &namelist, scandir_filter, scandir_cmp);
+		t = getcwd(curr_path, len);
+		if (t == NULL)
+			plat_get_root_dir(curr_path, len);
+		n = scandir(curr_path, &namelist, scandir_filter, (void *)scandir_cmp);
 		if (n < 0) {
 			// oops, we failed
 			lprintf("menu_loop_romsel failed, dir: %s\n", curr_path);
@@ -806,27 +882,35 @@ rescan:
 	}
 
 	// try to find sel
+	// note: we don't show '.' so sel is namelist index - 1
 	if (fname != NULL) {
 		int i;
 		for (i = 1; i < n; i++) {
-			if (strcmp(namelist[i]->d_name, fname) == 0) {
+			char *dname = namelist[i]->d_name;
+			if (dname[0] == fname[0] && strcmp(dname, fname) == 0) {
 				sel = i - 1;
 				break;
 			}
 		}
 	}
 
+	/* make sure action buttons are not pressed on entering menu */
+	draw_dirlist(curr_path, namelist, n, sel);
+	while (in_menu_wait_any(NULL, 50) & (PBTN_MOK|PBTN_MBACK|PBTN_MENU))
+		;
+
 	for (;;)
 	{
 		draw_dirlist(curr_path, namelist, n, sel);
 		inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|
-			PBTN_L|PBTN_R|PBTN_MA2|PBTN_MOK|PBTN_MBACK|PBTN_MENU, 33);
+			PBTN_L|PBTN_R|PBTN_MA2|PBTN_MOK|PBTN_MBACK|PBTN_MENU|PBTN_CHAR, &cinp, 33);
 		if (inp & PBTN_UP  )  { sel--;   if (sel < 0)   sel = n-2; }
 		if (inp & PBTN_DOWN)  { sel++;   if (sel > n-2) sel = 0; }
 		if (inp & PBTN_LEFT)  { sel-=10; if (sel < 0)   sel = 0; }
 		if (inp & PBTN_L)     { sel-=24; if (sel < 0)   sel = 0; }
 		if (inp & PBTN_RIGHT) { sel+=10; if (sel > n-2) sel = n-2; }
 		if (inp & PBTN_R)     { sel+=24; if (sel > n-2) sel = n-2; }
+		if (inp & PBTN_CHAR)  sel = dirent_seek_char(namelist, n, sel, cinp);
 		if ((inp & PBTN_MOK) || (inp & (PBTN_MENU|PBTN_MA2)) == (PBTN_MENU|PBTN_MA2))
 		{
 			again:
@@ -850,9 +934,12 @@ rescan:
 			{
 				int newlen;
 				char *p, *newdir;
-				if (!(inp & PBTN_MOK)) continue;
+				if (!(inp & PBTN_MOK))
+					continue;
 				newlen = strlen(curr_path) + strlen(namelist[sel+1]->d_name) + 2;
 				newdir = malloc(newlen);
+				if (newdir == NULL)
+					break;
 				if (strcmp(namelist[sel+1]->d_name, "..") == 0) {
 					char *start = curr_path;
 					p = start + strlen(start) - 1;
@@ -898,62 +985,22 @@ rescan:
 		free(namelist);
 	}
 
-	return ret;
-}
-
-// ------------ patch/gg menu ------------
-
-static void draw_patchlist(int sel)
-{
-	int max_cnt, start, i, pos, active;
-
-	max_cnt = g_screen_height / 10;
-	start = max_cnt / 2 - sel;
-
-	plat_video_menu_begin();
-
-	for (i = 0; i < PicoPatchCount; i++) {
-		pos = start + i;
-		if (pos < 0) continue;
-		if (pos >= max_cnt) break;
-		active = PicoPatches[i].active;
-		smalltext_out16(14,     pos * me_sfont_h, active ? "ON " : "OFF", active ? 0xfff6 : 0xffff);
-		smalltext_out16(14+6*4, pos * me_sfont_h, PicoPatches[i].name,    active ? 0xfff6 : 0xffff);
+	// restore curr_path
+	if (fname != NULL) {
+		n = strlen(curr_path);
+		if (curr_path + n + 1 == fname)
+			curr_path[n] = '/';
 	}
-	pos = start + i;
-	if (pos < max_cnt)
-		smalltext_out16(14, pos * me_sfont_h, "done", 0xffff);
 
-	text_out16(5, max_cnt / 2 * me_sfont_h, ">");
-	plat_video_menu_end();
-}
-
-static void menu_loop_patches(void)
-{
-	static int menu_sel = 0;
-	int inp;
-
-	for (;;)
-	{
-		draw_patchlist(menu_sel);
-		inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_L|PBTN_R|PBTN_MOK|PBTN_MBACK, 33);
-		if (inp & PBTN_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = PicoPatchCount; }
-		if (inp & PBTN_DOWN) { menu_sel++; if (menu_sel > PicoPatchCount) menu_sel = 0; }
-		if (inp &(PBTN_LEFT|PBTN_L))  { menu_sel-=10; if (menu_sel < 0) menu_sel = 0; }
-		if (inp &(PBTN_RIGHT|PBTN_R)) { menu_sel+=10; if (menu_sel > PicoPatchCount) menu_sel = PicoPatchCount; }
-		if (inp & PBTN_MOK) { // action
-			if (menu_sel < PicoPatchCount)
-				PicoPatches[menu_sel].active = !PicoPatches[menu_sel].active;
-			else 	break;
-		}
-		if (inp & PBTN_MBACK)
-			break;
-	}
+	return ret;
 }
 
 // ------------ savestate loader ------------
 
+#define STATE_SLOT_COUNT 10
+
 static int state_slot_flags = 0;
+static int state_slot_times[STATE_SLOT_COUNT];
 
 static void state_check_slots(void)
 {
@@ -961,80 +1008,68 @@ static void state_check_slots(void)
 
 	state_slot_flags = 0;
 
-	for (slot = 0; slot < 10; slot++) {
-		if (emu_check_save_file(slot))
+	for (slot = 0; slot < STATE_SLOT_COUNT; slot++) {
+		state_slot_times[slot] = 0;
+		if (emu_check_save_file(slot, &state_slot_times[slot]))
 			state_slot_flags |= 1 << slot;
 	}
 }
 
-static void draw_savestate_bg(int slot)
-{
-	struct PicoVideo tmp_pv;
-	unsigned short tmp_cram[0x40];
-	unsigned short tmp_vsram[0x40];
-	void *tmp_vram;
-	const char *fname;
-
-	fname = emu_get_save_fname(1, 0, slot);
-	if (!fname) return;
-
-	tmp_vram = malloc(sizeof(Pico.vram));
-	if (tmp_vram == NULL) return;
-
-	memcpy(tmp_vram, Pico.vram, sizeof(Pico.vram));
-	memcpy(tmp_cram, Pico.cram, sizeof(Pico.cram));
-	memcpy(tmp_vsram, Pico.vsram, sizeof(Pico.vsram));
-	memcpy(&tmp_pv, &Pico.video, sizeof(Pico.video));
-
-	PicoStateLoadVDP(fname);
-
-	/* do a frame and fetch menu bg */
-	pemu_forced_frame(POPT_EN_SOFTSCALE);
-	plat_video_menu_enter(1);
-
-	memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));
-	memcpy(Pico.cram, tmp_cram, sizeof(Pico.cram));
-	memcpy(Pico.vsram, tmp_vsram, sizeof(Pico.vsram));
-	memcpy(&Pico.video, &tmp_pv,  sizeof(Pico.video));
-	free(tmp_vram);
-}
+static void draw_savestate_bg(int slot);
 
 static void draw_savestate_menu(int menu_sel, int is_loading)
 {
 	int i, x, y, w, h;
+	char time_buf[32];
 
 	if (state_slot_flags & (1 << menu_sel))
 		draw_savestate_bg(menu_sel);
 
 	w = (13 + 2) * me_mfont_w;
-	h = (1+2+10+1) * me_mfont_h;
-	x = g_screen_width / 2 - w / 2;
+	h = (1+2+STATE_SLOT_COUNT+1) * me_mfont_h;
+	x = g_menuscreen_w / 2 - w / 2;
 	if (x < 0) x = 0;
-	y = g_screen_height / 2 - h / 2;
+	y = g_menuscreen_h / 2 - h / 2;
 	if (y < 0) y = 0;
+#ifdef MENU_ALIGN_LEFT
+	if (x > 12 + me_mfont_w * 2)
+		x = 12 + me_mfont_w * 2;
+#endif
 
-	plat_video_menu_begin();
+	menu_draw_begin(1);
 
 	text_out16(x, y, is_loading ? "Load state" : "Save state");
 	y += 3 * me_mfont_h;
 
-	menu_draw_selection(x - me_mfont_w * 2, y + menu_sel * me_mfont_h, (13 + 2) * me_mfont_w + 4);
+	menu_draw_selection(x - me_mfont_w * 2, y + menu_sel * me_mfont_h, (23 + 2) * me_mfont_w + 4);
 
-	/* draw all 10 slots */
-	for (i = 0; i < 10; i++, y += me_mfont_h)
+	/* draw all slots */
+	for (i = 0; i < STATE_SLOT_COUNT; i++, y += me_mfont_h)
 	{
-		text_out16(x, y, "SLOT %i (%s)", i, (state_slot_flags & (1 << i)) ? "USED" : "free");
+		if (!(state_slot_flags & (1 << i)))
+			strcpy(time_buf, "free");
+		else {
+			strcpy(time_buf, "USED");
+			if (state_slot_times[i] != 0) {
+				time_t time = state_slot_times[i];
+				struct tm *t = localtime(&time);
+				strftime(time_buf, sizeof(time_buf), "%x %R", t);
+			}
+		}
+
+		text_out16(x, y, "SLOT %i (%s)", i, time_buf);
 	}
 	text_out16(x, y, "back");
 
-	plat_video_menu_end();
+	menu_draw_end();
 }
 
 static int menu_loop_savestate(int is_loading)
 {
-	static int menu_sel = 10;
-	int menu_sel_max = 10;
+	static int menu_sel = STATE_SLOT_COUNT;
+	int menu_sel_max = STATE_SLOT_COUNT;
 	unsigned long inp = 0;
+	int ret = 0;
 
 	state_check_slots();
 
@@ -1044,7 +1079,7 @@ static int menu_loop_savestate(int is_loading)
 	for (;;)
 	{
 		draw_savestate_menu(menu_sel, is_loading);
-		inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_MOK|PBTN_MBACK, 100);
+		inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_MOK|PBTN_MBACK, NULL, 100);
 		if (inp & PBTN_UP) {
 			do {
 				menu_sel--;
@@ -1060,37 +1095,33 @@ static int menu_loop_savestate(int is_loading)
 			} while (!(state_slot_flags & (1 << menu_sel)) && menu_sel != menu_sel_max && is_loading);
 		}
 		if (inp & PBTN_MOK) { // save/load
-			if (menu_sel < 10) {
+			if (menu_sel < STATE_SLOT_COUNT) {
 				state_slot = menu_sel;
 				if (emu_save_load_game(is_loading, 0)) {
 					me_update_msg(is_loading ? "Load failed" : "Save failed");
-					return 0;
+					break;
 				}
-				return 1;
+				ret = 1;
+				break;
 			}
-			return 0;
+			break;
 		}
 		if (inp & PBTN_MBACK)
-			return 0;
+			break;
 	}
+
+	return ret;
 }
 
 // -------------- key config --------------
 
 static char *action_binds(int player_idx, int action_mask, int dev_id)
 {
-	int k, count, can_combo, type;
-	const int *binds;
+	int dev = 0, dev_last = IN_MAX_DEVS - 1;
+	int can_combo = 1, type;
 
 	static_buff[0] = 0;
 
-	binds = in_get_dev_binds(dev_id);
-	if (binds == NULL)
-		return static_buff;
-
-	count = in_get_dev_info(dev_id, IN_INFO_BIND_COUNT);
-	can_combo = in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS);
-
 	type = IN_BINDTYPE_EMU;
 	if (player_idx >= 0) {
 		can_combo = 0;
@@ -1099,22 +1130,37 @@ static char *action_binds(int player_idx, int action_mask, int dev_id)
 	if (player_idx == 1)
 		action_mask <<= 16;
 
-	for (k = 0; k < count; k++)
-	{
-		const char *xname;
-		int len;
+	if (dev_id >= 0)
+		dev = dev_last = dev_id;
 
-		if (!(binds[IN_BIND_OFFS(k, type)] & action_mask))
+	for (; dev <= dev_last; dev++) {
+		int k, count = 0, combo = 0;
+		const int *binds;
+
+		binds = in_get_dev_binds(dev);
+		if (binds == NULL)
 			continue;
 
-		xname = in_get_key_name(dev_id, k);
-		len = strlen(static_buff);
-		if (len) {
-			strncat(static_buff, can_combo ? " + " : ", ",
-				sizeof(static_buff) - len - 1);
-			len += can_combo ? 3 : 2;
+		in_get_config(dev, IN_CFG_BIND_COUNT, &count);
+		in_get_config(dev, IN_CFG_DOES_COMBOS, &combo);
+		combo = combo && can_combo;
+
+		for (k = 0; k < count; k++) {
+			const char *xname;
+			int len;
+
+			if (!(binds[IN_BIND_OFFS(k, type)] & action_mask))
+				continue;
+
+			xname = in_get_key_name(dev, k);
+			len = strlen(static_buff);
+			if (len) {
+				strncat(static_buff, combo ? " + " : ", ",
+					sizeof(static_buff) - len - 1);
+				len += combo ? 3 : 2;
+			}
+			strncat(static_buff, xname, sizeof(static_buff) - len - 1);
 		}
-		strncat(static_buff, xname, sizeof(static_buff) - len - 1);
 	}
 
 	return static_buff;
@@ -1124,13 +1170,13 @@ static int count_bound_keys(int dev_id, int action_mask, int bindtype)
 {
 	const int *binds;
 	int k, keys = 0;
-	int count;
+	int count = 0;
 
 	binds = in_get_dev_binds(dev_id);
 	if (binds == NULL)
 		return 0;
 
-	count = in_get_dev_info(dev_id, IN_INFO_BIND_COUNT);
+	in_get_config(dev_id, IN_CFG_BIND_COUNT, &count);
 	for (k = 0; k < count; k++)
 	{
 		if (binds[IN_BIND_OFFS(k, bindtype)] & action_mask)
@@ -1148,12 +1194,12 @@ static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_
 	int x, y, w, i;
 
 	w = ((player_idx >= 0) ? 20 : 30) * me_mfont_w;
-	x = g_screen_width / 2 - w / 2;
-	y = (g_screen_height - 4 * me_mfont_h) / 2 - (2 + opt_cnt) * me_mfont_h / 2;
+	x = g_menuscreen_w / 2 - w / 2;
+	y = (g_menuscreen_h - 4 * me_mfont_h) / 2 - (2 + opt_cnt) * me_mfont_h / 2;
 	if (x < me_mfont_w * 2)
 		x = me_mfont_w * 2;
 
-	plat_video_menu_begin();
+	menu_draw_begin(1);
 	if (player_idx >= 0)
 		text_out16(x, y, "Player %i controls", player_idx + 1);
 	else
@@ -1166,36 +1212,39 @@ static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_
 		text_out16(x, y, "%s : %s", opts[i].name,
 			action_binds(player_idx, opts[i].mask, dev_id));
 
-	dev_name = in_get_dev_name(dev_id, 1, 1);
+	if (dev_id < 0)
+		dev_name = "(all devices)";
+	else
+		dev_name = in_get_dev_name(dev_id, 1, 1);
 	w = strlen(dev_name) * me_mfont_w;
 	if (w < 30 * me_mfont_w)
 		w = 30 * me_mfont_w;
-	if (w > g_screen_width)
-		w = g_screen_width;
+	if (w > g_menuscreen_w)
+		w = g_menuscreen_w;
 
-	x = g_screen_width / 2 - w / 2;
+	x = g_menuscreen_w / 2 - w / 2;
 
 	if (!is_bind) {
 		snprintf(buff2, sizeof(buff2), "%s", in_get_key_name(-1, -PBTN_MOK));
 		snprintf(buff, sizeof(buff), "%s - bind, %s - clear", buff2,
 				in_get_key_name(-1, -PBTN_MA2));
-		text_out16(x, g_screen_height - 4 * me_mfont_h, buff);
+		text_out16(x, g_menuscreen_h - 4 * me_mfont_h, buff);
 	}
 	else
-		text_out16(x, g_screen_height - 4 * me_mfont_h, "Press a button to bind/unbind");
+		text_out16(x, g_menuscreen_h - 4 * me_mfont_h, "Press a button to bind/unbind");
 
 	if (dev_count > 1) {
-		text_out16(x, g_screen_height - 3 * me_mfont_h, dev_name);
-		text_out16(x, g_screen_height - 2 * me_mfont_h, "Press left/right for other devs");
+		text_out16(x, g_menuscreen_h - 3 * me_mfont_h, dev_name);
+		text_out16(x, g_menuscreen_h - 2 * me_mfont_h, "Press left/right for other devs");
 	}
 
-	plat_video_menu_end();
+	menu_draw_end();
 }
 
 static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_idx)
 {
-	int i, sel = 0, menu_sel_max = opt_cnt - 1;
-	int dev_id, dev_count, kc, is_down, mkey;
+	int i, sel = 0, menu_sel_max = opt_cnt - 1, does_combos = 0;
+	int dev_id, bind_dev_id, dev_count, kc, is_down, mkey;
 	int unbind, bindtype, mask_shift;
 
 	for (i = 0, dev_id = -1, dev_count = 0; i < IN_MAX_DEVS; i++) {
@@ -1211,6 +1260,7 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
 		return;
 	}
 
+	dev_id = -1; // show all
 	mask_shift = 0;
 	if (player_idx == 1)
 		mask_shift = 16;
@@ -1219,31 +1269,34 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
 	for (;;)
 	{
 		draw_key_config(opts, opt_cnt, player_idx, sel, dev_id, dev_count, 0);
-		mkey = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MBACK|PBTN_MOK|PBTN_MA2, 100);
+		mkey = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT
+				|PBTN_MBACK|PBTN_MOK|PBTN_MA2, NULL, 100);
 		switch (mkey) {
 			case PBTN_UP:   sel--; if (sel < 0) sel = menu_sel_max; continue;
 			case PBTN_DOWN: sel++; if (sel > menu_sel_max) sel = 0; continue;
 			case PBTN_LEFT:
-				for (i = 0, dev_id--; i < IN_MAX_DEVS; i++, dev_id--) {
-					if (dev_id < 0)
+				for (i = 0, dev_id--; i < IN_MAX_DEVS + 1; i++, dev_id--) {
+					if (dev_id < -1)
 						dev_id = IN_MAX_DEVS - 1;
-					if (in_get_dev_name(dev_id, 1, 0) != NULL)
+					if (dev_id == -1 || in_get_dev_name(dev_id, 1, 0) != NULL)
 						break;
 				}
 				continue;
 			case PBTN_RIGHT:
 				for (i = 0, dev_id++; i < IN_MAX_DEVS; i++, dev_id++) {
 					if (dev_id >= IN_MAX_DEVS)
-						dev_id = 0;
-					if (in_get_dev_name(dev_id, 1, 0) != NULL)
+						dev_id = -1;
+					if (dev_id == -1 || in_get_dev_name(dev_id, 1, 0) != NULL)
 						break;
 				}
 				continue;
-			case PBTN_MBACK: return;
+			case PBTN_MBACK:
+				return;
 			case PBTN_MOK:
 				if (sel >= opt_cnt)
 					return;
-				while (in_menu_wait_any(30) & PBTN_MOK);
+				while (in_menu_wait_any(NULL, 30) & PBTN_MOK)
+					;
 				break;
 			case PBTN_MA2:
 				in_unbind_all(dev_id, opts[sel].mask << mask_shift, bindtype);
@@ -1255,854 +1308,20 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
 
 		/* wait for some up event */
 		for (is_down = 1; is_down; )
-			kc = in_update_keycode(&dev_id, &is_down, -1);
+			kc = in_update_keycode(&bind_dev_id, &is_down, NULL, -1);
 
-		i = count_bound_keys(dev_id, opts[sel].mask << mask_shift, bindtype);
+		i = count_bound_keys(bind_dev_id, opts[sel].mask << mask_shift, bindtype);
 		unbind = (i > 0);
 
 		/* allow combos if device supports them */
-		if (i == 1 && bindtype == IN_BINDTYPE_EMU &&
-				in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS))
+		in_get_config(bind_dev_id, IN_CFG_DOES_COMBOS, &does_combos);
+		if (i == 1 && bindtype == IN_BINDTYPE_EMU && does_combos)
 			unbind = 0;
 
-		in_bind_key(dev_id, kc, opts[sel].mask << mask_shift, bindtype, unbind);
-	}
-}
-
-// PicoPad[] format: MXYZ SACB RLDU
-me_bind_action me_ctrl_actions[15] =
-{
-	{ "UP     ", 0x0001 },
-	{ "DOWN   ", 0x0002 },
-	{ "LEFT   ", 0x0004 },
-	{ "RIGHT  ", 0x0008 },
-	{ "A      ", 0x0040 },
-	{ "B      ", 0x0010 },
-	{ "C      ", 0x0020 },
-	{ "A turbo", 0x4000 },
-	{ "B turbo", 0x1000 },
-	{ "C turbo", 0x2000 },
-	{ "START  ", 0x0080 },
-	{ "MODE   ", 0x0800 },
-	{ "X      ", 0x0400 },
-	{ "Y      ", 0x0200 },
-	{ "Z      ", 0x0100 }
-};
-
-me_bind_action emuctrl_actions[] =
-{
-	{ "Load State       ", PEV_STATE_LOAD },
-	{ "Save State       ", PEV_STATE_SAVE },
-	{ "Prev Save Slot   ", PEV_SSLOT_PREV },
-	{ "Next Save Slot   ", PEV_SSLOT_NEXT },
-	{ "Switch Renderer  ", PEV_SWITCH_RND },
-	{ "Volume Down      ", PEV_VOL_DOWN },
-	{ "Volume Up        ", PEV_VOL_UP },
-	{ "Fast forward     ", PEV_FF },
-	{ "Enter Menu       ", PEV_MENU },
-	{ "Pico Next page   ", PEV_PICO_PNEXT },
-	{ "Pico Prev page   ", PEV_PICO_PPREV },
-	{ "Pico Switch input", PEV_PICO_SWINP },
-	{ NULL,                0 }
-};
-
-static int key_config_loop_wrap(menu_id id, int keys)
-{
-	switch (id) {
-		case MA_CTRL_PLAYER1:
-			key_config_loop(me_ctrl_actions, array_size(me_ctrl_actions), 0);
-			break;
-		case MA_CTRL_PLAYER2:
-			key_config_loop(me_ctrl_actions, array_size(me_ctrl_actions), 1);
-			break;
-		case MA_CTRL_EMU:
-			key_config_loop(emuctrl_actions, array_size(emuctrl_actions) - 1, -1);
-			break;
-		default:
-			break;
-	}
-	return 0;
-}
-
-static const char *mgn_dev_name(menu_id id, int *offs)
-{
-	const char *name = NULL;
-	static int it = 0;
-
-	if (id == MA_CTRL_DEV_FIRST)
-		it = 0;
-
-	for (; it < IN_MAX_DEVS; it++) {
-		name = in_get_dev_name(it, 1, 1);
-		if (name != NULL)
-			break;
-	}
-
-	it++;
-	return name;
-}
-
-static int mh_saveloadcfg(menu_id id, int keys);
-static const char *mgn_savecfg(menu_id id, int *offs);
-
-static menu_entry e_menu_keyconfig[] =
-{
-	mee_handler_id("Player 1",          MA_CTRL_PLAYER1,    key_config_loop_wrap),
-	mee_handler_id("Player 2",          MA_CTRL_PLAYER2,    key_config_loop_wrap),
-	mee_handler_id("Emulator controls", MA_CTRL_EMU,        key_config_loop_wrap),
-	mee_onoff     ("6 button pad",      MA_OPT_6BUTTON_PAD, PicoOpt, POPT_6BTN_PAD),
-	mee_range     ("Turbo rate",        MA_CTRL_TURBO_RATE, currentConfig.turbo_rate, 1, 30),
-	mee_handler_mkname_id(MA_OPT_SAVECFG, mh_saveloadcfg, mgn_savecfg),
-	mee_handler_id("Save cfg for loaded game", MA_OPT_SAVECFG_GAME, mh_saveloadcfg),
-	mee_label     (""),
-	mee_label     ("Input devices:"),
-	mee_label_mk  (MA_CTRL_DEV_FIRST, mgn_dev_name),
-	mee_label_mk  (MA_CTRL_DEV_NEXT,  mgn_dev_name),
-	mee_label_mk  (MA_CTRL_DEV_NEXT,  mgn_dev_name),
-	mee_label_mk  (MA_CTRL_DEV_NEXT,  mgn_dev_name),
-	mee_label_mk  (MA_CTRL_DEV_NEXT,  mgn_dev_name),
-	mee_label_mk  (MA_CTRL_DEV_NEXT,  mgn_dev_name),
-	mee_label_mk  (MA_CTRL_DEV_NEXT,  mgn_dev_name),
-	mee_end,
-};
-
-static int menu_loop_keyconfig(menu_id id, int keys)
-{
-	static int sel = 0;
-
-	me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, rom_loaded);
-	me_loop(e_menu_keyconfig, &sel, NULL);
-	return 0;
-}
-
-// ------------ SCD options menu ------------
-
-static const char *mgn_cdopt_ra(menu_id id, int *offs)
-{
-	*offs = -5;
-	if (PicoCDBuffers <= 0)
-		return "     OFF";
-	sprintf(static_buff, "%5iK", PicoCDBuffers * 2);
-	return static_buff;
-}
-
-static int mh_cdopt_ra(menu_id id, int keys)
-{
-	if (keys & PBTN_LEFT) {
-		PicoCDBuffers >>= 1;
-		if (PicoCDBuffers < 2)
-			PicoCDBuffers = 0;
-	} else {
-		if (PicoCDBuffers <= 0)
-			PicoCDBuffers = 1;
-		PicoCDBuffers <<= 1;
-		if (PicoCDBuffers > 8*1024)
-			PicoCDBuffers = 8*1024; // 16M
-	}
-	return 0;
-}
-
-static menu_entry e_menu_cd_options[] =
-{
-	mee_onoff("CD LEDs",              MA_CDOPT_LEDS,          currentConfig.EmuOpt, EOPT_EN_CD_LEDS),
-	mee_onoff("CDDA audio",           MA_CDOPT_CDDA,          PicoOpt, POPT_EN_MCD_CDDA),
-	mee_onoff("PCM audio",            MA_CDOPT_PCM,           PicoOpt, POPT_EN_MCD_PCM),
-	mee_cust ("ReadAhead buffer",     MA_CDOPT_READAHEAD,     mh_cdopt_ra, mgn_cdopt_ra),
-	mee_onoff("SaveRAM cart",         MA_CDOPT_SAVERAM,       PicoOpt, POPT_EN_MCD_RAMCART),
-	mee_onoff("Scale/Rot. fx (slow)", MA_CDOPT_SCALEROT_CHIP, PicoOpt, POPT_EN_MCD_GFX),
-	mee_onoff("Better sync (slow)",   MA_CDOPT_BETTER_SYNC,   PicoOpt, POPT_EN_MCD_PSYNC),
-	mee_end,
-};
-
-static int menu_loop_cd_options(menu_id id, int keys)
-{
-	static int sel = 0;
-	me_loop(e_menu_cd_options, &sel, NULL);
-	return 0;
-}
-
-// ------------ adv options menu ------------
-
-static menu_entry e_menu_adv_options[] =
-{
-	mee_onoff     ("SRAM/BRAM saves",          MA_OPT_SRAM_STATES,    currentConfig.EmuOpt, EOPT_EN_SRAM),
-	mee_onoff     ("Disable sprite limit",     MA_OPT2_NO_SPRITE_LIM, PicoOpt, POPT_DIS_SPRITE_LIM),
-	mee_onoff     ("Emulate Z80",              MA_OPT2_ENABLE_Z80,    PicoOpt, POPT_EN_Z80),
-	mee_onoff     ("Emulate YM2612 (FM)",      MA_OPT2_ENABLE_YM2612, PicoOpt, POPT_EN_FM),
-	mee_onoff     ("Emulate SN76496 (PSG)",    MA_OPT2_ENABLE_SN76496,PicoOpt, POPT_EN_PSG),
-	mee_onoff     ("gzip savestates",          MA_OPT2_GZIP_STATES,   currentConfig.EmuOpt, EOPT_GZIP_SAVES),
-	mee_onoff     ("Don't save last used ROM", MA_OPT2_NO_LAST_ROM,   currentConfig.EmuOpt, EOPT_NO_AUTOSVCFG),
-	mee_onoff     ("Disable idle loop patching",MA_OPT2_NO_IDLE_LOOPS,PicoOpt, POPT_DIS_IDLE_DET),
-	mee_onoff     ("Disable frame limiter",    MA_OPT2_NO_FRAME_LIMIT,currentConfig.EmuOpt, EOPT_NO_FRMLIMIT),
-	MENU_GP2X_OPTIONS_ADV
-	mee_end,
-};
-
-static int menu_loop_adv_options(menu_id id, int keys)
-{
-	static int sel = 0;
-	me_loop(e_menu_adv_options, &sel, NULL);
-	return 0;
-}
-
-// ------------ gfx options menu ------------
-
-static int mh_opt_render(menu_id id, int keys)
-{
-	plat_video_toggle_renderer((keys & PBTN_RIGHT) ? 1 : 0, 1);
-	return 0;
-}
-
-static menu_entry e_menu_gfx_options[] =
-{
-	mee_cust      ("Renderer",                 MA_OPT_RENDERER,       mh_opt_render, mgn_opt_renderer),
-	MENU_GP2X_OPTIONS_GFX
-	mee_end,
-};
-
-static int menu_loop_gfx_options(menu_id id, int keys)
-{
-	static int sel = 0;
-	me_loop(e_menu_gfx_options, &sel, NULL);
-	return 0;
-}
-
-// ------------ options menu ------------
-
-static menu_entry e_menu_options[];
-
-static int sndrate_prevnext(int rate, int dir)
-{
-	static const int rates[] = { 8000, 11025, 16000, 22050, 44100 };
-	int i;
-
-	for (i = 0; i < 5; i++)
-		if (rates[i] == rate) break;
-
-	i += dir ? 1 : -1;
-	if (i > 4) {
-		if (!(PicoOpt & POPT_EN_STEREO)) {
-			PicoOpt |= POPT_EN_STEREO;
-			return rates[0];
-		}
-		return rates[4];
-	}
-	if (i < 0) {
-		if (PicoOpt & POPT_EN_STEREO) {
-			PicoOpt &= ~POPT_EN_STEREO;
-			return rates[4];
-		}
-		return rates[0];
-	}
-	return rates[i];
-}
-
-static void region_prevnext(int right)
-{
-	// jp_ntsc=1, jp_pal=2, usa=4, eu=8
-	static const int rgn_orders[] = { 0x148, 0x184, 0x814, 0x418, 0x841, 0x481 };
-	int i;
-
-	if (right) {
-		if (!PicoRegionOverride) {
-			for (i = 0; i < 6; i++)
-				if (rgn_orders[i] == PicoAutoRgnOrder) break;
-			if (i < 5) PicoAutoRgnOrder = rgn_orders[i+1];
-			else PicoRegionOverride=1;
-		}
-		else
-			PicoRegionOverride <<= 1;
-		if (PicoRegionOverride > 8)
-			PicoRegionOverride = 8;
-	} else {
-		if (!PicoRegionOverride) {
-			for (i = 0; i < 6; i++)
-				if (rgn_orders[i] == PicoAutoRgnOrder) break;
-			if (i > 0) PicoAutoRgnOrder = rgn_orders[i-1];
-		}
-		else
-			PicoRegionOverride >>= 1;
-	}
-}
-
-static int mh_opt_misc(menu_id id, int keys)
-{
-	int i;
-
-	switch (id) {
-	case MA_OPT_SOUND_QUALITY:
-		PsndRate = sndrate_prevnext(PsndRate, keys & PBTN_RIGHT);
-		break;
-	case MA_OPT_REGION:
-		region_prevnext(keys & PBTN_RIGHT);
-		break;
-	case MA_OPT_CONFIRM_STATES:
-		i = ((currentConfig.EmuOpt>>9)&1) | ((currentConfig.EmuOpt>>10)&2);
-		i += (keys & PBTN_LEFT) ? -1 : 1;
-		if (i < 0) i = 0; else if (i > 3) i = 3;
-		i |= i << 1; i &= ~2;
-		currentConfig.EmuOpt &= ~0xa00;
-		currentConfig.EmuOpt |= i << 9;
-		break;
-	default:
-		break;
-	}
-	return 0;
-}
-
-static int mh_saveloadcfg(menu_id id, int keys)
-{
-	int ret;
-
-	if (keys & (PBTN_LEFT|PBTN_RIGHT)) { // multi choice
-		config_slot += (keys & PBTN_LEFT) ? -1 : 1;
-		if (config_slot < 0) config_slot = 9;
-		else if (config_slot > 9) config_slot = 0;
-		me_enable(e_menu_options, MA_OPT_LOADCFG, config_slot != config_slot_current);
-		return 0;
-	}
+		if (unbind)
+			in_unbind_all(bind_dev_id, opts[sel].mask << mask_shift, bindtype);
 
-	switch (id) {
-	case MA_OPT_SAVECFG:
-	case MA_OPT_SAVECFG_GAME:
-		if (emu_write_config(id == MA_OPT_SAVECFG_GAME ? 1 : 0))
-			me_update_msg("config saved");
-		else
-			me_update_msg("failed to write config");
-		break;
-	case MA_OPT_LOADCFG:
-		ret = emu_read_config(1, 1);
-		if (!ret) ret = emu_read_config(0, 1);
-		if (ret)  me_update_msg("config loaded");
-		else      me_update_msg("failed to load config");
-		break;
-	default:
-		return 0;
+		in_bind_key(bind_dev_id, kc, opts[sel].mask << mask_shift, bindtype, 0);
 	}
-
-	return 1;
-}
-
-static int mh_restore_defaults(menu_id id, int keys)
-{
-	emu_set_defconfig();
-	me_update_msg("defaults restored");
-	return 1;
-}
-
-static const char *mgn_opt_fskip(menu_id id, int *offs)
-{
-	if (currentConfig.Frameskip < 0)
-		return "Auto";
-	sprintf(static_buff, "%d", currentConfig.Frameskip);
-	return static_buff;
-}
-
-static const char *mgn_opt_sound(menu_id id, int *offs)
-{
-	const char *str2;
-	*offs = -8;
-	str2 = (PicoOpt & POPT_EN_STEREO) ? "stereo" : "mono";
-	sprintf(static_buff, "%5iHz %s", PsndRate, str2);
-	return static_buff;
-}
-
-static const char *mgn_opt_region(menu_id id, int *offs)
-{
-	static const char *names[] = { "Auto", "      Japan NTSC", "      Japan PAL", "      USA", "      Europe" };
-	static const char *names_short[] = { "", " JP", " JP", " US", " EU" };
-	int code = PicoRegionOverride;
-	int u, i = 0;
-
-	*offs = -6;
-	if (code) {
-		code <<= 1;
-		while ((code >>= 1)) i++;
-		if (i > 4)
-			return "unknown";
-		return names[i];
-	} else {
-		strcpy(static_buff, "Auto:");
-		for (u = 0; u < 3; u++) {
-			code = (PicoAutoRgnOrder >> u*4) & 0xf;
-			for (i = 0; code; code >>= 1, i++)
-				;
-			strcat(static_buff, names_short[i]);
-		}
-		return static_buff;
-	}
-}
-
-static const char *mgn_opt_c_saves(menu_id id, int *offs)
-{
-	switch ((currentConfig.EmuOpt >> 9) & 5) {
-		default: return "OFF";
-		case 1:  return "writes";
-		case 4:  return "loads";
-		case 5:  return "both";
-	}
-}
-
-static const char *mgn_savecfg(menu_id id, int *offs)
-{
-	strcpy(static_buff, "Save global config");
-	if (config_slot != 0)
-		sprintf(static_buff + strlen(static_buff), " (profile: %i)", config_slot);
-	return static_buff;
-}
-
-static const char *mgn_loadcfg(menu_id id, int *offs)
-{
-	sprintf(static_buff, "Load cfg from profile %i", config_slot);
-	return static_buff;
-}
-
-static menu_entry e_menu_options[] =
-{
-	mee_range     ("Save slot",                MA_OPT_SAVE_SLOT,     state_slot, 0, 9),
-	mee_range_cust("Frameskip",                MA_OPT_FRAMESKIP,     currentConfig.Frameskip, -1, 16, mgn_opt_fskip),
-	mee_cust      ("Region",                   MA_OPT_REGION,        mh_opt_misc, mgn_opt_region),
-	mee_onoff     ("Show FPS",                 MA_OPT_SHOW_FPS,      currentConfig.EmuOpt, EOPT_SHOW_FPS),
-	mee_onoff     ("Enable sound",             MA_OPT_ENABLE_SOUND,  currentConfig.EmuOpt, EOPT_EN_SOUND),
-	mee_cust      ("Sound Quality",            MA_OPT_SOUND_QUALITY, mh_opt_misc, mgn_opt_sound),
-	mee_cust      ("Confirm savestate",        MA_OPT_CONFIRM_STATES,mh_opt_misc, mgn_opt_c_saves),
-	mee_range     (cpu_clk_name,               MA_OPT_CPU_CLOCKS,    currentConfig.CPUclock, 20, 900),
-	mee_handler   ("[Display options]",        menu_loop_gfx_options),
-	mee_handler   ("[Sega/Mega CD options]",   menu_loop_cd_options),
-	mee_handler   ("[Advanced options]",       menu_loop_adv_options),
-	mee_handler_mkname_id(MA_OPT_SAVECFG, mh_saveloadcfg, mgn_savecfg),
-	mee_handler_id("Save cfg for current game only", MA_OPT_SAVECFG_GAME, mh_saveloadcfg),
-	mee_handler_mkname_id(MA_OPT_LOADCFG, mh_saveloadcfg, mgn_loadcfg),
-	mee_handler   ("Restore defaults",         mh_restore_defaults),
-	mee_end,
-};
-
-static int menu_loop_options(menu_id id, int keys)
-{
-	static int sel = 0;
-
-	me_enable(e_menu_options, MA_OPT_SAVECFG_GAME, rom_loaded);
-	me_enable(e_menu_options, MA_OPT_LOADCFG, config_slot != config_slot_current);
-
-	me_loop(e_menu_options, &sel, NULL);
-
-	if (PicoRegionOverride)
-		// force setting possibly changed..
-		Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;
-
-	return 0;
-}
-
-// ------------ debug menu ------------
-
-#include <pico/debug.h>
-
-extern void SekStepM68k(void);
-
-static void mplayer_loop(void)
-{
-	pemu_sound_start();
-
-	while (1)
-	{
-		PDebugZ80Frame();
-		if (in_menu_wait_any(0) & PBTN_MA3)
-			break;
-		pemu_sound_wait();
-	}
-
-	pemu_sound_stop();
-}
-
-static void draw_text_debug(const char *str, int skip, int from)
-{
-	const char *p;
-	int line;
-
-	p = str;
-	while (skip-- > 0)
-	{
-		while (*p && *p != '\n')
-			p++;
-		if (*p == 0 || p[1] == 0)
-			return;
-		p++;
-	}
-
-	str = p;
-	for (line = from; line < g_screen_height / me_sfont_h; line++)
-	{
-		smalltext_out16(1, line * me_sfont_h, str, 0xffff);
-		while (*p && *p != '\n')
-			p++;
-		if (*p == 0)
-			break;
-		p++; str = p;
-	}
-}
-
-#ifdef __GNUC__
-#define COMPILER "gcc " __VERSION__
-#else
-#define COMPILER
-#endif
-
-static void draw_frame_debug(void)
-{
-	char layer_str[48] = "layers:             ";
-	if (PicoDrawMask & PDRAW_LAYERB_ON)      memcpy(layer_str +  8, "B", 1);
-	if (PicoDrawMask & PDRAW_LAYERA_ON)      memcpy(layer_str + 10, "A", 1);
-	if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6);
-	if (PicoDrawMask & PDRAW_SPRITES_HI_ON)  memcpy(layer_str + 19, "spr_hi", 6);
-
-	memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);
-	pemu_forced_frame(0);
-	smalltext_out16(4, 1, "build: r" REVISION "  "__DATE__ " " __TIME__ " " COMPILER, 0xffff);
-	smalltext_out16(4, g_screen_height - me_sfont_h, layer_str, 0xffff);
-}
-
-static void debug_menu_loop(void)
-{
-	int inp, mode = 0;
-	int spr_offs = 0, dumped = 0;
-	char *tmp;
-
-	while (1)
-	{
-		switch (mode)
-		{
-			case 0: plat_video_menu_begin();
-				tmp = PDebugMain();
-				plat_debug_cat(tmp);
-				draw_text_debug(tmp, 0, 0);
-				if (dumped) {
-					smalltext_out16(g_screen_width - 6 * me_sfont_h,
-						g_screen_height - me_mfont_h, "dumped", 0xffff);
-					dumped = 0;
-				}
-				break;
-			case 1: draw_frame_debug(); break;
-			case 2: memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);
-				pemu_forced_frame(0);
-				menu_darken_bg(g_screen_ptr, g_screen_width * g_screen_height, 0);
-				PDebugShowSpriteStats((unsigned short *)g_screen_ptr + (g_screen_height/2 - 240/2)*g_screen_width +
-					g_screen_width/2 - 320/2, g_screen_width); break;
-			case 3: memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);
-				PDebugShowPalette(g_screen_ptr, g_screen_width);
-				PDebugShowSprite((unsigned short *)g_screen_ptr + g_screen_width*120 + g_screen_width/2 + 16,
-					g_screen_width, spr_offs);
-				draw_text_debug(PDebugSpriteList(), spr_offs, 6);
-				break;
-		}
-		plat_video_menu_end();
-
-		inp = in_menu_wait(PBTN_MOK|PBTN_MBACK|PBTN_MA2|PBTN_MA3|PBTN_L|PBTN_R |
-					PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT, 70);
-		if (inp & PBTN_MBACK) return;
-		if (inp & PBTN_L) { mode--; if (mode < 0) mode = 3; }
-		if (inp & PBTN_R) { mode++; if (mode > 3) mode = 0; }
-		switch (mode)
-		{
-			case 0:
-				if (inp & PBTN_MOK)
-					SekStepM68k();
-				if (inp & PBTN_MA3) {
-					while (inp & PBTN_MA3)
-						inp = in_menu_wait_any(-1);
-					mplayer_loop();
-				}
-				if ((inp & (PBTN_MA2|PBTN_LEFT)) == (PBTN_MA2|PBTN_LEFT)) {
-					mkdir("dumps", 0777);
-					PDebugDumpMem();
-					while (inp & PBTN_MA2) inp = in_menu_wait_any(-1);
-					dumped = 1;
-				}
-				break;
-			case 1:
-				if (inp & PBTN_LEFT)  PicoDrawMask ^= PDRAW_LAYERB_ON;
-				if (inp & PBTN_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;
-				if (inp & PBTN_DOWN)  PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;
-				if (inp & PBTN_UP)    PicoDrawMask ^= PDRAW_SPRITES_HI_ON;
-				if (inp & PBTN_MOK) {
-					PsndOut = NULL; // just in case
-					PicoSkipFrame = 1;
-					PicoFrame();
-					PicoSkipFrame = 0;
-					while (inp & PBTN_MOK) inp = in_menu_wait_any(-1);
-				}
-				break;
-			case 3:
-				if (inp & PBTN_DOWN)  spr_offs++;
-				if (inp & PBTN_UP)    spr_offs--;
-				if (spr_offs < 0) spr_offs = 0;
-				break;
-		}
-	}
-}
-
-// ------------ main menu ------------
-
-static char *romsel_run(void)
-{
-	char *ret, *sel_name;
-
-	sel_name = malloc(sizeof(rom_fname_loaded));
-	if (sel_name == NULL)
-		return NULL;
-	strcpy(sel_name, rom_fname_loaded);
-
-	ret = menu_loop_romsel(sel_name, sizeof(rom_fname_loaded));
-	free(sel_name);
-	return ret;
-}
-
-static int main_menu_handler(menu_id id, int keys)
-{
-	char *ret_name;
-
-	switch (id)
-	{
-	case MA_MAIN_RESUME_GAME:
-		if (rom_loaded)
-			return 1;
-		break;
-	case MA_MAIN_SAVE_STATE:
-		if (rom_loaded)
-			return menu_loop_savestate(0);
-		break;
-	case MA_MAIN_LOAD_STATE:
-		if (rom_loaded)
-			return menu_loop_savestate(1);
-		break;
-	case MA_MAIN_RESET_GAME:
-		if (rom_loaded) {
-			emu_reset_game();
-			return 1;
-		}
-		break;
-	case MA_MAIN_LOAD_ROM:
-		ret_name = romsel_run();
-		if (ret_name != NULL) {
-			lprintf("selected file: %s\n", ret_name);
-			engineState = PGS_ReloadRom;
-			return 1;
-		}
-		break;
-	case MA_MAIN_CREDITS:
-		draw_menu_credits();
-		in_menu_wait(PBTN_MOK|PBTN_MBACK, 70);
-		break;
-	case MA_MAIN_EXIT:
-		engineState = PGS_Quit;
-		return 1;
-	case MA_MAIN_PATCHES:
-		if (rom_loaded && PicoPatches) {
-			menu_loop_patches();
-			PicoPatchApply();
-			me_update_msg("Patches applied");
-		}
-		break;
-	default:
-		lprintf("%s: something unknown selected\n", __FUNCTION__);
-		break;
-	}
-
-	return 0;
-}
-
-static menu_entry e_menu_main[] =
-{
-	mee_label     ("PicoDrive " VERSION),
-	mee_label     (""),
-	mee_label     (""),
-	mee_label     (""),
-	mee_handler_id("Resume game",        MA_MAIN_RESUME_GAME, main_menu_handler),
-	mee_handler_id("Save State",         MA_MAIN_SAVE_STATE,  main_menu_handler),
-	mee_handler_id("Load State",         MA_MAIN_LOAD_STATE,  main_menu_handler),
-	mee_handler_id("Reset game",         MA_MAIN_RESET_GAME,  main_menu_handler),
-	mee_handler_id("Load new ROM/ISO",   MA_MAIN_LOAD_ROM,    main_menu_handler),
-	mee_handler_id("Change options",     MA_MAIN_OPTIONS,     menu_loop_options),
-	mee_handler_id("Configure controls", MA_MAIN_OPTIONS,     menu_loop_keyconfig),
-	mee_handler_id("Credits",            MA_MAIN_CREDITS,     main_menu_handler),
-	mee_handler_id("Patches / GameGenie",MA_MAIN_PATCHES,     main_menu_handler),
-	mee_handler_id("Exit",               MA_MAIN_EXIT,        main_menu_handler),
-	mee_end,
-};
-
-void menu_loop(void)
-{
-	static int sel = 0;
-
-	me_enable(e_menu_main, MA_MAIN_RESUME_GAME, rom_loaded);
-	me_enable(e_menu_main, MA_MAIN_SAVE_STATE,  rom_loaded);
-	me_enable(e_menu_main, MA_MAIN_LOAD_STATE,  rom_loaded);
-	me_enable(e_menu_main, MA_MAIN_RESET_GAME,  rom_loaded);
-	me_enable(e_menu_main, MA_MAIN_PATCHES, PicoPatches != NULL);
-
-	plat_video_menu_enter(rom_loaded);
-	in_set_blocking(1);
-	me_loop(e_menu_main, &sel, menu_main_plat_draw);
-
-	if (rom_loaded) {
-		if (engineState == PGS_Menu)
-			engineState = PGS_Running;
-		/* wait until menu, ok, back is released */
-		while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK));
-	}
-
-	in_set_blocking(0);
-}
-
-// --------- CD tray close menu ----------
-
-static int mh_tray_load_cd(menu_id id, int keys)
-{
-	char *ret_name;
-
-	ret_name = romsel_run();
-	if (ret_name == NULL)
-		return 0;
-
-	engineState = PGS_RestartRun;
-	return emu_swap_cd(ret_name);
-}
-
-static int mh_tray_nothing(menu_id id, int keys)
-{
-	return 1;
-}
-
-static menu_entry e_menu_tray[] =
-{
-	mee_label  ("The CD tray has opened."),
-	mee_label  (""),
-	mee_label  (""),
-	mee_handler("Load CD image",  mh_tray_load_cd),
-	mee_handler("Insert nothing", mh_tray_nothing),
-	mee_end,
-};
-
-int menu_loop_tray(void)
-{
-	int ret = 1, sel = 0;
-
-	plat_video_menu_enter(rom_loaded);
-
-	in_set_blocking(1);
-	me_loop(e_menu_tray, &sel, NULL);
-
-	if (engineState != PGS_RestartRun) {
-		engineState = PGS_RestartRun;
-		ret = 0; /* no CD inserted */
-	}
-
-	while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK));
-	in_set_blocking(0);
-
-	return ret;
-}
-
-#endif // !UIQ3
-
-void me_update_msg(const char *msg)
-{
-	strncpy(menu_error_msg, msg, sizeof(menu_error_msg));
-	menu_error_msg[sizeof(menu_error_msg) - 1] = 0;
-
-	menu_error_time = plat_get_ticks_ms();
-	lprintf("msg: %s\n", menu_error_msg);
-}
-
-// ------------ util ------------
-
-/* GP2X/wiz for now, probably extend later */
-void menu_plat_setup(int is_wiz)
-{
-	int i;
-
-	if (!is_wiz) {
-		me_enable(e_menu_gfx_options, MA_OPT_TEARING_FIX, 0);
-		i = me_id2offset(e_menu_gfx_options, MA_OPT_TEARING_FIX);
-		e_menu_gfx_options[i].need_to_save = 0;
-		return;
-	}
-
-	me_enable(e_menu_adv_options, MA_OPT_ARM940_SOUND, 0);
-	me_enable(e_menu_gfx_options, MA_OPT2_GAMMA, 0);
-	me_enable(e_menu_gfx_options, MA_OPT2_A_SN_GAMMA, 0);
-
-	i = me_id2offset(e_menu_gfx_options, MA_OPT_SCALING);
-	e_menu_gfx_options[i].max = 1;	/* only off and sw */
-	i = me_id2offset(e_menu_gfx_options, MA_OPT_ARM940_SOUND);
-	e_menu_gfx_options[i].need_to_save = 0;
-}
-
-/* TODO: rename */
-void menu_darken_bg(void *dst, int pixels, int darker)
-{
-	unsigned int *screen = dst;
-	pixels /= 2;
-	if (darker)
-	{
-		while (pixels--)
-		{
-			unsigned int p = *screen;
-			*screen++ = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3);
-		}
-	}
-	else
-	{
-		while (pixels--)
-		{
-			unsigned int p = *screen;
-			*screen++ = (p&0xf79ef79e)>>1;
-		}
-	}
-}
-
-/* hidden options for config engine only */
-static menu_entry e_menu_hidden[] =
-{
-	mee_onoff("Accurate sprites", MA_OPT_ACC_SPRITES, PicoOpt, 0x080),
-	mee_end,
-};
-
-static menu_entry *e_menu_table[] =
-{
-	e_menu_options,
-	e_menu_gfx_options,
-	e_menu_adv_options,
-	e_menu_cd_options,
-	e_menu_keyconfig,
-	e_menu_hidden,
-};
-
-static menu_entry *me_list_table = NULL;
-static menu_entry *me_list_i = NULL;
-
-menu_entry *me_list_get_first(void)
-{
-	me_list_table = me_list_i = e_menu_table[0];
-	return me_list_i;
-}
-
-menu_entry *me_list_get_next(void)
-{
-	int i;
-
-	me_list_i++;
-	if (me_list_i->name != NULL)
-		return me_list_i;
-
-	for (i = 0; i < array_size(e_menu_table); i++)
-		if (me_list_table == e_menu_table[i])
-			break;
-
-	if (i + 1 < array_size(e_menu_table))
-		me_list_table = me_list_i = e_menu_table[i + 1];
-	else
-		me_list_table = me_list_i = NULL;
-
-	return me_list_i;
 }