notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gpu_neon: partially support range regs
[pcsx_rearmed.git]
/
frontend
/
common
/
menu.c
diff --git
a/frontend/common/menu.c
b/frontend/common/menu.c
index
31522f7
..
cf31610
100644
(file)
--- a/
frontend/common/menu.c
+++ b/
frontend/common/menu.c
@@
-560,11
+560,11
@@
static int me_process(menu_entry *entry, int is_next, int is_lr)
names = (const char **)entry->data;
\r
for (c = 0; names[c] != NULL; c++)
\r
;
\r
names = (const char **)entry->data;
\r
for (c = 0; names[c] != NULL; c++)
\r
;
\r
- *(
int
*)entry->var += is_next ? 1 : -1;
\r
- if (*(
int
*)entry->var < 0)
\r
- *(
int
*)entry->var = 0;
\r
- if (*(
int
*)entry->var >= c)
\r
- *(
int
*)entry->var = c - 1;
\r
+ *(
signed char
*)entry->var += is_next ? 1 : -1;
\r
+ if (*(
signed char
*)entry->var < 0)
\r
+ *(
signed char
*)entry->var = 0;
\r
+ if (*(
signed char
*)entry->var >= c)
\r
+ *(
signed char
*)entry->var = c - 1;
\r
return 1;
\r
default:
\r
return 0;
\r
return 1;
\r
default:
\r
return 0;
\r
@@
-573,14
+573,14
@@
static int me_process(menu_entry *entry, int is_next, int is_lr)
\r
static void debug_menu_loop(void);
\r
\r
\r
static void debug_menu_loop(void);
\r
\r
-static
void me_loop(menu_entry *menu, int *menu_sel
, void (*draw_more)(void))
\r
+static
int me_loop_d(menu_entry *menu, int *menu_sel, void (*draw_prep)(void)
, void (*draw_more)(void))
\r
{
\r
{
\r
- int ret, inp, sel = *menu_sel, menu_sel_max;
\r
+ int ret
= 0
, inp, sel = *menu_sel, menu_sel_max;
\r
\r
menu_sel_max = me_count(menu) - 1;
\r
if (menu_sel_max < 0) {
\r
lprintf("no enabled menu entries\n");
\r
\r
menu_sel_max = me_count(menu) - 1;
\r
if (menu_sel_max < 0) {
\r
lprintf("no enabled menu entries\n");
\r
- return;
\r
+ return
0
;
\r
}
\r
\r
while ((!menu[sel].enabled || !menu[sel].selectable) && sel < menu_sel_max)
\r
}
\r
\r
while ((!menu[sel].enabled || !menu[sel].selectable) && sel < menu_sel_max)
\r
@@
-592,6
+592,9
@@
static void me_loop(menu_entry *menu, int *menu_sel, void (*draw_more)(void))
\r
for (;;)
\r
{
\r
\r
for (;;)
\r
{
\r
+ if (draw_prep != NULL)
\r
+ draw_prep();
\r
+
\r
me_draw(menu, sel, draw_more);
\r
inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|
\r
PBTN_MOK|PBTN_MBACK|PBTN_MENU|PBTN_L|PBTN_R, 70);
\r
me_draw(menu, sel, draw_more);
\r
inp = in_menu_wait(PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT|
\r
PBTN_MOK|PBTN_MBACK|PBTN_MENU|PBTN_L|PBTN_R, 70);
\r
@@
-636,17
+639,23
@@
static void me_loop(menu_entry *menu, int *menu_sel, void (*draw_more)(void))
}
\r
}
\r
*menu_sel = sel;
\r
}
\r
}
\r
*menu_sel = sel;
\r
+
\r
+ return ret;
\r
+}
\r
+
\r
+static int me_loop(menu_entry *menu, int *menu_sel)
\r
+{
\r
+ return me_loop_d(menu, menu_sel, NULL, NULL);
\r
}
\r
\r
/* ***************************************** */
\r
\r
}
\r
\r
/* ***************************************** */
\r
\r
-static void draw_menu_
credits(
void (*draw_more)(void))
\r
+static void draw_menu_
message(const char *msg,
void (*draw_more)(void))
\r
{
\r
{
\r
- const char *creds, *p;
\r
int x, y, h, w, wt;
\r
int x, y, h, w, wt;
\r
+ const char *p;
\r
\r
\r
- p = creds = plat_get_credits();
\r
-
\r
+ p = msg;
\r
for (h = 1, w = 0; *p != 0; h++) {
\r
for (wt = 0; *p != 0 && *p != '\n'; p++)
\r
wt++;
\r
for (h = 1, w = 0; *p != 0; h++) {
\r
for (wt = 0; *p != 0 && *p != '\n'; p++)
\r
wt++;
\r
@@
-665,7
+674,7
@@
static void draw_menu_credits(void (*draw_more)(void))
\r
menu_draw_begin(1);
\r
\r
\r
menu_draw_begin(1);
\r
\r
- for (p =
creds
; *p != 0 && y <= g_menuscreen_h - me_mfont_h; y += me_mfont_h) {
\r
+ for (p =
msg
; *p != 0 && y <= g_menuscreen_h - me_mfont_h; y += me_mfont_h) {
\r
text_out16(x, y, p);
\r
\r
for (; *p != 0 && *p != '\n'; p++)
\r
text_out16(x, y, p);
\r
\r
for (; *p != 0 && *p != '\n'; p++)
\r
@@
-767,11
+776,6
@@
static int scandir_cmp(const void *p1, const void *p2)
return alphasort(d1, d2);
\r
}
\r
\r
return alphasort(d1, d2);
\r
}
\r
\r
-static const char *filter_exts[] = {
\r
- ".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds", "bcfg", ".txt", ".htm", "html",
\r
- ".jpg", ".gpe"
\r
-};
\r
-
\r
static int scandir_filter(const struct dirent *ent)
\r
{
\r
const char *p;
\r
static int scandir_filter(const struct dirent *ent)
\r
{
\r
const char *p;
\r