debug menu unified, more debug tools

[libpicofe.git] / gp2x / menu.c

diff --git a/gp2x/menu.c b/gp2x/menu.c
index a9b0825..9bc880a 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -37,13 +37,13 @@ const char * const keyNames[] = {
        "???",   "???",    "???",  "PUSH", "???",  "???", "???",      "???"\r
 };\r
 \r
-static void menu_darken_bg(void *dst, int pixels, int darker);\r
+void menu_darken_bg(void *dst, int pixels, int darker);\r
 static void menu_prepare_bg(int use_game_bg);\r
 \r
 static unsigned long inp_prev = 0;\r
 static int inp_prevjoy = 0;\r
 \r
-static unsigned long wait_for_input(unsigned long interesting)\r
+unsigned long wait_for_input(unsigned long interesting)\r
 {\r
        unsigned long ret;\r
        static int repeats = 0, wait = 20;\r
@@ -132,7 +132,7 @@ static unsigned long wait_for_input_usbjoy(unsigned long interesting, int *joy)
        return ret;\r
 }\r
 \r
-static void menu_flip(void)\r
+void menu_flip(void)\r
 {\r
        gp2x_video_flush_cache();\r
        gp2x_video_flip2();\r
@@ -429,74 +429,6 @@ rescan:
        return ret;\r
 }\r
 \r
-// ------------ debug menu ------------\r
-\r
-char *debugString(void);\r
-void PicoDrawShowSpriteStats(unsigned short *screen, int stride);\r
-void PicoDrawShowPalette(unsigned short *screen, int stride);\r
-\r
-static void draw_main_debug(void)\r
-{\r
-       char *p, *str = debugString();\r
-       int len, line;\r
-\r
-       gp2x_pd_clone_buffer2();\r
-\r
-       p = str;\r
-       for (line = 0; line < 24; line++)\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
-       }\r
-}\r
-\r
-static void draw_frame_debug(void)\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
-\r
-       memset(gp2x_screen, 0, 320*240*2);\r
-       emu_forcedFrame(0);\r
-       smalltext_out16(4, 232, layer_str, 0xffff);\r
-}\r
-\r
-static void debug_menu_loop(void)\r
-{\r
-       int inp, mode = 0;\r
-\r
-       while (1)\r
-       {\r
-               switch (mode)\r
-               {\r
-                       case 0: draw_main_debug(); break;\r
-                       case 1: draw_frame_debug(); break;\r
-                       case 2: gp2x_pd_clone_buffer2();\r
-                               PicoDrawShowSpriteStats(gp2x_screen, 320); break;\r
-                       case 3: memset(gp2x_screen, 0, 320*240*2);\r
-                               PicoDrawShowPalette(gp2x_screen, 320); break;\r
-               }\r
-               menu_flip();\r
-\r
-               inp = wait_for_input(GP2X_B|GP2X_X|GP2X_L|GP2X_R|GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT);\r
-               if (inp & (GP2X_B|GP2X_X)) return;\r
-               if (inp & GP2X_L) { mode--; if (mode < 0) mode = 3; }\r
-               if (inp & GP2X_R) { mode++; if (mode > 3) mode = 0; }\r
-               if (mode == 1) {\r
-                       if (inp & GP2X_LEFT)  PicoDrawMask ^= PDRAW_LAYERB_ON;\r
-                       if (inp & GP2X_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;\r
-                       if (inp & GP2X_DOWN)  PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;\r
-                       if (inp & GP2X_UP)    PicoDrawMask ^= PDRAW_SPRITES_HI_ON;\r
-               }\r
-       }\r
-}\r
-\r
 // ------------ patch/gg menu ------------\r
 \r
 static void draw_patchlist(int sel)\r
@@ -1653,7 +1585,7 @@ static void menu_loop_root(void)
        }\r
 }\r
 \r
-static void menu_darken_bg(void *dst, int pixels, int darker)\r
+void menu_darken_bg(void *dst, int pixels, int darker)\r
 {\r
        unsigned int *screen = dst;\r
        pixels /= 2;\r