menu: show savestate date
[libpicofe.git] / common / menu.c
index 8674897..97e365d 100644 (file)
@@ -1,58 +1,58 @@
-// (c) Copyright 2006,2007 notaz, All rights reserved.\r
-// Free for non-commercial use.\r
-\r
-// For commercial use, separate licencing terms must be obtained.\r
+/*\r
+ * (C) GraÅžvydas "notaz" Ignotas, 2006-2011\r
+ *\r
+ * This work is licensed under the terms of any of these licenses\r
+ * (at your option):\r
+ *  - GNU GPL, version 2 or later.\r
+ *  - GNU LGPL, version 2.1 or later.\r
+ * See the COPYING file in the top-level directory.\r
+ */\r
 \r
 #include <stdio.h>\r
 #include <string.h>\r
 #include <stdlib.h>\r
 #include <stdarg.h>\r
+#include <time.h>\r
+#include <locale.h> // savestate date\r
 \r
 #include "menu.h"\r
 #include "fonts.h"\r
 #include "readpng.h"\r
 #include "lprintf.h"\r
-#include "common.h"\r
 #include "input.h"\r
-#include "emu.h"\r
 #include "plat.h"\r
+#include "posix.h"\r
+\r
+static char static_buff[64];\r
+static int  menu_error_time = 0;\r
+char menu_error_msg[64] = { 0, };\r
+void *g_menuscreen_ptr;\r
+void *g_menubg_src_ptr;\r
+void *g_menubg_ptr;\r
+\r
+#if !MSCREEN_SIZE_FIXED\r
+int g_menuscreen_w;\r
+int g_menuscreen_h;\r
+#endif\r
 \r
-#include <pico/patch.h>\r
-\r
-char menuErrorMsg[64] = { 0, };\r
-\r
-// PicoPad[] format: MXYZ SACB RLDU\r
-me_bind_action me_ctrl_actions[15] =\r
-{\r
-       { "UP     ", 0x0001 },\r
-       { "DOWN   ", 0x0002 },\r
-       { "LEFT   ", 0x0004 },\r
-       { "RIGHT  ", 0x0008 },\r
-       { "A      ", 0x0040 },\r
-       { "B      ", 0x0010 },\r
-       { "C      ", 0x0020 },\r
-       { "A turbo", 0x4000 },\r
-       { "B turbo", 0x1000 },\r
-       { "C turbo", 0x2000 },\r
-       { "START  ", 0x0080 },\r
-       { "MODE   ", 0x0800 },\r
-       { "X      ", 0x0400 },\r
-       { "Y      ", 0x0200 },\r
-       { "Z      ", 0x0100 }\r
-};\r
-\r
-\r
-#ifndef UIQ3\r
-\r
-static unsigned char menu_font_data[10240];\r
+static unsigned char *menu_font_data = NULL;\r
 static int menu_text_color = 0xffff; // default to white\r
 static int menu_sel_color = -1; // disabled\r
 \r
+/* note: these might become non-constant in future */\r
+#if MENU_X2\r
+static const int me_mfont_w = 16, me_mfont_h = 20;\r
+static const int me_sfont_w = 12, me_sfont_h = 20;\r
+#else\r
+static const int me_mfont_w = 8, me_mfont_h = 10;\r
+static const int me_sfont_w = 6, me_sfont_h = 10;\r
+#endif\r
+\r
 // draws text to current bbp16 screen\r
 static void text_out16_(int x, int y, const char *text, int color)\r
 {\r
-       int i, l, u, tr, tg, tb, len;\r
-       unsigned short *dest = (unsigned short *)SCREEN_BUFFER + x + y*SCREEN_WIDTH;\r
+       int i, lh, tr, tg, tb, len;\r
+       unsigned short *dest = (unsigned short *)g_menuscreen_ptr + x + y * g_menuscreen_w;\r
        tr = (color & 0xf800) >> 8;\r
        tg = (color & 0x07e0) >> 3;\r
        tb = (color & 0x001f) << 3;\r
@@ -64,15 +64,26 @@ static void text_out16_(int x, int y, const char *text, int color)
                len = 1;\r
        }\r
        else\r
-               len = strlen(text);\r
+       {\r
+               const char *p;\r
+               for (p = text; *p != 0 && *p != '\n'; p++)\r
+                       ;\r
+               len = p - text;\r
+       }\r
+\r
+       lh = me_mfont_h;\r
+       if (y + lh > g_menuscreen_h)\r
+               lh = g_menuscreen_h - y;\r
 \r
        for (i = 0; i < len; i++)\r
        {\r
-               unsigned char  *src = menu_font_data + (unsigned int)text[i]*4*10;\r
+               unsigned char  *src = menu_font_data + (unsigned int)text[i] * me_mfont_w * me_mfont_h / 2;\r
                unsigned short *dst = dest;\r
-               for (l = 0; l < 10; l++, dst += SCREEN_WIDTH-8)\r
+               int u, l;\r
+\r
+               for (l = 0; l < lh; l++, dst += g_menuscreen_w - me_mfont_w)\r
                {\r
-                       for (u = 8/2; u > 0; u--, src++)\r
+                       for (u = me_mfont_w / 2; u > 0; u--, src++)\r
                        {\r
                                int c, r, g, b;\r
                                c = *src >> 4;\r
@@ -93,7 +104,7 @@ static void text_out16_(int x, int y, const char *text, int color)
                                *dst++ = ((r<<8)&0xf800) | ((g<<3)&0x07e0) | (b>>3);\r
                        }\r
                }\r
-               dest += 8;\r
+               dest += me_mfont_w;\r
        }\r
 }\r
 \r
@@ -101,65 +112,78 @@ void text_out16(int x, int y, const char *texto, ...)
 {\r
        va_list args;\r
        char    buffer[256];\r
-       int     maxw = (SCREEN_WIDTH - x) / 8;\r
+       int     maxw = (g_menuscreen_w - x) / me_mfont_w;\r
+\r
+       if (maxw < 0)\r
+               return;\r
 \r
        va_start(args, texto);\r
        vsnprintf(buffer, sizeof(buffer), texto, args);\r
        va_end(args);\r
 \r
-       if (maxw > 255)\r
-               maxw = 255;\r
+       if (maxw > sizeof(buffer) - 1)\r
+               maxw = sizeof(buffer) - 1;\r
        buffer[maxw] = 0;\r
 \r
        text_out16_(x,y,buffer,menu_text_color);\r
 }\r
 \r
-\r
-void smalltext_out16(int x, int y, const char *texto, int color)\r
+/* draws in 6x8 font, might multiply size by integer */\r
+static void smalltext_out16_(int x, int y, const char *texto, int color)\r
 {\r
-       int i;\r
        unsigned char  *src;\r
        unsigned short *dst;\r
+       int multiplier = me_sfont_w / 6;\r
+       int i;\r
 \r
-       for (i = 0;; i++, x += 6)\r
+       for (i = 0;; i++, x += me_sfont_w)\r
        {\r
                unsigned char c = (unsigned char) texto[i];\r
                int h = 8;\r
 \r
-               if (!c) break;\r
+               if (!c || c == '\n')\r
+                       break;\r
 \r
                src = fontdata6x8[c];\r
-               dst = (unsigned short *)SCREEN_BUFFER + x + y*SCREEN_WIDTH;\r
+               dst = (unsigned short *)g_menuscreen_ptr + x + y * g_menuscreen_w;\r
 \r
                while (h--)\r
                {\r
-                       int w = 0x20;\r
-                       while (w)\r
+                       int m, w2, h2;\r
+                       for (h2 = multiplier; h2 > 0; h2--)\r
                        {\r
-                               if( *src & w ) *dst = color;\r
-                               dst++;\r
-                               w>>=1;\r
+                               for (m = 0x20; m; m >>= 1) {\r
+                                       if (*src & m)\r
+                                               for (w2 = multiplier; w2 > 0; w2--)\r
+                                                       *dst++ = color;\r
+                                       else\r
+                                               dst += multiplier;\r
+                               }\r
+\r
+                               dst += g_menuscreen_w - me_sfont_w;\r
                        }\r
                        src++;\r
-\r
-                       dst += SCREEN_WIDTH-6;\r
                }\r
        }\r
 }\r
 \r
-void smalltext_out16_lim(int x, int y, const char *texto, int color, int max)\r
+static void smalltext_out16(int x, int y, const char *texto, int color)\r
 {\r
-       char    buffer[SCREEN_WIDTH/6+1];\r
+       char buffer[128];\r
+       int maxw = (g_menuscreen_w - x) / me_sfont_w;\r
+\r
+       if (maxw < 0)\r
+               return;\r
 \r
-       strncpy(buffer, texto, SCREEN_WIDTH/6);\r
-       if (max > SCREEN_WIDTH/6) max = SCREEN_WIDTH/6;\r
-       if (max < 0) max = 0;\r
-       buffer[max] = 0;\r
+       strncpy(buffer, texto, sizeof(buffer));\r
+       if (maxw > sizeof(buffer) - 1)\r
+               maxw = sizeof(buffer) - 1;\r
+       buffer[maxw] = 0;\r
 \r
-       smalltext_out16(x, y, buffer, color);\r
+       smalltext_out16_(x, y, buffer, color);\r
 }\r
 \r
-void menu_draw_selection(int x, int y, int w)\r
+static void menu_draw_selection(int x, int y, int w)\r
 {\r
        int i, h;\r
        unsigned short *dst, *dest;\r
@@ -169,13 +193,13 @@ void menu_draw_selection(int x, int y, int w)
        if (menu_sel_color < 0) return; // no selection hilight\r
 \r
        if (y > 0) y--;\r
-       dest = (unsigned short *)SCREEN_BUFFER + x + y*SCREEN_WIDTH + 14;\r
-       for (h = 11; h > 0; h--)\r
+       dest = (unsigned short *)g_menuscreen_ptr + x + y * g_menuscreen_w + me_mfont_w * 2 - 2;\r
+       for (h = me_mfont_h + 1; h > 0; h--)\r
        {\r
                dst = dest;\r
-               for (i = w; i > 0; i--)\r
+               for (i = w - (me_mfont_w * 2 - 2); i > 0; i--)\r
                        *dst++ = menu_sel_color;\r
-               dest += SCREEN_WIDTH;\r
+               dest += g_menuscreen_w;\r
        }\r
 }\r
 \r
@@ -194,43 +218,80 @@ static int parse_hex_color(char *buff)
 \r
 void menu_init(void)\r
 {\r
-       int c, l;\r
-       unsigned char *fd = menu_font_data;\r
+       int i, c, l;\r
+       unsigned char *fd, *fds;\r
        char buff[256];\r
        FILE *f;\r
 \r
-       // generate default font from fontdata8x8\r
-       memset(menu_font_data, 0, sizeof(menu_font_data));\r
-       for (c = 0; c < 256; c++)\r
+       if (menu_font_data != NULL)\r
+               free(menu_font_data);\r
+\r
+       menu_font_data = calloc((MENU_X2 ? 256 * 320 : 128 * 160) / 2, 1);\r
+       if (menu_font_data == NULL)\r
+               return;\r
+\r
+       // generate default 8x10 font from fontdata8x8\r
+       for (c = 0, fd = menu_font_data; c < 256; c++)\r
        {\r
                for (l = 0; l < 8; l++)\r
                {\r
                        unsigned char fd8x8 = fontdata8x8[c*8+l];\r
-                       if (fd8x8&0x80) *fd |= 0xf0;\r
+                       if (fd8x8&0x80) *fd  = 0xf0;\r
                        if (fd8x8&0x40) *fd |= 0x0f; fd++;\r
-                       if (fd8x8&0x20) *fd |= 0xf0;\r
+                       if (fd8x8&0x20) *fd  = 0xf0;\r
                        if (fd8x8&0x10) *fd |= 0x0f; fd++;\r
-                       if (fd8x8&0x08) *fd |= 0xf0;\r
+                       if (fd8x8&0x08) *fd  = 0xf0;\r
                        if (fd8x8&0x04) *fd |= 0x0f; fd++;\r
-                       if (fd8x8&0x02) *fd |= 0xf0;\r
+                       if (fd8x8&0x02) *fd  = 0xf0;\r
                        if (fd8x8&0x01) *fd |= 0x0f; fd++;\r
                }\r
                fd += 8*2/2; // 2 empty lines\r
        }\r
 \r
+       if (MENU_X2) {\r
+               // expand default font\r
+               fds = menu_font_data + 128 * 160 / 2 - 4;\r
+               fd  = menu_font_data + 256 * 320 / 2 - 1;\r
+               for (c = 255; c >= 0; c--)\r
+               {\r
+                       for (l = 9; l >= 0; l--, fds -= 4)\r
+                       {\r
+                               for (i = 3; i >= 0; i--) {\r
+                                       int px = fds[i] & 0x0f;\r
+                                       *fd-- = px | (px << 4);\r
+                                       px = (fds[i] >> 4) & 0x0f;\r
+                                       *fd-- = px | (px << 4);\r
+                               }\r
+                               for (i = 3; i >= 0; i--) {\r
+                                       int px = fds[i] & 0x0f;\r
+                                       *fd-- = px | (px << 4);\r
+                                       px = (fds[i] >> 4) & 0x0f;\r
+                                       *fd-- = px | (px << 4);\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+\r
        // load custom font and selector (stored as 1st symbol in font table)\r
-       readpng(menu_font_data, "skin/font.png", READPNG_FONT);\r
-       memcpy(menu_font_data, menu_font_data + ((int)'>')*4*10, 4*10); // default selector symbol is '>'\r
-       readpng(menu_font_data, "skin/selector.png", READPNG_SELECTOR);\r
+       emu_make_path(buff, "skin/font.png", sizeof(buff));\r
+       readpng(menu_font_data, buff, READPNG_FONT,\r
+               MENU_X2 ? 256 : 128, MENU_X2 ? 320 : 160);\r
+       // default selector symbol is '>'\r
+       memcpy(menu_font_data, menu_font_data + ((int)'>') * me_mfont_w * me_mfont_h / 2,\r
+               me_mfont_w * me_mfont_h / 2);\r
+       emu_make_path(buff, "skin/selector.png", sizeof(buff));\r
+       readpng(menu_font_data, buff, READPNG_SELECTOR, me_mfont_w, me_mfont_h);\r
 \r
        // load custom colors\r
-       f = fopen("skin/skin.txt", "r");\r
+       emu_make_path(buff, "skin/skin.txt", sizeof(buff));\r
+       f = fopen(buff, "r");\r
        if (f != NULL)\r
        {\r
                lprintf("found skin.txt\n");\r
                while (!feof(f))\r
                {\r
-                       fgets(buff, sizeof(buff), f);\r
+                       if (fgets(buff, sizeof(buff), f) == NULL)\r
+                               break;\r
                        if (buff[0] == '#'  || buff[0] == '/')  continue; // comment\r
                        if (buff[0] == '\r' || buff[0] == '\n') continue; // empty line\r
                        if (strncmp(buff, "text_color=", 11) == 0)\r
@@ -250,10 +311,47 @@ void menu_init(void)
                }\r
                fclose(f);\r
        }\r
+\r
+       // use user's locale for savestate date display\r
+       setlocale(LC_TIME, "");\r
 }\r
 \r
+static void menu_draw_begin(int need_bg)\r
+{\r
+       plat_video_menu_begin();\r
+       if (need_bg)\r
+               memcpy(g_menuscreen_ptr, g_menubg_ptr, g_menuscreen_w * g_menuscreen_h * 2);\r
+}\r
+\r
+static void menu_draw_end(void)\r
+{\r
+       plat_video_menu_end();\r
+}\r
 \r
-int me_id2offset(const menu_entry *ent, menu_id id)\r
+static void menu_darken_bg(void *dst, void *src, int pixels, int darker)\r
+{\r
+       unsigned int *dest = dst;\r
+       unsigned int *sorc = src;\r
+       pixels /= 2;\r
+       if (darker)\r
+       {\r
+               while (pixels--)\r
+               {\r
+                       unsigned int p = *sorc++;\r
+                       *dest++ = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3);\r
+               }\r
+       }\r
+       else\r
+       {\r
+               while (pixels--)\r
+               {\r
+                       unsigned int p = *sorc++;\r
+                       *dest++ = (p&0xf79ef79e)>>1;\r
+               }\r
+       }\r
+}\r
+\r
+static int me_id2offset(const menu_entry *ent, menu_id id)\r
 {\r
        int i;\r
        for (i = 0; ent->name; ent++, i++)\r
@@ -263,13 +361,13 @@ int me_id2offset(const menu_entry *ent, menu_id id)
        return 0;\r
 }\r
 \r
-void me_enable(menu_entry *entries, menu_id id, int enable)\r
+static void me_enable(menu_entry *entries, menu_id id, int enable)\r
 {\r
        int i = me_id2offset(entries, id);\r
        entries[i].enabled = enable;\r
 }\r
 \r
-int me_count(const menu_entry *ent)\r
+static int me_count(const menu_entry *ent)\r
 {\r
        int ret;\r
 \r
@@ -279,56 +377,35 @@ int me_count(const menu_entry *ent)
        return ret;\r
 }\r
 \r
-menu_id me_index2id(const menu_entry *ent, int index)\r
+static unsigned int me_read_onoff(const menu_entry *ent)\r
 {\r
-       const menu_entry *last;\r
-\r
-       for (; ent->name; ent++)\r
-       {\r
-               if (ent->enabled)\r
-               {\r
-                       if (index == 0) break;\r
-                       index--;\r
-               }\r
-               last = ent;\r
-       }\r
-       if (ent->name == NULL)\r
-               ent = last;\r
-       return ent->id;\r
+       // guess var size based on mask to avoid reading too much\r
+       if (ent->mask & 0xffff0000)\r
+               return *(unsigned int *)ent->var & ent->mask;\r
+       else if (ent->mask & 0xff00)\r
+               return *(unsigned short *)ent->var & ent->mask;\r
+       else\r
+               return *(unsigned char *)ent->var & ent->mask;\r
 }\r
 \r
-/* TODO rm */\r
-void me_draw(const menu_entry *entries, int count, int x, int y, me_draw_custom_f *cust_draw, void *param)\r
+static void me_toggle_onoff(menu_entry *ent)\r
 {\r
-       int i, y1 = y;\r
-\r
-       for (i = 0; i < count; i++)\r
-       {\r
-               if (!entries[i].enabled) continue;\r
-               if (entries[i].name == NULL)\r
-               {\r
-                       if (cust_draw != NULL)\r
-                               cust_draw(&entries[i], x, y1, param);\r
-                       y1 += 10;\r
-                       continue;\r
-               }\r
-               text_out16(x, y1, entries[i].name);\r
-               if (entries[i].beh == MB_OPT_ONOFF)\r
-                       text_out16(x + 27*8, y1, (*(int *)entries[i].var & entries[i].mask) ? "ON" : "OFF");\r
-               else if (entries[i].beh == MB_OPT_RANGE)\r
-                       text_out16(x + 27*8, y1, "%i", *(int *)entries[i].var);\r
-               y1 += 10;\r
-       }\r
-\r
+       // guess var size based on mask to avoid reading too much\r
+       if (ent->mask & 0xffff0000)\r
+               *(unsigned int *)ent->var ^= ent->mask;\r
+       else if (ent->mask & 0xff00)\r
+               *(unsigned short *)ent->var ^= ent->mask;\r
+       else\r
+               *(unsigned char *)ent->var ^= ent->mask;\r
 }\r
 \r
-static void me_draw2(const menu_entry *entries, int sel)\r
+static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))\r
 {\r
-       const menu_entry *ent;\r
+       const menu_entry *ent, *ent_sel = entries;\r
        int x, y, w = 0, h = 0;\r
-       int opt_offs = 27*8;\r
+       int offs, col2_offs = 27 * me_mfont_w;\r
+       int vi_sel_ln = 0;\r
        const char *name;\r
-       int asel = 0;\r
        int i, n;\r
 \r
        /* calculate size of menu rect */\r
@@ -339,32 +416,43 @@ static void me_draw2(const menu_entry *entries, int sel)
                if (!ent->enabled)\r
                        continue;\r
 \r
-               if (i == sel)\r
-                       asel = n;\r
+               if (i == sel) {\r
+                       ent_sel = ent;\r
+                       vi_sel_ln = n;\r
+               }\r
 \r
                name = NULL;\r
-               wt = strlen(ent->name) * 8;     /* FIXME: unhardcode font width */\r
+               wt = strlen(ent->name) * me_mfont_w;\r
                if (wt == 0 && ent->generate_name)\r
-                       name = ent->generate_name(1);\r
+                       name = ent->generate_name(ent->id, &offs);\r
                if (name != NULL)\r
-                       wt = strlen(name) * 8;\r
+                       wt = strlen(name) * me_mfont_w;\r
 \r
                if (ent->beh != MB_NONE)\r
                {\r
-                       if (wt > opt_offs)\r
-                               opt_offs = wt + 8;\r
-                       wt = opt_offs;\r
+                       if (wt > col2_offs)\r
+                               col2_offs = wt + me_mfont_w;\r
+                       wt = col2_offs;\r
 \r
                        switch (ent->beh) {\r
-                       case MB_NONE: break;\r
+                       case MB_NONE:\r
+                               break;\r
                        case MB_OPT_ONOFF:\r
-                       case MB_OPT_RANGE: wt += 8*3; break;\r
+                       case MB_OPT_RANGE:\r
+                               wt += me_mfont_w * 3;\r
+                               break;\r
                        case MB_OPT_CUSTOM:\r
+                       case MB_OPT_CUSTONOFF:\r
+                       case MB_OPT_CUSTRANGE:\r
                                name = NULL;\r
+                               offs = 0;\r
                                if (ent->generate_name != NULL)\r
-                                       name = ent->generate_name(0);\r
+                                       name = ent->generate_name(ent->id, &offs);\r
                                if (name != NULL)\r
-                                       wt += strlen(name) * 8;\r
+                                       wt += (strlen(name) + offs) * me_mfont_w;\r
+                               break;\r
+                       case MB_OPT_ENUM:\r
+                               wt += 10 * me_mfont_w;\r
                                break;\r
                        }\r
                }\r
@@ -373,109 +461,184 @@ static void me_draw2(const menu_entry *entries, int sel)
                        w = wt;\r
                n++;\r
        }\r
-       h = n * 10;\r
-       w += 16; /* selector */\r
+       h = n * me_mfont_h;\r
+       w += me_mfont_w * 2; /* selector */\r
 \r
-       if (w > SCREEN_WIDTH) {\r
-               lprintf("width %d > %d\n", w, SCREEN_WIDTH);\r
-               w = SCREEN_WIDTH;\r
+       if (w > g_menuscreen_w) {\r
+               lprintf("width %d > %d\n", w, g_menuscreen_w);\r
+               w = g_menuscreen_w;\r
        }\r
-       if (h > SCREEN_HEIGHT) {\r
-               lprintf("height %d > %d\n", w, SCREEN_HEIGHT);\r
-               h = SCREEN_HEIGHT;\r
+       if (h > g_menuscreen_h) {\r
+               lprintf("height %d > %d\n", w, g_menuscreen_h);\r
+               h = g_menuscreen_h;\r
        }\r
 \r
-       x = SCREEN_WIDTH  / 2 - w / 2;\r
-       y = SCREEN_HEIGHT / 2 - h / 2;\r
+       x = g_menuscreen_w / 2 - w / 2;\r
+       y = g_menuscreen_h / 2 - h / 2;\r
+#ifdef MENU_ALIGN_LEFT\r
+       if (x > 12) x = 12;\r
+#endif\r
 \r
        /* draw */\r
-       plat_video_menu_begin();\r
-       menu_draw_selection(x, y + asel * 10, w);\r
+       menu_draw_begin(1);\r
+       menu_draw_selection(x, y + vi_sel_ln * me_mfont_h, w);\r
+       x += me_mfont_w * 2;\r
 \r
        for (ent = entries; ent->name; ent++)\r
        {\r
+               const char **names;\r
+               int len, leftname_end = 0;\r
+\r
                if (!ent->enabled)\r
                        continue;\r
 \r
                name = ent->name;\r
                if (strlen(name) == 0) {\r
                        if (ent->generate_name)\r
-                               name = ent->generate_name(1);\r
+                               name = ent->generate_name(ent->id, &offs);\r
+               }\r
+               if (name != NULL) {\r
+                       text_out16(x, y, name);\r
+                       leftname_end = x + (strlen(name) + 1) * me_mfont_w;\r
                }\r
-               if (name != NULL)\r
-                       text_out16(x + 16, y, name);\r
 \r
                switch (ent->beh) {\r
                case MB_NONE:\r
                        break;\r
                case MB_OPT_ONOFF:\r
-                       text_out16(x + 16 + opt_offs, y, (*(int *)ent->var & ent->mask) ? "ON" : "OFF");\r
+                       text_out16(x + col2_offs, y, me_read_onoff(ent) ? "ON" : "OFF");\r
                        break;\r
                case MB_OPT_RANGE:\r
-                       text_out16(x + 16 + opt_offs, y, "%i", *(int *)ent->var);\r
+                       text_out16(x + col2_offs, y, "%i", *(int *)ent->var);\r
                        break;\r
                case MB_OPT_CUSTOM:\r
+               case MB_OPT_CUSTONOFF:\r
+               case MB_OPT_CUSTRANGE:\r
                        name = NULL;\r
+                       offs = 0;\r
                        if (ent->generate_name)\r
-                               name = ent->generate_name(0);\r
+                               name = ent->generate_name(ent->id, &offs);\r
                        if (name != NULL)\r
-                               text_out16(x + 16 + opt_offs, y, "%s", name);\r
+                               text_out16(x + col2_offs + offs * me_mfont_w, y, "%s", name);\r
+                       break;\r
+               case MB_OPT_ENUM:\r
+                       names = (const char **)ent->data;\r
+                       for (i = 0; names[i] != NULL; i++) {\r
+                               offs = x + col2_offs;\r
+                               len = strlen(names[i]);\r
+                               if (len > 10)\r
+                                       offs += (10 - len - 2) * me_mfont_w;\r
+                               if (offs < leftname_end)\r
+                                       offs = leftname_end;\r
+                               if (i == *(unsigned char *)ent->var) {\r
+                                       text_out16(offs, y, "%s", names[i]);\r
+                                       break;\r
+                               }\r
+                       }\r
                        break;\r
                }\r
 \r
-               y += 10;\r
+               y += me_mfont_h;\r
        }\r
 \r
-       plat_video_menu_end();\r
+       /* display help or message if we have one */\r
+       h = (g_menuscreen_h - h) / 2; // bottom area height\r
+       if (menu_error_msg[0] != 0) {\r
+               if (h >= me_mfont_h + 4)\r
+                       text_out16(5, g_menuscreen_h - me_mfont_h - 4, menu_error_msg);\r
+               else\r
+                       lprintf("menu msg doesn't fit!\n");\r
+\r
+               if (plat_get_ticks_ms() - menu_error_time > 2048)\r
+                       menu_error_msg[0] = 0;\r
+       }\r
+       else if (ent_sel->help != NULL) {\r
+               const char *tmp = ent_sel->help;\r
+               int l;\r
+               for (l = 0; tmp != NULL && *tmp != 0; l++)\r
+                       tmp = strchr(tmp + 1, '\n');\r
+               if (h >= l * me_sfont_h + 4)\r
+                       for (tmp = ent_sel->help; l > 0; l--, tmp = strchr(tmp, '\n') + 1)\r
+                               smalltext_out16(5, g_menuscreen_h - (l * me_sfont_h + 4), tmp, 0xffff);\r
+       }\r
+\r
+       if (draw_more != NULL)\r
+               draw_more();\r
+\r
+       menu_draw_end();\r
 }\r
 \r
-int me_process(menu_entry *entries, menu_id id, int is_next)\r
+static int me_process(menu_entry *entry, int is_next, int is_lr)\r
 {\r
-       int i = me_id2offset(entries, id);\r
-       menu_entry *entry = &entries[i];\r
+       const char **names;\r
+       int c;\r
        switch (entry->beh)\r
        {\r
                case MB_OPT_ONOFF:\r
-                       *(int *)entry->var ^= entry->mask;\r
+               case MB_OPT_CUSTONOFF:\r
+                       me_toggle_onoff(entry);\r
                        return 1;\r
                case MB_OPT_RANGE:\r
-                       *(int *)entry->var += is_next ? 1 : -1;\r
-                       if (*(int *)entry->var < (int)entry->min) *(int *)entry->var = (int)entry->min;\r
-                       if (*(int *)entry->var > (int)entry->max) *(int *)entry->var = (int)entry->max;\r
+               case MB_OPT_CUSTRANGE:\r
+                       c = is_lr ? 10 : 1;\r
+                       *(int *)entry->var += is_next ? c : -c;\r
+                       if (*(int *)entry->var < (int)entry->min)\r
+                               *(int *)entry->var = (int)entry->max;\r
+                       if (*(int *)entry->var > (int)entry->max)\r
+                               *(int *)entry->var = (int)entry->min;\r
+                       return 1;\r
+               case MB_OPT_ENUM:\r
+                       names = (const char **)entry->data;\r
+                       for (c = 0; names[c] != NULL; c++)\r
+                               ;\r
+                       *(signed char *)entry->var += is_next ? 1 : -1;\r
+                       if (*(signed char *)entry->var < 0)\r
+                               *(signed char *)entry->var = 0;\r
+                       if (*(signed char *)entry->var >= c)\r
+                               *(signed char *)entry->var = c - 1;\r
                        return 1;\r
                default:\r
                        return 0;\r
        }\r
 }\r
 \r
-static void me_loop(menu_entry *menu, int *menu_sel)\r
+static void debug_menu_loop(void);\r
+\r
+static int me_loop_d(menu_entry *menu, int *menu_sel, void (*draw_prep)(void), void (*draw_more)(void))\r
 {\r
-       int ret, inp, sel = *menu_sel, menu_sel_max;\r
+       int ret = 0, inp, sel = *menu_sel, menu_sel_max;\r
 \r
        menu_sel_max = me_count(menu) - 1;\r
-       if (menu_sel_max < 1) {\r
+       if (menu_sel_max < 0) {\r
                lprintf("no enabled menu entries\n");\r
-               return;\r
+               return 0;\r
        }\r
 \r
-       while (!menu[sel].enabled && sel < menu_sel_max)\r
+       while ((!menu[sel].enabled || !menu[sel].selectable) && sel < menu_sel_max)\r
                sel++;\r
 \r
        /* make sure action buttons are not pressed on entering menu */\r
-       me_draw2(menu, sel);\r
+       me_draw(menu, sel, NULL);\r
        while (in_menu_wait_any(50) & (PBTN_MOK|PBTN_MBACK|PBTN_MENU));\r
 \r
        for (;;)\r
        {\r
-               me_draw2(menu, sel);\r
-               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_MOK|PBTN_MBACK|PBTN_MENU|PBTN_L|PBTN_R);\r
+               if (draw_prep != NULL)\r
+                       draw_prep();\r
+\r
+               me_draw(menu, sel, draw_more);\r
+               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|\r
+                                       PBTN_MOK|PBTN_MBACK|PBTN_MENU|PBTN_L|PBTN_R, 70);\r
+               if (inp & (PBTN_MENU|PBTN_MBACK))\r
+                       break;\r
+\r
                if (inp & PBTN_UP  ) {\r
                        do {\r
                                sel--;\r
                                if (sel < 0)\r
                                        sel = menu_sel_max;\r
                        }\r
-                       while (!menu[sel].enabled);\r
+                       while (!menu[sel].enabled || !menu[sel].selectable);\r
                }\r
                if (inp & PBTN_DOWN) {\r
                        do {\r
@@ -483,358 +646,654 @@ static void me_loop(menu_entry *menu, int *menu_sel)
                                if (sel > menu_sel_max)\r
                                        sel = 0;\r
                        }\r
-                       while (!menu[sel].enabled);\r
+                       while (!menu[sel].enabled || !menu[sel].selectable);\r
                }\r
-//             if ((inp & (PBTN_L|PBTN_R)) == (PBTN_L|PBTN_R)) debug_menu_loop(); // TODO\r
-               if (inp & (PBTN_MENU|PBTN_MBACK))\r
-                       break;\r
 \r
-               if (inp & PBTN_MOK)\r
+               /* a bit hacky but oh well */\r
+               if ((inp & (PBTN_L|PBTN_R)) == (PBTN_L|PBTN_R))\r
+                       debug_menu_loop();\r
+\r
+               if (inp & (PBTN_LEFT|PBTN_RIGHT|PBTN_L|PBTN_R)) { /* multi choice */\r
+                       if (me_process(&menu[sel], (inp & (PBTN_RIGHT|PBTN_R)) ? 1 : 0,\r
+                                               inp & (PBTN_L|PBTN_R)))\r
+                               continue;\r
+               }\r
+\r
+               if (inp & (PBTN_MOK|PBTN_LEFT|PBTN_RIGHT|PBTN_L|PBTN_R))\r
                {\r
-                       if (menu[sel].submenu_handler != NULL) {\r
-                               ret = menu[sel].submenu_handler(menu[sel].id);\r
+                       /* require PBTN_MOK for MB_NONE */\r
+                       if (menu[sel].handler != NULL && (menu[sel].beh != MB_NONE || (inp & PBTN_MOK))) {\r
+                               ret = menu[sel].handler(menu[sel].id, inp);\r
                                if (ret) break;\r
+                               menu_sel_max = me_count(menu) - 1; /* might change, so update */\r
                        }\r
                }\r
-//             menuErrorMsg[0] = 0; // TODO: clear error msg\r
        }\r
        *menu_sel = sel;\r
+\r
+       return ret;\r
+}\r
+\r
+static int me_loop(menu_entry *menu, int *menu_sel)\r
+{\r
+       return me_loop_d(menu, menu_sel, NULL, NULL);\r
 }\r
 \r
 /* ***************************************** */\r
 \r
-/* TODO s */\r
-int menu_loop_tray(void) { return 0; }\r
-void menu_romload_prepare(const char *rom_name) {}\r
-void menu_romload_end(void) {}\r
-me_bind_action emuctrl_actions[1];\r
-menu_entry opt_entries[1];\r
-menu_entry opt2_entries[1];\r
-menu_entry cdopt_entries[1];\r
-menu_entry ctrlopt_entries[1];\r
-const int opt_entry_count = 0;\r
-const int opt2_entry_count = 0;\r
-const int cdopt_entry_count = 0;\r
-const int ctrlopt_entry_count = 0;\r
+static void draw_menu_message(const char *msg, void (*draw_more)(void))\r
+{\r
+       int x, y, h, w, wt;\r
+       const char *p;\r
+\r
+       p = msg;\r
+       for (h = 1, w = 0; *p != 0; h++) {\r
+               for (wt = 0; *p != 0 && *p != '\n'; p++)\r
+                       wt++;\r
 \r
-extern int engineState;\r
+               if (wt > w)\r
+                       w = wt;\r
+               if (*p == 0)\r
+                       break;\r
+               p++;\r
+       }\r
+\r
+       x = g_menuscreen_w / 2 - w * me_mfont_w / 2;\r
+       y = g_menuscreen_h / 2 - h * me_mfont_h / 2;\r
+       if (x < 0) x = 0;\r
+       if (y < 0) y = 0;\r
 \r
-int savestate_menu_loop(int a) { return 1; }\r
-int menu_loop_options() { return 1; }\r
-void kc_sel_loop() {}\r
-void draw_menu_credits() {}\r
-void patches_menu_loop() {}\r
+       menu_draw_begin(1);\r
 \r
-// ------------ main menu ------------\r
+       for (p = msg; *p != 0 && y <= g_menuscreen_h - me_mfont_h; y += me_mfont_h) {\r
+               text_out16(x, y, p);\r
+\r
+               for (; *p != 0 && *p != '\n'; p++)\r
+                       ;\r
+               if (*p != 0)\r
+                       p++;\r
+       }\r
 \r
-static int main_menu_handler(menu_id id)\r
+       if (draw_more != NULL)\r
+               draw_more();\r
+\r
+       menu_draw_end();\r
+}\r
+\r
+// -------------- del confirm ---------------\r
+\r
+static void do_delete(const char *fpath, const char *fname)\r
 {\r
-       int ret;\r
+       int len, mid, inp;\r
+       const char *nm;\r
+       char tmp[64];\r
+\r
+       menu_draw_begin(1);\r
+\r
+       len = strlen(fname);\r
+       if (len > g_menuscreen_w / me_sfont_w)\r
+               len = g_menuscreen_w / me_sfont_w;\r
+\r
+       mid = g_menuscreen_w / 2;\r
+       text_out16(mid - me_mfont_w * 15 / 2,  8 * me_mfont_h, "About to delete");\r
+       smalltext_out16(mid - len * me_sfont_w / 2, 9 * me_mfont_h + 5, fname, 0xbdff);\r
+       text_out16(mid - me_mfont_w * 13 / 2, 11 * me_mfont_h, "Are you sure?");\r
+\r
+       nm = in_get_key_name(-1, -PBTN_MA3);\r
+       snprintf(tmp, sizeof(tmp), "(%s - confirm, ", nm);\r
+       len = strlen(tmp);\r
+       nm = in_get_key_name(-1, -PBTN_MBACK);\r
+       snprintf(tmp + len, sizeof(tmp) - len, "%s - cancel)", nm);\r
+       len = strlen(tmp);\r
+\r
+       text_out16(mid - me_mfont_w * len / 2, 12 * me_mfont_h, tmp);\r
+       menu_draw_end();\r
+\r
+       while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MA2));\r
+       inp = in_menu_wait(PBTN_MA3|PBTN_MBACK, 100);\r
+       if (inp & PBTN_MA3)\r
+               remove(fpath);\r
+}\r
 \r
-       switch (id)\r
-       {\r
-       case MA_MAIN_RESUME_GAME:\r
-               if (rom_loaded) {\r
-                       while (in_menu_wait_any(50) & PBTN_MOK);\r
-                       engineState = PGS_Running;\r
-                       return 1;\r
+// -------------- ROM selector --------------\r
+\r
+static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)\r
+{\r
+       int max_cnt, start, i, x, pos;\r
+       void *darken_ptr;\r
+\r
+       max_cnt = g_menuscreen_h / me_sfont_h;\r
+       start = max_cnt / 2 - sel;\r
+       n--; // exclude current dir (".")\r
+\r
+       menu_draw_begin(1);\r
+\r
+//     if (!rom_loaded)\r
+//             menu_darken_bg(gp2x_screen, 320*240, 0);\r
+\r
+       darken_ptr = (short *)g_menuscreen_ptr + g_menuscreen_w * max_cnt/2 * me_sfont_h;\r
+       menu_darken_bg(darken_ptr, darken_ptr, g_menuscreen_w * me_sfont_h * 8 / 10, 0);\r
+\r
+       x = 5 + me_mfont_w + 1;\r
+       if (start - 2 >= 0)\r
+               smalltext_out16(14, (start - 2) * me_sfont_h, curdir, 0xffff);\r
+       for (i = 0; i < n; i++) {\r
+               pos = start + i;\r
+               if (pos < 0)  continue;\r
+               if (pos >= max_cnt) break;\r
+               if (namelist[i+1]->d_type == DT_DIR) {\r
+                       smalltext_out16(x, pos * me_sfont_h, "/", 0xfff6);\r
+                       smalltext_out16(x + me_sfont_w, pos * me_sfont_h, namelist[i+1]->d_name, 0xfff6);\r
+               } else {\r
+                       unsigned short color = fname2color(namelist[i+1]->d_name);\r
+                       smalltext_out16(x, pos * me_sfont_h, namelist[i+1]->d_name, color);\r
                }\r
-               break;\r
-       case MA_MAIN_SAVE_STATE:\r
-               if (rom_loaded) {\r
-                       if (savestate_menu_loop(0))\r
-                               break;\r
-                       engineState = PGS_Running;\r
-                       return 1;\r
+       }\r
+       smalltext_out16(5, max_cnt/2 * me_sfont_h, ">", 0xffff);\r
+       menu_draw_end();\r
+}\r
+\r
+static int scandir_cmp(const void *p1, const void *p2)\r
+{\r
+       const struct dirent **d1 = (const struct dirent **)p1;\r
+       const struct dirent **d2 = (const struct dirent **)p2;\r
+       if ((*d1)->d_type == (*d2)->d_type)\r
+               return alphasort(d1, d2);\r
+       if ((*d1)->d_type == DT_DIR)\r
+               return -1; // put before\r
+       if ((*d2)->d_type == DT_DIR)\r
+               return  1;\r
+\r
+       return alphasort(d1, d2);\r
+}\r
+\r
+static int scandir_filter(const struct dirent *ent)\r
+{\r
+       const char *p;\r
+       int i;\r
+\r
+       if (ent == NULL || ent->d_name == NULL) return 0;\r
+       if (strlen(ent->d_name) < 5) return 1;\r
+\r
+       p = ent->d_name + strlen(ent->d_name) - 4;\r
+\r
+       for (i = 0; i < array_size(filter_exts); i++)\r
+               if (strcmp(p, filter_exts[i]) == 0)\r
+                       return 0;\r
+\r
+       return 1;\r
+}\r
+\r
+static char *menu_loop_romsel(char *curr_path, int len)\r
+{\r
+       struct dirent **namelist;\r
+       int n, inp, sel = 0;\r
+       char *ret = NULL, *fname = NULL;\r
+\r
+rescan:\r
+       // is this a dir or a full path?\r
+       if (!plat_is_dir(curr_path)) {\r
+               char *p = curr_path + strlen(curr_path) - 1;\r
+               for (; p > curr_path && *p != '/'; p--)\r
+                       ;\r
+               *p = 0;\r
+               fname = p+1;\r
+       }\r
+\r
+       n = scandir(curr_path, &namelist, scandir_filter, (void *)scandir_cmp);\r
+       if (n < 0) {\r
+               char *t;\r
+               lprintf("menu_loop_romsel failed, dir: %s\n", curr_path);\r
+\r
+               // try root\r
+               t = getcwd(curr_path, len);\r
+               if (t == NULL)\r
+                       plat_get_root_dir(curr_path, len);\r
+               n = scandir(curr_path, &namelist, scandir_filter, (void *)scandir_cmp);\r
+               if (n < 0) {\r
+                       // oops, we failed\r
+                       lprintf("menu_loop_romsel failed, dir: %s\n", curr_path);\r
+                       return NULL;\r
                }\r
-               break;\r
-       case MA_MAIN_LOAD_STATE:\r
-               if (rom_loaded) {\r
-                       if (savestate_menu_loop(1))\r
+       }\r
+\r
+       // try to find sel\r
+       if (fname != NULL) {\r
+               int i;\r
+               for (i = 1; i < n; i++) {\r
+                       if (strcmp(namelist[i]->d_name, fname) == 0) {\r
+                               sel = i - 1;\r
                                break;\r
-                       while (in_menu_wait_any(50) & PBTN_MOK);\r
-                       engineState = PGS_Running;\r
-                       return 1;\r
-               }\r
-               break;\r
-       case MA_MAIN_RESET_GAME:\r
-               if (rom_loaded) {\r
-                       emu_ResetGame();\r
-                       while (in_menu_wait_any(50) & PBTN_MOK);\r
-                       engineState = PGS_Running;\r
-                       return 1;\r
+                       }\r
                }\r
-               break;\r
-       case MA_MAIN_LOAD_ROM:\r
+       }\r
+\r
+       /* make sure action buttons are not pressed on entering menu */\r
+       draw_dirlist(curr_path, namelist, n, sel);\r
+       while (in_menu_wait_any(50) & (PBTN_MOK|PBTN_MBACK|PBTN_MENU))\r
+               ;\r
+\r
+       for (;;)\r
+       {\r
+               draw_dirlist(curr_path, namelist, n, sel);\r
+               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|\r
+                       PBTN_L|PBTN_R|PBTN_MA2|PBTN_MOK|PBTN_MBACK|PBTN_MENU, 33);\r
+               if (inp & PBTN_UP  )  { sel--;   if (sel < 0)   sel = n-2; }\r
+               if (inp & PBTN_DOWN)  { sel++;   if (sel > n-2) sel = 0; }\r
+               if (inp & PBTN_LEFT)  { sel-=10; if (sel < 0)   sel = 0; }\r
+               if (inp & PBTN_L)     { sel-=24; if (sel < 0)   sel = 0; }\r
+               if (inp & PBTN_RIGHT) { sel+=10; if (sel > n-2) sel = n-2; }\r
+               if (inp & PBTN_R)     { sel+=24; if (sel > n-2) sel = n-2; }\r
+               if ((inp & PBTN_MOK) || (inp & (PBTN_MENU|PBTN_MA2)) == (PBTN_MENU|PBTN_MA2))\r
                {\r
-/*                     char curr_path[PATH_MAX], *selfname;\r
-                       FILE *tstf;\r
-                       if ( (tstf = fopen(loadedRomFName, "rb")) )\r
+                       again:\r
+                       if (namelist[sel+1]->d_type == DT_REG)\r
                        {\r
-                               fclose(tstf);\r
-                               strcpy(curr_path, loadedRomFName);\r
+                               strcpy(rom_fname_reload, curr_path);\r
+                               strcat(rom_fname_reload, "/");\r
+                               strcat(rom_fname_reload, namelist[sel+1]->d_name);\r
+                               if (inp & PBTN_MOK) { // return sel\r
+                                       ret = rom_fname_reload;\r
+                                       break;\r
+                               }\r
+                               do_delete(rom_fname_reload, namelist[sel+1]->d_name);\r
+                               if (n > 0) {\r
+                                       while (n--) free(namelist[n]);\r
+                                       free(namelist);\r
+                               }\r
+                               goto rescan;\r
+                       }\r
+                       else if (namelist[sel+1]->d_type == DT_DIR)\r
+                       {\r
+                               int newlen;\r
+                               char *p, *newdir;\r
+                               if (!(inp & PBTN_MOK))\r
+                                       continue;\r
+                               newlen = strlen(curr_path) + strlen(namelist[sel+1]->d_name) + 2;\r
+                               newdir = malloc(newlen);\r
+                               if (newdir == NULL)\r
+                                       break;\r
+                               if (strcmp(namelist[sel+1]->d_name, "..") == 0) {\r
+                                       char *start = curr_path;\r
+                                       p = start + strlen(start) - 1;\r
+                                       while (*p == '/' && p > start) p--;\r
+                                       while (*p != '/' && p > start) p--;\r
+                                       if (p <= start) strcpy(newdir, "/");\r
+                                       else { strncpy(newdir, start, p-start); newdir[p-start] = 0; }\r
+                               } else {\r
+                                       strcpy(newdir, curr_path);\r
+                                       p = newdir + strlen(newdir) - 1;\r
+                                       while (*p == '/' && p >= newdir) *p-- = 0;\r
+                                       strcat(newdir, "/");\r
+                                       strcat(newdir, namelist[sel+1]->d_name);\r
+                               }\r
+                               ret = menu_loop_romsel(newdir, newlen);\r
+                               free(newdir);\r
+                               break;\r
                        }\r
                        else\r
-                               getcwd(curr_path, PATH_MAX);\r
-                       selfname = romsel_loop(curr_path);\r
-                       if (selfname) {\r
-                               printf("selected file: %s\n", selfname);\r
-                               engineState = PGS_ReloadRom;\r
-                               return;\r
-                       }*/\r
-                       break;\r
-               }\r
-       case MA_MAIN_OPTIONS:\r
-               ret = menu_loop_options();\r
-               if (ret == 1) break; // status update\r
-               if (engineState == PGS_ReloadRom)\r
-                       return 1; // BIOS test\r
-               break;\r
-       case MA_MAIN_CONTROLS:\r
-               kc_sel_loop();\r
-               break;\r
-       case MA_MAIN_CREDITS:\r
-               draw_menu_credits();\r
-               usleep(500*1000); /* FIXME */\r
-               in_menu_wait(PBTN_MOK|PBTN_MBACK);\r
-               break;\r
-       case MA_MAIN_EXIT:\r
-               engineState = PGS_Quit;\r
-               return 1;\r
-       case MA_MAIN_PATCHES:\r
-               if (rom_loaded && PicoPatches) {\r
-                       patches_menu_loop();\r
-                       PicoPatchApply();\r
-                       strcpy(menuErrorMsg, "Patches applied");\r
+                       {\r
+                               // unknown file type, happens on NTFS mounts. Try to guess.\r
+                               FILE *tstf; int tmp;\r
+                               strcpy(rom_fname_reload, curr_path);\r
+                               strcat(rom_fname_reload, "/");\r
+                               strcat(rom_fname_reload, namelist[sel+1]->d_name);\r
+                               tstf = fopen(rom_fname_reload, "rb");\r
+                               if (tstf != NULL)\r
+                               {\r
+                                       if (fread(&tmp, 1, 1, tstf) > 0 || ferror(tstf) == 0)\r
+                                               namelist[sel+1]->d_type = DT_REG;\r
+                                       else    namelist[sel+1]->d_type = DT_DIR;\r
+                                       fclose(tstf);\r
+                                       goto again;\r
+                               }\r
+                       }\r
                }\r
-               break;\r
-       default:\r
-               lprintf("%s: something unknown selected\n", __FUNCTION__);\r
-               break;\r
+               if (inp & PBTN_MBACK)\r
+                       break;\r
        }\r
 \r
-       return 0;\r
+       if (n > 0) {\r
+               while (n--) free(namelist[n]);\r
+               free(namelist);\r
+       }\r
+\r
+       // restore curr_path\r
+       if (fname != NULL) {\r
+               n = strlen(curr_path);\r
+               if (curr_path + n + 1 == fname)\r
+                       curr_path[n] = '/';\r
+       }\r
+\r
+       return ret;\r
 }\r
 \r
-menu_entry e_main_menu[] =\r
-{\r
-       mee_submenu_id("Resume game",        MA_MAIN_RESUME_GAME, main_menu_handler),\r
-       mee_submenu_id("Save State",         MA_MAIN_SAVE_STATE,  main_menu_handler),\r
-       mee_submenu_id("Load State",         MA_MAIN_LOAD_STATE,  main_menu_handler),\r
-       mee_submenu_id("Reset game",         MA_MAIN_RESET_GAME,  main_menu_handler),\r
-       mee_submenu_id("Load new ROM/ISO",   MA_MAIN_LOAD_ROM,    main_menu_handler),\r
-       mee_submenu_id("Change options",     MA_MAIN_OPTIONS,     main_menu_handler),\r
-       mee_submenu_id("Credits",            MA_MAIN_CREDITS,     main_menu_handler),\r
-       mee_submenu_id("Patches / GameGenie",MA_MAIN_PATCHES,     main_menu_handler),\r
-       mee_submenu_id("Exit",               MA_MAIN_EXIT,        main_menu_handler),\r
-       mee_end,\r
-};\r
+// ------------ savestate loader ------------\r
 \r
-void menu_loop(void)\r
-{\r
-       static int sel = 0;\r
+#define STATE_SLOT_COUNT 10\r
 \r
-       me_enable(e_main_menu, MA_MAIN_RESUME_GAME, rom_loaded);\r
-       me_enable(e_main_menu, MA_MAIN_SAVE_STATE,  rom_loaded);\r
-       me_enable(e_main_menu, MA_MAIN_LOAD_STATE,  rom_loaded);\r
-       me_enable(e_main_menu, MA_MAIN_RESET_GAME,  rom_loaded);\r
-       me_enable(e_main_menu, MA_MAIN_PATCHES, PicoPatches != NULL);\r
+static int state_slot_flags = 0;\r
+static int state_slot_times[STATE_SLOT_COUNT];\r
 \r
-       plat_video_menu_enter(rom_loaded);\r
-       in_set_blocking(1);\r
-       me_loop(e_main_menu, &sel);\r
-       in_set_blocking(0);\r
+static void state_check_slots(void)\r
+{\r
+       int slot;\r
 \r
-       if (rom_loaded) {\r
-               while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MBACK)); // wait until select is released\r
-               engineState = PGS_Running;\r
-       }\r
+       state_slot_flags = 0;\r
 \r
+       for (slot = 0; slot < STATE_SLOT_COUNT; slot++) {\r
+               state_slot_times[slot] = 0;\r
+               if (emu_check_save_file(slot, &state_slot_times[slot]))\r
+                       state_slot_flags |= 1 << slot;\r
+       }\r
 }\r
 \r
-// ------------ debug menu ------------\r
+static void draw_savestate_bg(int slot);\r
 \r
-#include <sys/stat.h>\r
-#include <sys/types.h>\r
+static void draw_savestate_menu(int menu_sel, int is_loading)\r
+{\r
+       int i, x, y, w, h;\r
+       char time_buf[32];\r
+\r
+       if (state_slot_flags & (1 << menu_sel))\r
+               draw_savestate_bg(menu_sel);\r
+\r
+       w = (13 + 2) * me_mfont_w;\r
+       h = (1+2+STATE_SLOT_COUNT+1) * me_mfont_h;\r
+       x = g_menuscreen_w / 2 - w / 2;\r
+       if (x < 0) x = 0;\r
+       y = g_menuscreen_h / 2 - h / 2;\r
+       if (y < 0) y = 0;\r
+#ifdef MENU_ALIGN_LEFT\r
+       if (x > 12 + me_mfont_w * 2)\r
+               x = 12 + me_mfont_w * 2;\r
+#endif\r
 \r
-#include <pico/pico.h>\r
-#include <pico/debug.h>\r
+       menu_draw_begin(1);\r
 \r
-void SekStepM68k(void);\r
+       text_out16(x, y, is_loading ? "Load state" : "Save state");\r
+       y += 3 * me_mfont_h;\r
 \r
-static void mplayer_loop(void)\r
-{\r
-       emu_startSound();\r
+       menu_draw_selection(x - me_mfont_w * 2, y + menu_sel * me_mfont_h, (23 + 2) * me_mfont_w + 4);\r
 \r
-       while (1)\r
+       /* draw all slots */\r
+       for (i = 0; i < STATE_SLOT_COUNT; i++, y += me_mfont_h)\r
        {\r
-               PDebugZ80Frame();\r
-               if (in_menu_wait_any(0) & PBTN_NORTH) break;\r
-               emu_waitSound();\r
+               if (!(state_slot_flags & (1 << i)))\r
+                       strcpy(time_buf, "free");\r
+               else {\r
+                       strcpy(time_buf, "USED");\r
+                       if (state_slot_times[i] != 0) {\r
+                               time_t time = state_slot_times[i];\r
+                               struct tm *t = localtime(&time);\r
+                               strftime(time_buf, sizeof(time_buf), "%x %R", t);\r
+                       }\r
+               }\r
+\r
+               text_out16(x, y, "SLOT %i (%s)", i, time_buf);\r
        }\r
+       text_out16(x, y, "back");\r
 \r
-       emu_endSound();\r
+       menu_draw_end();\r
 }\r
 \r
-static void draw_text_debug(const char *str, int skip, int from)\r
+static int menu_loop_savestate(int is_loading)\r
 {\r
-       const char *p;\r
-       int len, line;\r
+       static int menu_sel = STATE_SLOT_COUNT;\r
+       int menu_sel_max = STATE_SLOT_COUNT;\r
+       unsigned long inp = 0;\r
+       int ret = 0;\r
 \r
-       p = str;\r
-       while (skip-- > 0)\r
-       {\r
-               while (*p && *p != '\n') p++;\r
-               if (*p == 0 || p[1] == 0) return;\r
-               p++;\r
-       }\r
+       state_check_slots();\r
 \r
-       str = p;\r
-       for (line = from; line < SCREEN_HEIGHT/10; line++)\r
+       if (!(state_slot_flags & (1 << menu_sel)) && is_loading)\r
+               menu_sel = menu_sel_max;\r
+\r
+       for (;;)\r
        {\r
-               while (*p && *p != '\n') p++;\r
-               len = p - str;\r
-               if (len > 55) len = 55;\r
-               smalltext_out16_lim(1, line*10, str, 0xffff, len);\r
-               if (*p == 0) break;\r
-               p++; str = p;\r
+               draw_savestate_menu(menu_sel, is_loading);\r
+               inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_MOK|PBTN_MBACK, 100);\r
+               if (inp & PBTN_UP) {\r
+                       do {\r
+                               menu_sel--;\r
+                               if (menu_sel < 0)\r
+                                       menu_sel = menu_sel_max;\r
+                       } while (!(state_slot_flags & (1 << menu_sel)) && menu_sel != menu_sel_max && is_loading);\r
+               }\r
+               if (inp & PBTN_DOWN) {\r
+                       do {\r
+                               menu_sel++;\r
+                               if (menu_sel > menu_sel_max)\r
+                                       menu_sel = 0;\r
+                       } while (!(state_slot_flags & (1 << menu_sel)) && menu_sel != menu_sel_max && is_loading);\r
+               }\r
+               if (inp & PBTN_MOK) { // save/load\r
+                       if (menu_sel < STATE_SLOT_COUNT) {\r
+                               state_slot = menu_sel;\r
+                               if (emu_save_load_game(is_loading, 0)) {\r
+                                       me_update_msg(is_loading ? "Load failed" : "Save failed");\r
+                                       break;\r
+                               }\r
+                               ret = 1;\r
+                               break;\r
+                       }\r
+                       break;\r
+               }\r
+               if (inp & PBTN_MBACK)\r
+                       break;\r
        }\r
+\r
+       return ret;\r
 }\r
 \r
-static void draw_frame_debug(void)\r
+// -------------- key config --------------\r
+\r
+static char *action_binds(int player_idx, int action_mask, int dev_id)\r
 {\r
-       char layer_str[48] = "layers:             ";\r
-       if (PicoDrawMask & PDRAW_LAYERB_ON)      memcpy(layer_str +  8, "B", 1);\r
-       if (PicoDrawMask & PDRAW_LAYERA_ON)      memcpy(layer_str + 10, "A", 1);\r
-       if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6);\r
-       if (PicoDrawMask & PDRAW_SPRITES_HI_ON)  memcpy(layer_str + 19, "spr_hi", 6);\r
+       int dev = 0, dev_last = IN_MAX_DEVS - 1;\r
+       int can_combo = 1, type;\r
 \r
-       clear_screen();\r
-       emu_forcedFrame(0);\r
-       smalltext_out16(4, SCREEN_HEIGHT-8, layer_str, 0xffff);\r
-}\r
+       static_buff[0] = 0;\r
 \r
-void debug_menu_loop(void)\r
-{\r
-       int inp, mode = 0;\r
-       int spr_offs = 0, dumped = 0;\r
-       char *tmp;\r
+       type = IN_BINDTYPE_EMU;\r
+       if (player_idx >= 0) {\r
+               can_combo = 0;\r
+               type = IN_BINDTYPE_PLAYER12;\r
+       }\r
+       if (player_idx == 1)\r
+               action_mask <<= 16;\r
 \r
-       while (1)\r
-       {\r
-               switch (mode)\r
-               {\r
-                       case 0: plat_video_menu_begin();\r
-                               tmp = PDebugMain();\r
-                               emu_platformDebugCat(tmp);\r
-                               draw_text_debug(tmp, 0, 0);\r
-                               if (dumped) {\r
-                                       smalltext_out16(SCREEN_WIDTH-6*10, SCREEN_HEIGHT-8, "dumped", 0xffff);\r
-                                       dumped = 0;\r
-                               }\r
-                               break;\r
-                       case 1: draw_frame_debug(); break;\r
-                       case 2: clear_screen();\r
-                               emu_forcedFrame(0);\r
-                               darken_screen();\r
-                               PDebugShowSpriteStats((unsigned short *)SCREEN_BUFFER + (SCREEN_HEIGHT/2 - 240/2)*SCREEN_WIDTH +\r
-                                       SCREEN_WIDTH/2 - 320/2, SCREEN_WIDTH); break;\r
-                       case 3: clear_screen();\r
-                               PDebugShowPalette(SCREEN_BUFFER, SCREEN_WIDTH);\r
-                               PDebugShowSprite((unsigned short *)SCREEN_BUFFER + SCREEN_WIDTH*120+SCREEN_WIDTH/2+16,\r
-                                       SCREEN_WIDTH, spr_offs);\r
-                               draw_text_debug(PDebugSpriteList(), spr_offs, 6);\r
-                               break;\r
-               }\r
-               plat_video_menu_end();\r
+       if (dev_id >= 0)\r
+               dev = dev_last = dev_id;\r
 \r
-               inp = in_menu_wait(PBTN_EAST|PBTN_MBACK|PBTN_WEST|PBTN_NORTH|PBTN_L|PBTN_R|PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT);\r
-               if (inp & PBTN_MBACK) return;\r
-               if (inp & PBTN_L) { mode--; if (mode < 0) mode = 3; }\r
-               if (inp & PBTN_R) { mode++; if (mode > 3) mode = 0; }\r
-               switch (mode)\r
-               {\r
-                       case 0:\r
-                               if (inp & PBTN_EAST) SekStepM68k();\r
-                               if (inp & PBTN_NORTH) {\r
-                                       while (inp & PBTN_NORTH) inp = in_menu_wait_any(-1);\r
-                                       mplayer_loop();\r
-                               }\r
-                               if ((inp & (PBTN_WEST|PBTN_LEFT)) == (PBTN_WEST|PBTN_LEFT)) {\r
-                                       mkdir("dumps", 0777);\r
-                                       PDebugDumpMem();\r
-                                       while (inp & PBTN_WEST) inp = in_menu_wait_any(-1);\r
-                                       dumped = 1;\r
-                               }\r
-                               break;\r
-                       case 1:\r
-                               if (inp & PBTN_LEFT)  PicoDrawMask ^= PDRAW_LAYERB_ON;\r
-                               if (inp & PBTN_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;\r
-                               if (inp & PBTN_DOWN)  PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;\r
-                               if (inp & PBTN_UP)    PicoDrawMask ^= PDRAW_SPRITES_HI_ON;\r
-                               if (inp & PBTN_EAST) {\r
-                                       PsndOut = NULL; // just in case\r
-                                       PicoSkipFrame = 1;\r
-                                       PicoFrame();\r
-                                       PicoSkipFrame = 0;\r
-                                       while (inp & PBTN_EAST) inp = in_menu_wait_any(-1);\r
-                               }\r
-                               break;\r
-                       case 3:\r
-                               if (inp & PBTN_DOWN)  spr_offs++;\r
-                               if (inp & PBTN_UP)    spr_offs--;\r
-                               if (spr_offs < 0) spr_offs = 0;\r
-                               break;\r
+       for (; dev <= dev_last; dev++) {\r
+               int k, count = 0, combo = 0;\r
+               const int *binds;\r
+\r
+               binds = in_get_dev_binds(dev);\r
+               if (binds == NULL)\r
+                       continue;\r
+\r
+               in_get_config(dev, IN_CFG_BIND_COUNT, &count);\r
+               in_get_config(dev, IN_CFG_DOES_COMBOS, &combo);\r
+               combo = combo && can_combo;\r
+\r
+               for (k = 0; k < count; k++) {\r
+                       const char *xname;\r
+                       int len;\r
+\r
+                       if (!(binds[IN_BIND_OFFS(k, type)] & action_mask))\r
+                               continue;\r
+\r
+                       xname = in_get_key_name(dev, k);\r
+                       len = strlen(static_buff);\r
+                       if (len) {\r
+                               strncat(static_buff, combo ? " + " : ", ",\r
+                                       sizeof(static_buff) - len - 1);\r
+                               len += combo ? 3 : 2;\r
+                       }\r
+                       strncat(static_buff, xname, sizeof(static_buff) - len - 1);\r
                }\r
        }\r
+\r
+       return static_buff;\r
 }\r
 \r
-#endif // !UIQ3\r
+static int count_bound_keys(int dev_id, int action_mask, int bindtype)\r
+{\r
+       const int *binds;\r
+       int k, keys = 0;\r
+       int count = 0;\r
+\r
+       binds = in_get_dev_binds(dev_id);\r
+       if (binds == NULL)\r
+               return 0;\r
+\r
+       in_get_config(dev_id, IN_CFG_BIND_COUNT, &count);\r
+       for (k = 0; k < count; k++)\r
+       {\r
+               if (binds[IN_BIND_OFFS(k, bindtype)] & action_mask)\r
+                       keys++;\r
+       }\r
 \r
-// ------------ util ------------\r
+       return keys;\r
+}\r
 \r
-const char *me_region_name(unsigned int code, int auto_order)\r
+static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_idx,\r
+               int sel, int dev_id, int dev_count, int is_bind)\r
 {\r
-       static const char *names[] = { "Auto", "      Japan NTSC", "      Japan PAL", "      USA", "      Europe" };\r
-       static const char *names_short[] = { "", " JP", " JP", " US", " EU" };\r
-       int u, i = 0;\r
-       if (code) {\r
-               code <<= 1;\r
-               while((code >>= 1)) i++;\r
-               if (i > 4) return "unknown";\r
-               return names[i];\r
-       } else {\r
-               static char name[24];\r
-               strcpy(name, "Auto:");\r
-               for (u = 0; u < 3; u++) {\r
-                       i = 0; code = ((auto_order >> u*4) & 0xf) << 1;\r
-                       while((code >>= 1)) i++;\r
-                       strcat(name, names_short[i]);\r
-               }\r
-               return name;\r
+       char buff[64], buff2[32];\r
+       const char *dev_name;\r
+       int x, y, w, i;\r
+\r
+       w = ((player_idx >= 0) ? 20 : 30) * me_mfont_w;\r
+       x = g_menuscreen_w / 2 - w / 2;\r
+       y = (g_menuscreen_h - 4 * me_mfont_h) / 2 - (2 + opt_cnt) * me_mfont_h / 2;\r
+       if (x < me_mfont_w * 2)\r
+               x = me_mfont_w * 2;\r
+\r
+       menu_draw_begin(1);\r
+       if (player_idx >= 0)\r
+               text_out16(x, y, "Player %i controls", player_idx + 1);\r
+       else\r
+               text_out16(x, y, "Emulator controls");\r
+\r
+       y += 2 * me_mfont_h;\r
+       menu_draw_selection(x - me_mfont_w * 2, y + sel * me_mfont_h, w + 2 * me_mfont_w);\r
+\r
+       for (i = 0; i < opt_cnt; i++, y += me_mfont_h)\r
+               text_out16(x, y, "%s : %s", opts[i].name,\r
+                       action_binds(player_idx, opts[i].mask, dev_id));\r
+\r
+       if (dev_id < 0)\r
+               dev_name = "(all devices)";\r
+       else\r
+               dev_name = in_get_dev_name(dev_id, 1, 1);\r
+       w = strlen(dev_name) * me_mfont_w;\r
+       if (w < 30 * me_mfont_w)\r
+               w = 30 * me_mfont_w;\r
+       if (w > g_menuscreen_w)\r
+               w = g_menuscreen_w;\r
+\r
+       x = g_menuscreen_w / 2 - w / 2;\r
+\r
+       if (!is_bind) {\r
+               snprintf(buff2, sizeof(buff2), "%s", in_get_key_name(-1, -PBTN_MOK));\r
+               snprintf(buff, sizeof(buff), "%s - bind, %s - clear", buff2,\r
+                               in_get_key_name(-1, -PBTN_MA2));\r
+               text_out16(x, g_menuscreen_h - 4 * me_mfont_h, buff);\r
+       }\r
+       else\r
+               text_out16(x, g_menuscreen_h - 4 * me_mfont_h, "Press a button to bind/unbind");\r
+\r
+       if (dev_count > 1) {\r
+               text_out16(x, g_menuscreen_h - 3 * me_mfont_h, dev_name);\r
+               text_out16(x, g_menuscreen_h - 2 * me_mfont_h, "Press left/right for other devs");\r
        }\r
+\r
+       menu_draw_end();\r
 }\r
 \r
-/* TODO: rename */\r
-void menu_darken_bg(void *dst, int pixels, int darker)\r
+static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_idx)\r
 {\r
-       unsigned int *screen = dst;\r
-       pixels /= 2;\r
-       if (darker)\r
-       {\r
-               while (pixels--)\r
-               {\r
-                       unsigned int p = *screen;\r
-                       *screen++ = ((p&0xf79ef79e)>>1) - ((p&0xc618c618)>>3);\r
+       int i, sel = 0, menu_sel_max = opt_cnt - 1, does_combos = 0;\r
+       int dev_id, bind_dev_id, dev_count, kc, is_down, mkey;\r
+       int unbind, bindtype, mask_shift;\r
+\r
+       for (i = 0, dev_id = -1, dev_count = 0; i < IN_MAX_DEVS; i++) {\r
+               if (in_get_dev_name(i, 1, 0) != NULL) {\r
+                       dev_count++;\r
+                       if (dev_id < 0)\r
+                               dev_id = i;\r
                }\r
        }\r
-       else\r
+\r
+       if (dev_id == -1) {\r
+               lprintf("no devs, can't do config\n");\r
+               return;\r
+       }\r
+\r
+       dev_id = -1; // show all\r
+       mask_shift = 0;\r
+       if (player_idx == 1)\r
+               mask_shift = 16;\r
+       bindtype = player_idx >= 0 ? IN_BINDTYPE_PLAYER12 : IN_BINDTYPE_EMU;\r
+\r
+       for (;;)\r
        {\r
-               while (pixels--)\r
-               {\r
-                       unsigned int p = *screen;\r
-                       *screen++ = (p&0xf79ef79e)>>1;\r
+               draw_key_config(opts, opt_cnt, player_idx, sel, dev_id, dev_count, 0);\r
+               mkey = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|PBTN_MBACK|PBTN_MOK|PBTN_MA2, 100);\r
+               switch (mkey) {\r
+                       case PBTN_UP:   sel--; if (sel < 0) sel = menu_sel_max; continue;\r
+                       case PBTN_DOWN: sel++; if (sel > menu_sel_max) sel = 0; continue;\r
+                       case PBTN_LEFT:\r
+                               for (i = 0, dev_id--; i < IN_MAX_DEVS + 1; i++, dev_id--) {\r
+                                       if (dev_id < -1)\r
+                                               dev_id = IN_MAX_DEVS - 1;\r
+                                       if (dev_id == -1 || in_get_dev_name(dev_id, 1, 0) != NULL)\r
+                                               break;\r
+                               }\r
+                               continue;\r
+                       case PBTN_RIGHT:\r
+                               for (i = 0, dev_id++; i < IN_MAX_DEVS; i++, dev_id++) {\r
+                                       if (dev_id >= IN_MAX_DEVS)\r
+                                               dev_id = -1;\r
+                                       if (dev_id == -1 || in_get_dev_name(dev_id, 1, 0) != NULL)\r
+                                               break;\r
+                               }\r
+                               continue;\r
+                       case PBTN_MBACK:\r
+                               return;\r
+                       case PBTN_MOK:\r
+                               if (sel >= opt_cnt)\r
+                                       return;\r
+                               while (in_menu_wait_any(30) & PBTN_MOK)\r
+                                       ;\r
+                               break;\r
+                       case PBTN_MA2:\r
+                               in_unbind_all(dev_id, opts[sel].mask << mask_shift, bindtype);\r
+                               continue;\r
+                       default:continue;\r
                }\r
+\r
+               draw_key_config(opts, opt_cnt, player_idx, sel, dev_id, dev_count, 1);\r
+\r
+               /* wait for some up event */\r
+               for (is_down = 1; is_down; )\r
+                       kc = in_update_keycode(&bind_dev_id, &is_down, -1);\r
+\r
+               i = count_bound_keys(bind_dev_id, opts[sel].mask << mask_shift, bindtype);\r
+               unbind = (i > 0);\r
+\r
+               /* allow combos if device supports them */\r
+               in_get_config(bind_dev_id, IN_CFG_DOES_COMBOS, &does_combos);\r
+               if (i == 1 && bindtype == IN_BINDTYPE_EMU && does_combos)\r
+                       unbind = 0;\r
+\r
+               if (unbind)\r
+                       in_unbind_all(bind_dev_id, opts[sel].mask << mask_shift, bindtype);\r
+\r
+               in_bind_key(bind_dev_id, kc, opts[sel].mask << mask_shift, bindtype, 0);\r
        }\r
 }\r
 \r