changes for PicoDrive virtual keyboard

diff --git a/input.c b/input.c
index 205efb1..8b17ab4 100644 (file)
--- a/input.c
+++ b/input.c
@@ -17,11 +17,6 @@
 #include "plat.h"
 #include "lprintf.h"
 
-#ifdef IN_VK
-#error needs update: in_vk_init in_vk_update
-#include "../win32/in_vk.h"
-#endif
-
 typedef struct
 {
        int drv_id;

diff --git a/menu.c b/menu.c
index 72c913b..27c72bf 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -55,11 +55,11 @@ static int menu_sel_color = -1; // disabled
 \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
+const int me_mfont_w = 16, me_mfont_h = 20;\r
+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
+const int me_mfont_w = 8, me_mfont_h = 10;\r
+const int me_sfont_w = 6, me_sfont_h = 10;\r
 #endif\r
 \r
 static int g_menu_filter_off;\r
@@ -200,7 +200,7 @@ static void smalltext_out16_(int x, int y, const char *texto, int color)
        }\r
 }\r
 \r
-static void smalltext_out16(int x, int y, const char *texto, int color)\r
+void smalltext_out16(int x, int y, const char *texto, int color)\r
 {\r
        char buffer[128];\r
        int maxw = (g_menuscreen_w - x) / me_sfont_w;\r

diff --git a/menu.h b/menu.h
index dfcc0bc..edcdb59 100644 (file)
--- a/menu.h
+++ b/menu.h
@@ -125,9 +125,13 @@ extern int g_menubg_src_pp;
 
 extern int g_autostateld_opt;
 
+extern const int me_mfont_w, me_mfont_h;
+extern const int me_sfont_w, me_sfont_h;
+
 void menu_init_base(void);
 void menu_update_msg(const char *msg);
 void text_out16(int x, int y, const char *texto, ...);
+void smalltext_out16(int x, int y, const char *texto, int color);
 
 menu_entry *me_list_get_first(void);
 menu_entry *me_list_get_next(void);