#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
#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
\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
\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
*dst++ = ((r<<8)&0xf800) | ((g<<3)&0x07e0) | (b>>3);\r
}\r
}\r
- dest += 8;\r
+ dest += me_mfont_w;\r
}\r
}\r
\r
{\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
text_out16_(x,y,buffer,menu_text_color);\r
}\r
\r
-\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 *)g_screen_ptr + x + y * g_screen_width;\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_screen_width - me_sfont_w;\r
}\r
src++;\r
-\r
- dst += g_screen_width - 6;\r
}\r
}\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
\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
+ for (i = w - 14; i > 0; i--)\r
*dst++ = menu_sel_color;\r
dest += g_screen_width;\r
}\r
\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
{\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
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
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
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
\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
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
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
return;\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
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
int ln, len = percent * g_screen_width / 100;\r
unsigned short *dst = (unsigned short *)g_screen_ptr + g_screen_width * 10 * 2;\r
\r
- memset(dst, 0xff, g_screen_width * (10 - 2) * 2);\r
+ memset(dst, 0xff, g_screen_width * (me_sfont_h - 2) * 2);\r
\r
- smalltext_out16(1, 3 * 10, "Processing CD image / MP3s", 0xffff);\r
- smalltext_out16(1, 4 * 10, rom_fname_loaded, 0xffff);\r
- dst += g_screen_width * 30;\r
+ smalltext_out16(1, 3 * me_sfont_h, "Processing CD image / MP3s", 0xffff);\r
+ smalltext_out16(1, 4 * me_sfont_h, rom_fname_loaded, 0xffff);\r
+ dst += g_screen_width * me_sfont_h * 3;\r
\r
if (len > g_screen_width)\r
len = g_screen_width;\r
- for (ln = (10 - 2); ln > 0; ln--, dst += g_screen_width)\r
+ for (ln = (me_sfont_h - 2); ln > 0; ln--, dst += g_screen_width)\r
memset(dst, 0xff, len * 2);\r
\r
plat_video_menu_end();\r
{\r
const char *p = rom_name + strlen(rom_name);\r
\r
- plat_video_menu_begin();\r
-\r
while (p > rom_name && *p != '/')\r
p--;\r
\r
/* fill both buffers, callbacks won't update in full */\r
+ plat_video_menu_begin();\r
smalltext_out16(1, 1, "Loading", 0xffff);\r
- smalltext_out16(1, 10, p, 0xffff);\r
+ smalltext_out16(1, me_sfont_h, p, 0xffff);\r
plat_video_menu_end();\r
\r
+ plat_video_menu_begin();\r
smalltext_out16(1, 1, "Loading", 0xffff);\r
- smalltext_out16(1, 10, p, 0xffff);\r
+ smalltext_out16(1, me_sfont_h, p, 0xffff);\r
plat_video_menu_end();\r
\r
PicoCartLoadProgressCB = load_progress_cb;\r
void menu_romload_end(void)\r
{\r
PicoCartLoadProgressCB = PicoCDLoadProgressCB = NULL;\r
- smalltext_out16(1, (cdload_called ? 6 : 3) * 10,\r
+ smalltext_out16(1, (cdload_called ? 6 : 3) * me_sfont_h,\r
"Starting emulation...", 0xffff);\r
plat_video_menu_end();\r
}\r
\r
+// -------------- del confirm ---------------\r
+\r
+static void do_delete(const char *fpath, const char *fname)\r
+{\r
+ int len, mid, inp;\r
+ const char *nm;\r
+ char tmp[64];\r
+\r
+ plat_video_menu_begin();\r
+\r
+ if (!rom_loaded)\r
+ menu_darken_bg(g_screen_ptr, g_screen_width * g_screen_height, 0);\r
+\r
+ len = strlen(fname);\r
+ if (len > g_screen_width/6)\r
+ len = g_screen_width/6;\r
+\r
+ mid = g_screen_width / 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
+ plat_video_menu_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
// -------------- ROM selector --------------\r
\r
// rrrr rggg gggb bbbb\r
\r
static void draw_dirlist(char *curdir, struct dirent **namelist, int n, int sel)\r
{\r
- int max_cnt, start, i, pos;\r
+ int max_cnt, start, i, x, pos;\r
\r
- max_cnt = g_screen_height / 10;\r
+ max_cnt = g_screen_height / me_sfont_h;\r
start = max_cnt / 2 - sel;\r
n--; // exclude current dir (".")\r
\r
\r
menu_darken_bg((short *)g_screen_ptr + g_screen_width * max_cnt/2 * 10, g_screen_width * 8, 0);\r
\r
+ x = 5 + me_mfont_w + 1;\r
if (start - 2 >= 0)\r
- smalltext_out16(14, (start - 2)*10, curdir, 0xffff);\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(14, pos*10, "/", 0xfff6);\r
- smalltext_out16(14+6, pos*10, namelist[i+1]->d_name, 0xfff6);\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 = file2color(namelist[i+1]->d_name);\r
- smalltext_out16(14, pos*10, namelist[i+1]->d_name, color);\r
+ smalltext_out16(x, pos * me_sfont_h, namelist[i+1]->d_name, color);\r
}\r
}\r
- text_out16(5, max_cnt/2 * 10, ">");\r
+ smalltext_out16(5, max_cnt/2 * me_sfont_h, ">", 0xffff);\r
plat_video_menu_end();\r
}\r
\r
ret = rom_fname_reload;\r
break;\r
}\r
-// do_delete(rom_fname_reload, namelist[sel+1]->d_name); // TODO\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
if (pos < 0) continue;\r
if (pos >= max_cnt) break;\r
active = PicoPatches[i].active;\r
- smalltext_out16(14, pos*10, active ? "ON " : "OFF", active ? 0xfff6 : 0xffff);\r
- smalltext_out16(14+6*4, pos*10, PicoPatches[i].name, active ? 0xfff6 : 0xffff);\r
+ smalltext_out16(14, pos * me_sfont_h, active ? "ON " : "OFF", active ? 0xfff6 : 0xffff);\r
+ smalltext_out16(14+6*4, pos * me_sfont_h, PicoPatches[i].name, active ? 0xfff6 : 0xffff);\r
}\r
pos = start + i;\r
if (pos < max_cnt)\r
- smalltext_out16(14, pos * 10, "done", 0xffff);\r
+ smalltext_out16(14, pos * me_sfont_h, "done", 0xffff);\r
\r
- text_out16(5, max_cnt / 2 * 10, ">");\r
+ text_out16(5, max_cnt / 2 * me_sfont_h, ">");\r
plat_video_menu_end();\r
}\r
\r
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 + 2) * me_mfont_w;\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
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 + 2) * 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
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
if (binds == NULL)\r
return static_buff;\r
\r
- count = in_get_dev_bind_count(dev_id);\r
+ count = in_get_dev_info(dev_id, IN_INFO_BIND_COUNT);\r
for (k = 0; k < count; k++)\r
{\r
const char *xname;\r
+ int len;\r
if (!(binds[k] & action_mask))\r
continue;\r
\r
continue;\r
\r
xname = in_get_key_name(dev_id, k);\r
- if (static_buff[0])\r
- strncat(static_buff, " + ", sizeof(static_buff));\r
- strncat(static_buff, xname, sizeof(static_buff));\r
+ len = strlen(static_buff);\r
+ if (len) {\r
+ strncat(static_buff, " + ", sizeof(static_buff) - len - 1);\r
+ len += 3;\r
+ }\r
+ strncat(static_buff, xname, sizeof(static_buff) - len - 1);\r
}\r
\r
return static_buff;\r
if (binds == NULL)\r
return 0;\r
\r
- count = in_get_dev_bind_count(dev_id);\r
+ count = in_get_dev_info(dev_id, IN_INFO_BIND_COUNT);\r
for (k = 0; k < count; k++)\r
{\r
if (!(binds[k] & action_mask))\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
- int x, y = 30, w, i;\r
const char *dev_name;\r
+ int x, y, w, i;\r
\r
- x = g_screen_width / 2 - 32*8 / 2;\r
- if (x < 0) x = 0;\r
+ w = ((player_idx >= 0) ? 20 : 30) * me_mfont_w;\r
+ x = g_screen_width / 2 - 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, w + 2 * me_mfont_w);\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
for (is_down = 1; is_down; )\r
kc = in_update_keycode(&dev_id, &is_down, -1);\r
\r
- unbind = count_bound_keys(dev_id, opts[sel].mask, player_idx) >= 2;\r
+ i = count_bound_keys(dev_id, opts[sel].mask, player_idx);\r
+ unbind = (i > 0);\r
+\r
+ /* allow combos if device supports them */\r
+ if (i == 1 && in_get_dev_info(dev_id, IN_INFO_DOES_COMBOS))\r
+ unbind = 0;\r
\r
in_bind_key(dev_id, kc, opts[sel].mask, unbind);\r
if (player_idx >= 0) {\r
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
mee_onoff ("Enable sound", MA_OPT_ENABLE_SOUND, currentConfig.EmuOpt, 0x004),\r
mee_cust ("Sound Quality", MA_OPT_SOUND_QUALITY, mh_opt_misc, mgn_opt_sound),\r
mee_cust ("Confirm savestate", MA_OPT_CONFIRM_STATES,mh_opt_misc, mgn_opt_c_saves),\r
-#if defined(__GP2X__)\r
- mee_range ("GP2X CPU clocks", MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 400),\r
-#elif defined(PSP)\r
- mee_range ("PSP CPU clock", MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, )\r
-#endif\r
+ mee_range (cpu_clk_name, MA_OPT_CPU_CLOCKS, currentConfig.CPUclock, 20, 900),\r
mee_handler ("[Display options]", menu_loop_gfx_options),\r
mee_handler ("[Advanced options]", menu_loop_adv_options),\r
mee_handler ("[Sega/Mega CD options]", menu_loop_cd_options),\r
\r
// ------------ debug menu ------------\r
\r
-#include <sys/stat.h>\r
-#include <sys/types.h>\r
-\r
#include <pico/debug.h>\r
\r
extern void SekStepM68k(void);\r
p = str;\r
while (skip-- > 0)\r
{\r
- while (*p && *p != '\n') p++;\r
- if (*p == 0 || p[1] == 0) return;\r
+ while (*p && *p != '\n')\r
+ p++;\r
+ if (*p == 0 || p[1] == 0)\r
+ return;\r
p++;\r
}\r
\r
str = p;\r
- for (line = from; line < g_screen_height / 10; line++)\r
+ for (line = from; line < g_screen_height / me_sfont_h; line++)\r
{\r
- while (*p && *p != '\n') p++;\r
- smalltext_out16(1, line*10, str, 0xffff);\r
- if (*p == 0) break;\r
+ smalltext_out16(1, line * me_sfont_h, str, 0xffff);\r
+ while (*p && *p != '\n')\r
+ p++;\r
+ if (*p == 0)\r
+ break;\r
p++; str = p;\r
}\r
}\r
\r
memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);\r
emu_forcedFrame(0);\r
- smalltext_out16(4, g_screen_height - 8, layer_str, 0xffff);\r
+ smalltext_out16(4, 1, "build: " __DATE__ " " __TIME__, 0xffff);\r
+ smalltext_out16(4, g_screen_height - me_sfont_h, layer_str, 0xffff);\r
}\r
\r
static void debug_menu_loop(void)\r
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_sfont_h,\r
+ g_screen_height - me_mfont_h, "dumped", 0xffff);\r
dumped = 0;\r
}\r
break;\r
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
\r
static menu_entry e_menu_main[] =\r
{\r
+ mee_label ("PicoDrive " VERSION),\r
+ mee_label (""),\r
+ mee_label (""),\r
+ mee_label (""),\r
mee_handler_id("Resume game", MA_MAIN_RESUME_GAME, main_menu_handler),\r
mee_handler_id("Save State", MA_MAIN_SAVE_STATE, main_menu_handler),\r
mee_handler_id("Load State", MA_MAIN_LOAD_STATE, main_menu_handler),\r
plat_video_menu_enter(rom_loaded);\r
in_set_blocking(1);\r
me_loop(e_menu_main, &sel);\r
- in_set_blocking(0);\r
\r
- if (rom_loaded && engineState == PGS_Menu) {\r
+ if (rom_loaded) {\r
+ if (engineState == PGS_Menu)\r
+ engineState = PGS_Running;\r
/* wait until menu, ok, back is released */\r
while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK));\r
- engineState = PGS_Running;\r
}\r
+\r
+ in_set_blocking(0);\r
}\r
\r
// --------- CD tray close menu ----------\r
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
\r
in_set_blocking(1);\r
me_loop(e_menu_tray, &sel);\r
- in_set_blocking(0);\r
\r
if (engineState != PGS_RestartRun) {\r
engineState = PGS_RestartRun;\r
}\r
\r
while (in_menu_wait_any(50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK));\r
+ in_set_blocking(0);\r
\r
return ret;\r
}\r
\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
notaz.gp2x.de / libpicofe.git / blobdiff