add support for doublesized menu fonts

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@645 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/common/emu.c b/common/emu.c
index f8b4e65..b03f8f8 100644 (file)
--- a/common/emu.c
+++ b/common/emu.c
@@ -129,9 +129,9 @@ int emu_findBios(int region, char **bios_file)
                if (bios_file) *bios_file = bios_path;\r
                return 1;\r
        } else {\r
-               sprintf(menuErrorMsg, "no %s BIOS files found, read docs",\r
+               sprintf(bios_path, "no %s BIOS files found, read docs",\r
                        region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
-               lprintf("%s\n", menuErrorMsg);\r
+               me_update_msg(bios_path);\r
                return 0;\r
        }\r
 }\r
@@ -307,7 +307,7 @@ int emu_ReloadRom(char *rom_fname)
 \r
        // detect wrong extensions\r
        if (!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz\r
-               sprintf(menuErrorMsg, "Not a ROM/CD selected.");\r
+               me_update_msg("Not a ROM/CD selected.");\r
                return 0;\r
        }\r
 \r
@@ -324,32 +324,32 @@ int emu_ReloadRom(char *rom_fname)
                int dummy;\r
                FILE *movie_file = fopen(rom_fname, "rb");\r
                if(!movie_file) {\r
-                       sprintf(menuErrorMsg, "Failed to open movie.");\r
+                       me_update_msg("Failed to open movie.");\r
                        return 0;\r
                }\r
                fseek(movie_file, 0, SEEK_END);\r
                movie_size = ftell(movie_file);\r
                fseek(movie_file, 0, SEEK_SET);\r
                if(movie_size < 64+3) {\r
-                       sprintf(menuErrorMsg, "Invalid GMV file.");\r
+                       me_update_msg("Invalid GMV file.");\r
                        fclose(movie_file);\r
                        return 0;\r
                }\r
                movie_data = malloc(movie_size);\r
                if(movie_data == NULL) {\r
-                       sprintf(menuErrorMsg, "low memory.");\r
+                       me_update_msg("low memory.");\r
                        fclose(movie_file);\r
                        return 0;\r
                }\r
                fread(movie_data, 1, movie_size, movie_file);\r
                fclose(movie_file);\r
                if (strncmp((char *)movie_data, "Gens Movie TEST", 15) != 0) {\r
-                       sprintf(menuErrorMsg, "Invalid GMV file.");\r
+                       me_update_msg("Invalid GMV file.");\r
                        return 0;\r
                }\r
                dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname);\r
                if (!dummy) {\r
-                       sprintf(menuErrorMsg, "Could't find a ROM for movie.");\r
+                       me_update_msg("Could't find a ROM for movie.");\r
                        return 0;\r
                }\r
                get_ext(rom_fname, ext);\r
@@ -361,7 +361,7 @@ int emu_ReloadRom(char *rom_fname)
                PicoPatchLoad(rom_fname);\r
                dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname);\r
                if (!dummy) {\r
-                       sprintf(menuErrorMsg, "Could't find a ROM to patch.");\r
+                       me_update_msg("Could't find a ROM to patch.");\r
                        return 0;\r
                }\r
                get_ext(rom_fname, ext);\r
@@ -401,12 +401,12 @@ int emu_ReloadRom(char *rom_fname)
 \r
        rom = pm_open(used_rom_name);\r
        if (!rom) {\r
-               sprintf(menuErrorMsg, "Failed to open ROM/CD image");\r
+               me_update_msg("Failed to open ROM/CD image");\r
                goto fail;\r
        }\r
 \r
        if (cd_state < 0) {\r
-               sprintf(menuErrorMsg, "Invalid CD image");\r
+               me_update_msg("Invalid CD image");\r
                goto fail;\r
        }\r
 \r
@@ -416,10 +416,9 @@ int emu_ReloadRom(char *rom_fname)
        rom_loaded = 0;\r
 \r
        if ( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {\r
-               if      (ret == 2) sprintf(menuErrorMsg, "Out of memory");\r
-               else if (ret == 3) sprintf(menuErrorMsg, "Read failed");\r
-               else               sprintf(menuErrorMsg, "PicoCartLoad() failed.");\r
-               lprintf("%s\n", menuErrorMsg);\r
+               if      (ret == 2) me_update_msg("Out of memory");\r
+               else if (ret == 3) me_update_msg("Read failed");\r
+               else               me_update_msg("PicoCartLoad() failed.");\r
                goto fail2;\r
        }\r
        pm_close(rom);\r
@@ -429,7 +428,7 @@ int emu_ReloadRom(char *rom_fname)
        if (rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 ||\r
          ((*(unsigned char *)(rom_data+4)<<16)|(*(unsigned short *)(rom_data+6))) >= (int)rom_size) {\r
                if (rom_data) free(rom_data);\r
-               sprintf(menuErrorMsg, "Not a ROM selected.");\r
+               me_update_msg("Not a ROM selected.");\r
                goto fail2;\r
        }\r
 \r
@@ -443,7 +442,7 @@ int emu_ReloadRom(char *rom_fname)
 \r
        lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);\r
        if (PicoCartInsert(rom_data, rom_size)) {\r
-               sprintf(menuErrorMsg, "Failed to load ROM.");\r
+               me_update_msg("Failed to load ROM.");\r
                goto fail2;\r
        }\r
 \r
@@ -451,8 +450,7 @@ int emu_ReloadRom(char *rom_fname)
        if (cd_state != CIT_NOT_CD) {\r
                ret = Insert_CD(rom_fname, cd_state);\r
                if (ret != 0) {\r
-                       sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");\r
-                       lprintf("%s\n", menuErrorMsg);\r
+                       me_update_msg("Insert_CD() failed, invalid CD image?");\r
                        goto fail2;\r
                }\r
        }\r

diff --git a/common/menu.c b/common/menu.c
index dc53393..2f29e87 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -25,14 +25,19 @@
 #define array_size(x) (sizeof(x) / sizeof(x[0]))\r
 \r
 static char static_buff[64];\r
-char menuErrorMsg[64] = { 0, };\r
-\r
+static char menu_error_msg[64] = { 0, };\r
+static int  menu_error_time = 0;\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
+#if MENU_X2\r
+static const int me_mfont_w = 16, me_mfont_h = 20;\r
+#else\r
+static const int me_mfont_w = 8, me_mfont_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
@@ -59,11 +64,11 @@ static void text_out16_(int x, int y, const char *text, int color)
 \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 += g_screen_width - 8)\r
+               for (l = 0; l < me_mfont_h; l++, dst += g_screen_width - 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
@@ -84,7 +89,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
@@ -92,7 +97,7 @@ void text_out16(int x, int y, const char *texto, ...)
 {\r
        va_list args;\r
        char    buffer[256];\r
-       int     maxw = (g_screen_width - x) / 8;\r
+       int     maxw = (g_screen_width - x) / me_mfont_w;\r
 \r
        if (maxw < 0)\r
                return;\r
@@ -141,7 +146,7 @@ static void smalltext_out16_(int x, int y, const char *texto, int color)
        }\r
 }\r
 \r
-void smalltext_out16(int x, int y, const char *texto, int color)\r
+static void smalltext_out16(int x, int y, const char *texto, int color)\r
 {\r
        char buffer[128];\r
        int maxw = (g_screen_width - x) / 6;\r
@@ -168,7 +173,7 @@ static void menu_draw_selection(int x, int y, int w)
 \r
        if (y > 0) y--;\r
        dest = (unsigned short *)g_screen_ptr + x + y * g_screen_width + 14;\r
-       for (h = 11; h > 0; h--)\r
+       for (h = me_mfont_h + 1; h > 0; h--)\r
        {\r
                dst = dest;\r
                for (i = w; i > 0; i--)\r
@@ -192,33 +197,65 @@ 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
+       // 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
        readpng(menu_font_data, "skin/selector.png", READPNG_SELECTOR);\r
 \r
        // load custom colors\r
@@ -281,7 +318,7 @@ static void me_draw(const menu_entry *entries, int sel)
 {\r
        const menu_entry *ent;\r
        int x, y, w = 0, h = 0;\r
-       int offs, opt_offs = 27*8;\r
+       int offs, opt_offs = 27 * me_mfont_w;\r
        const char *name;\r
        int asel = 0;\r
        int i, n;\r
@@ -298,22 +335,22 @@ static void me_draw(const menu_entry *entries, int sel)
                        asel = n;\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(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
+                               opt_offs = wt + me_mfont_w;\r
                        wt = opt_offs;\r
 \r
                        switch (ent->beh) {\r
                        case MB_NONE: break;\r
                        case MB_OPT_ONOFF:\r
-                       case MB_OPT_RANGE: wt += 8*3; break;\r
+                       case MB_OPT_RANGE: wt += me_mfont_w * 3; break;\r
                        case MB_OPT_CUSTOM:\r
                        case MB_OPT_CUSTONOFF:\r
                        case MB_OPT_CUSTRANGE:\r
@@ -322,7 +359,7 @@ static void me_draw(const menu_entry *entries, int sel)
                                if (ent->generate_name != NULL)\r
                                        name = ent->generate_name(ent->id, &offs);\r
                                if (name != NULL)\r
-                                       wt += (strlen(name) + offs) * 8;\r
+                                       wt += (strlen(name) + offs) * me_mfont_w;\r
                                break;\r
                        }\r
                }\r
@@ -331,8 +368,8 @@ static void me_draw(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 > g_screen_width) {\r
                lprintf("width %d > %d\n", w, g_screen_width);\r
@@ -348,7 +385,8 @@ static void me_draw(const menu_entry *entries, int sel)
 \r
        /* draw */\r
        plat_video_menu_begin();\r
-       menu_draw_selection(x, y + asel * 10, w);\r
+       menu_draw_selection(x, y + asel * me_mfont_h, w);\r
+       x += me_mfont_w * 2;\r
 \r
        for (ent = entries; ent->name; ent++)\r
        {\r
@@ -361,16 +399,16 @@ static void me_draw(const menu_entry *entries, int sel)
                                name = ent->generate_name(ent->id, &offs);\r
                }\r
                if (name != NULL)\r
-                       text_out16(x + 16, y, name);\r
+                       text_out16(x, 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 + opt_offs, y, (*(int *)ent->var & ent->mask) ? "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 + opt_offs, y, "%i", *(int *)ent->var);\r
                        break;\r
                case MB_OPT_CUSTOM:\r
                case MB_OPT_CUSTONOFF:\r
@@ -380,25 +418,22 @@ static void me_draw(const menu_entry *entries, int sel)
                        if (ent->generate_name)\r
                                name = ent->generate_name(ent->id, &offs);\r
                        if (name != NULL)\r
-                               text_out16(x + 16 + opt_offs + offs * 8, y, "%s", name);\r
+                               text_out16(x + opt_offs + offs * me_mfont_w, y, "%s", name);\r
                        break;\r
                }\r
 \r
-               y += 10;\r
+               y += me_mfont_h;\r
        }\r
 \r
        /* display message if we have one */\r
-       if (menuErrorMsg[0] != 0) {\r
-               static int msg_redraws = 0;\r
-               if (g_screen_height - h >= 2*10)\r
-                       text_out16(5, 226, menuErrorMsg);\r
+       if (menu_error_msg[0] != 0) {\r
+               if (g_screen_height - h >= 2 * me_mfont_h)\r
+                       text_out16(5, g_screen_height - me_mfont_h - 4, menu_error_msg);\r
                else\r
                        lprintf("menu msg doesn't fit!\n");\r
 \r
-               if (++msg_redraws > 4) {\r
-                       menuErrorMsg[0] = 0;\r
-                       msg_redraws = 0;\r
-               }\r
+               if (plat_get_ticks_ms() - menu_error_time > 2048)\r
+                       menu_error_msg[0] = 0;\r
        }\r
 \r
        plat_video_menu_end();\r
@@ -510,14 +545,14 @@ static void draw_menu_credits(void)
                p++;\r
        }\r
 \r
-       x = g_screen_width  / 2 - w *  8 / 2;\r
-       y = g_screen_height / 2 - h * 10 / 2;\r
+       x = g_screen_width  / 2 - w * me_mfont_w / 2;\r
+       y = g_screen_height / 2 - h * me_mfont_h / 2;\r
        if (x < 0) x = 0;\r
        if (y < 0) y = 0;\r
 \r
        plat_video_menu_begin();\r
 \r
-       for (p = creds; *p != 0 && y <= g_screen_height - 10; y += 10) {\r
+       for (p = creds; *p != 0 && y <= g_screen_height - me_mfont_h; y += me_mfont_h) {\r
                text_out16(x, y, p);\r
 \r
                for (; *p != 0 && *p != '\n'; p++)\r
@@ -643,7 +678,7 @@ static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)
                        smalltext_out16(14,   pos*10, namelist[i+1]->d_name, color);\r
                }\r
        }\r
-       text_out16(5, max_cnt/2 * 10, ">");\r
+       smalltext_out16(5, max_cnt/2 * 10, ">", 0xffff);\r
        plat_video_menu_end();\r
 }\r
 \r
@@ -930,8 +965,8 @@ static void draw_savestate_menu(int menu_sel, int is_loading)
        if (state_slot_flags & (1 << menu_sel))\r
                draw_savestate_bg(menu_sel);\r
 \r
-       w = 13 * 8 + 16;\r
-       h = (1+2+10+1) * 10;\r
+       w = 13 * me_mfont_w + me_mfont_w * 2;\r
+       h = (1+2+10+1) * me_mfont_h;\r
        x = g_screen_width / 2 - w / 2;\r
        if (x < 0) x = 0;\r
        y = g_screen_height / 2 - h / 2;\r
@@ -940,12 +975,12 @@ static void draw_savestate_menu(int menu_sel, int is_loading)
        plat_video_menu_begin();\r
 \r
        text_out16(x, y, is_loading ? "Load state" : "Save state");\r
-       y += 3*10;\r
+       y += 3 * me_mfont_h;\r
 \r
-       menu_draw_selection(x - 16, y + menu_sel * 10, 13 * 8 + 4);\r
+       menu_draw_selection(x - me_mfont_w * 2, y + menu_sel * me_mfont_h, 13 * me_mfont_w + 4);\r
 \r
        /* draw all 10 slots */\r
-       for (i = 0; i < 10; i++, y += 10)\r
+       for (i = 0; i < 10; i++, y += me_mfont_h)\r
        {\r
                text_out16(x, y, "SLOT %i (%s)", i, (state_slot_flags & (1 << i)) ? "USED" : "free");\r
        }\r
@@ -984,7 +1019,7 @@ static int menu_loop_savestate(int is_loading)
                        if (menu_sel < 10) {\r
                                state_slot = menu_sel;\r
                                if (emu_SaveLoadGame(is_loading, 0)) {\r
-                                       strcpy(menuErrorMsg, is_loading ? "Load failed" : "Save failed");\r
+                                       me_update_msg(is_loading ? "Load failed" : "Save failed");\r
                                        return 0;\r
                                }\r
                                return 1;\r
@@ -1056,42 +1091,45 @@ static int count_bound_keys(int dev_id, int action_mask, int player_idx)
 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
-       int x, y = 30, w, i;\r
+       int x, y, w, i;\r
        const char *dev_name;\r
 \r
-       x = g_screen_width / 2 - 32*8 / 2;\r
-       if (x < 0) x = 0;\r
+       x = g_screen_width / 2 - 20 * me_mfont_w / 2;\r
+       y = (g_screen_height - 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
        plat_video_menu_begin();\r
        if (player_idx >= 0)\r
-               text_out16(x, 10, "Player %i controls", player_idx + 1);\r
+               text_out16(x, y, "Player %i controls", player_idx + 1);\r
        else\r
-               text_out16(x, 10, "Emulator controls");\r
+               text_out16(x, y, "Emulator controls");\r
 \r
-       menu_draw_selection(x - 16, y + sel*10, (player_idx >= 0) ? 66 : 140);\r
+       y += 2 * me_mfont_h;\r
+       menu_draw_selection(x - me_mfont_w * 2, y + sel * me_mfont_h, me_mfont_w); // FIXME last arg\r
 \r
-       for (i = 0; i < opt_cnt; i++, y+=10)\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
        dev_name = in_get_dev_name(dev_id, 1, 1);\r
-       w = strlen(dev_name) * 8;\r
-       if (w < 30 * 8)\r
-               w = 30 * 8;\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_screen_width)\r
                w = g_screen_width;\r
 \r
        x = g_screen_width / 2 - w / 2;\r
 \r
        if (dev_count > 1) {\r
-               text_out16(x, g_screen_height - 4*10, "Viewing binds for:");\r
-               text_out16(x, g_screen_height - 3*10, dev_name);\r
+               text_out16(x, g_screen_height - 4 * me_mfont_h, "Viewing binds for:");\r
+               text_out16(x, g_screen_height - 3 * me_mfont_h, dev_name);\r
        }\r
 \r
        if (is_bind)\r
-               text_out16(x, g_screen_height - 2*10, "Press a button to bind/unbind");\r
+               text_out16(x, g_screen_height - 2 * me_mfont_h, "Press a button to bind/unbind");\r
        else if (dev_count > 1)\r
-               text_out16(x, g_screen_height - 2*10, "Press left/right for other devs");\r
+               text_out16(x, g_screen_height - 2 * me_mfont_h, "Press left/right for other devs");\r
 \r
        plat_video_menu_end();\r
 }\r
@@ -1501,15 +1539,15 @@ static int mh_saveloadcfg(menu_id id, int keys)
        case MA_OPT_SAVECFG:\r
        case MA_OPT_SAVECFG_GAME:\r
                if (emu_WriteConfig(id == MA_OPT_SAVECFG_GAME ? 1 : 0))\r
-                       strcpy(menuErrorMsg, "config saved");\r
+                       me_update_msg("config saved");\r
                else\r
-                       strcpy(menuErrorMsg, "failed to write config");\r
+                       me_update_msg("failed to write config");\r
                break;\r
        case MA_OPT_LOADCFG:\r
                ret = emu_ReadConfig(1, 1);\r
                if (!ret) ret = emu_ReadConfig(0, 1);\r
-               if (ret)  strcpy(menuErrorMsg, "config loaded");\r
-               else      strcpy(menuErrorMsg, "failed to load config");\r
+               if (ret)  me_update_msg("config loaded");\r
+               else      me_update_msg("failed to load config");\r
                break;\r
        default:\r
                return 0;\r
@@ -1711,7 +1749,8 @@ static void debug_menu_loop(void)
                                emu_platformDebugCat(tmp);\r
                                draw_text_debug(tmp, 0, 0);\r
                                if (dumped) {\r
-                                       smalltext_out16(g_screen_width - 6*10, g_screen_height - 8, "dumped", 0xffff);\r
+                                       smalltext_out16(g_screen_width - 6 * me_mfont_h,\r
+                                               g_screen_height - me_mfont_h, "dumped", 0xffff);\r
                                        dumped = 0;\r
                                }\r
                                break;\r
@@ -1833,7 +1872,7 @@ static int main_menu_handler(menu_id id, int keys)
                if (rom_loaded && PicoPatches) {\r
                        menu_loop_patches();\r
                        PicoPatchApply();\r
-                       strcpy(menuErrorMsg, "Patches applied");\r
+                       me_update_msg("Patches applied");\r
                }\r
                break;\r
        default:\r
@@ -1897,8 +1936,7 @@ static int mh_tray_load_cd(menu_id id, int keys)
        if (cd_type != CIT_NOT_CD)\r
                ret = Insert_CD(ret_name, cd_type);\r
        if (ret != 0) {\r
-               sprintf(menuErrorMsg, "Load failed, invalid CD image?");\r
-               lprintf("%s\n", menuErrorMsg);\r
+               me_update_msg("Load failed, invalid CD image?");\r
                return 0;\r
        }\r
 \r
@@ -1943,6 +1981,15 @@ int menu_loop_tray(void)
 \r
 #endif // !UIQ3\r
 \r
+void me_update_msg(const char *msg)\r
+{\r
+       strncpy(menu_error_msg, msg, sizeof(menu_error_msg));\r
+       menu_error_msg[sizeof(menu_error_msg) - 1] = 0;\r
+\r
+       menu_error_time = plat_get_ticks_ms();\r
+       lprintf("msg: %s\n", menu_error_msg);\r
+}\r
+\r
 // ------------ util ------------\r
 \r
 /* TODO: rename */\r

diff --git a/common/menu.h b/common/menu.h
index c4aaaf0..3f77603 100644 (file)
--- a/common/menu.h
+++ b/common/menu.h
@@ -1,11 +1,4 @@
-// (c) Copyright 2006-2008 notaz, All rights reserved.
-
-
-void menu_init(void);
-void text_out16(int x, int y, const char *texto, ...);
-void smalltext_out16(int x, int y, const char *texto, int color);
-
-extern char menuErrorMsg[64];
+// (c) Copyright 2006-2009 notaz, All rights reserved.
 
 typedef enum
 {
@@ -159,6 +152,10 @@ typedef struct
 extern me_bind_action me_ctrl_actions[15];
 extern me_bind_action emuctrl_actions[];       // platform code
 
+void menu_init(void);
+void text_out16(int x, int y, const char *texto, ...);
+void me_update_msg(const char *msg);
+
 menu_entry *me_list_get_first(void);
 menu_entry *me_list_get_next(void);
 

diff --git a/gp2x/940ctl.c b/gp2x/940ctl.c
index d219d8a..77083c9 100644 (file)
--- a/gp2x/940ctl.c
+++ b/gp2x/940ctl.c
@@ -150,7 +150,7 @@ static void wait_busy_940(int job)
                gp2x_memregs[0x3b46>>1], gp2x_memregl[0x4500>>2], gp2x_memregl[0x4510>>2]);\r
        printf("last lr: %08x, lastjob: %i\n", shared_ctl->last_lr, shared_ctl->lastjob);\r
 \r
-       strcpy(menuErrorMsg, "940 crashed, too much overclock?");\r
+       me_update_msg("940 crashed, too much overclock?");\r
        engineState = PGS_Menu;\r
        crashed_940 = 1;\r
 }\r

diff --git a/gp2x/port_config.h b/gp2x/port_config.h
index ba7acee..94b7bfe 100644 (file)
--- a/gp2x/port_config.h
+++ b/gp2x/port_config.h
@@ -33,5 +33,6 @@
 #define PLAT_HAVE_JOY 1\r
 #define PATH_SEP      "/"\r
 #define PATH_SEP_C    '/'\r
+#define MENU_X2       0\r
 \r
 #endif //PORT_CONFIG_H\r

diff --git a/linux/port_config.h b/linux/port_config.h
index a8048e4..8c8eca3 100644 (file)
--- a/linux/port_config.h
+++ b/linux/port_config.h
@@ -38,6 +38,7 @@
 #define PLAT_HAVE_JOY 1
 #define PATH_SEP      "/"
 #define PATH_SEP_C    '/'
+#define MENU_X2       0
 
 #endif //PORT_CONFIG_H
 

diff --git a/pandora/port_config.h b/pandora/port_config.h
index b82b89c..02bc39c 100644 (file)
--- a/pandora/port_config.h
+++ b/pandora/port_config.h
@@ -33,5 +33,6 @@
 #define PLAT_HAVE_JOY 1\r
 #define PATH_SEP      "/"\r
 #define PATH_SEP_C    '/'\r
+#define MENU_X2       1\r
 \r
 #endif //PORT_CONFIG_H\r

diff --git a/psp/port_config.h b/psp/port_config.h
index a59692c..7d543f1 100644 (file)
--- a/psp/port_config.h
+++ b/psp/port_config.h
@@ -37,5 +37,6 @@ extern void blit1(void);
 #define PLAT_HAVE_JOY 0\r
 #define PATH_SEP      "/"\r
 #define PATH_SEP_C    '/'\r
+#define MENU_X2       0\r
 \r
 #endif //PORT_CONFIG_H\r