frontend: eliminate osd_text dupes

[picodrive.git] / platform / common / emu.c

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 18f63f2..7f375a3 100644 (file)
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -738,8 +738,26 @@ mk_text_out(emu_text_out16_rot, unsigned short, 0xffff,
 \r
 #undef mk_text_out\r
 \r
+void emu_osd_text16(int x, int y, const char *text)\r
+{\r
+       int len = strlen(text) * 8;\r
+       int i, h;\r
+\r
+       len++;\r
+       if (x + len > g_screen_width)\r
+               len = g_screen_width - x;\r
+\r
+       for (h = 0; h < 8; h++) {\r
+               unsigned short *p;\r
+               p = (unsigned short *)g_screen_ptr\r
+                       + x + g_screen_width * (y + h);\r
+               for (i = len; i > 0; i--, p++)\r
+                       *p = (*p >> 2) & 0x39e7;\r
+       }\r
+       emu_text_out16(x, y, text);\r
+}\r
 \r
-void update_movie(void)\r
+static void update_movie(void)\r
 {\r
        int offs = Pico.m.frame_count*3 + 0x40;\r
        if (offs+3 > movie_size) {\r
@@ -1073,9 +1091,9 @@ static void run_events_ui(unsigned int which)
                        char tmp[64];\r
                        int keys, len;\r
 \r
-                       strcpy(tmp, (which & PEV_STATE_LOAD) ? "LOAD STATE?" : "OVERWRITE SAVE?");\r
+                       strcpy(tmp, (which & PEV_STATE_LOAD) ? "LOAD STATE? " : "OVERWRITE SAVE? ");\r
                        len = strlen(tmp);\r
-                       nm = in_get_key_name(-1, -PBTN_MA3);\r
+                       nm = in_get_key_name(-1, -PBTN_MOK);\r
                        snprintf(tmp + len, sizeof(tmp) - len, "(%s=yes, ", nm);\r
                        len = strlen(tmp);\r
                        nm = in_get_key_name(-1, -PBTN_MBACK);\r
@@ -1084,13 +1102,13 @@ static void run_events_ui(unsigned int which)
                        plat_status_msg_busy_first(tmp);\r
 \r
                        in_set_config_int(0, IN_CFG_BLOCKING, 1);\r
-                       while (in_menu_wait_any(NULL, 50) & (PBTN_MA3|PBTN_MBACK))\r
+                       while (in_menu_wait_any(NULL, 50) & (PBTN_MOK | PBTN_MBACK))\r
                                ;\r
-                       while ( !((keys = in_menu_wait_any(NULL, 50)) & (PBTN_MA3|PBTN_MBACK)) )\r
+                       while ( !((keys = in_menu_wait_any(NULL, 50)) & (PBTN_MOK | PBTN_MBACK)))\r
                                ;\r
                        if (keys & PBTN_MBACK)\r
                                do_it = 0;\r
-                       while (in_menu_wait_any(NULL, 50) & (PBTN_MA3|PBTN_MBACK))\r
+                       while (in_menu_wait_any(NULL, 50) & (PBTN_MOK | PBTN_MBACK))\r
                                ;\r
                        in_set_config_int(0, IN_CFG_BLOCKING, 0);\r
                }\r
@@ -1379,6 +1397,8 @@ void emu_loop(void)
                        {\r
                                notice_msg_time = 0;\r
                                plat_status_msg_clear();\r
+                               plat_video_flip();\r
+                               plat_status_msg_clear(); /* Do it again in case of double buffering */\r
                                notice_msg = NULL;\r
                        }\r
                        else {\r