ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Menu) Cleanups

This commit is contained in:
twinaphex 2015-02-11 19:28:06 +01:00
parent b0bd9fdd9d
commit 6b8aece1f7
8 changed files with 73 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
menu/drivers/glui.c
View File

@ -42,14 +42,14 @@ typedef struct glui_handle
GLuint bg; GLuint bg;
} glui_handle_t; } glui_handle_t;
static int glui_entry_iterate(unsigned action) static int glui_entry_iterate(menu_handle_t *menu, unsigned action)
{ {
const char *label = NULL; const char *label = NULL;
menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*) menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*)
menu_list_get_actiondata_at_offset(driver.menu->menu_list->selection_buf, menu_list_get_actiondata_at_offset(menu->menu_list->selection_buf,
driver.menu->selection_ptr); menu->selection_ptr);
menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL); menu_list_get_last_stack(menu->menu_list, NULL, &label, NULL);
if (cbs && cbs->action_iterate) if (cbs && cbs->action_iterate)
return cbs->action_iterate(label, action); return cbs->action_iterate(label, action);

24
menu/drivers/ios.c
View File

@ -25,35 +25,15 @@
#include "ios.h" #include "ios.h"
#include "../menu_input.h" #include "../menu_input.h"
#if 1 static int ios_entry_iterate(menu_handle_t *menu, unsigned action)
static int ios_entry_iterate(unsigned action)
{ {
ios_handle_t *ios = NULL; ios_handle_t *ios = (ios_handle_t*)menu->userdata;
if (!driver.menu)
return 0;
ios = (ios_handle_t*)driver.menu->userdata;
if (ios->switch_to_ios) if (ios->switch_to_ios)
ios->switch_to_ios(); ios->switch_to_ios();
return 0; return 0;
} }
#else
static int ios_entry_iterate(unsigned action)
{
const char *label = NULL;
menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*)
menu_list_get_actiondata_at_offset(driver.menu->menu_list->selection_buf,
driver.menu->selection_ptr);
menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL);
if (cbs && cbs->action_iterate)
return cbs->action_iterate(label, action);
return -1;
}
#endif
static void *ios_init(void) static void *ios_init(void)
{ {

104
menu/drivers/rgui.c
View File

@ -36,18 +36,18 @@
#define RGUI_TERM_WIDTH (((driver.menu->width - RGUI_TERM_START_X - RGUI_TERM_START_X) / (FONT_WIDTH_STRIDE))) #define RGUI_TERM_WIDTH (((driver.menu->width - RGUI_TERM_START_X - RGUI_TERM_START_X) / (FONT_WIDTH_STRIDE)))
#define RGUI_TERM_HEIGHT (((driver.menu->height - RGUI_TERM_START_Y - RGUI_TERM_START_X) / (FONT_HEIGHT_STRIDE)) - 1) #define RGUI_TERM_HEIGHT (((driver.menu->height - RGUI_TERM_START_Y - RGUI_TERM_START_X) / (FONT_HEIGHT_STRIDE)) - 1)
static int rgui_entry_iterate(unsigned action) static int rgui_entry_iterate(menu_handle_t *menu, unsigned action)
{ {
const char *label = NULL; const char *label = NULL;
if (!driver.menu || !driver.menu->menu_list) if (!menu || !menu->menu_list)
return -1; return -1;
menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*) menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*)
menu_list_get_actiondata_at_offset(driver.menu->menu_list->selection_buf, menu_list_get_actiondata_at_offset(menu->menu_list->selection_buf,
driver.menu->selection_ptr); menu->selection_ptr);
menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL); menu_list_get_last_stack(menu->menu_list, NULL, &label, NULL);
if (cbs && cbs->action_iterate) if (cbs && cbs->action_iterate)
return cbs->action_iterate(label, action); return cbs->action_iterate(label, action);
@ -136,17 +136,13 @@ static void color_rect(menu_handle_t *menu,
for (j = y; j < y + height; j++) for (j = y; j < y + height; j++)
for (i = x; i < x + width; i++) for (i = x; i < x + width; i++)
if (i < driver.menu->width && j < driver.menu->height) if (i < menu->width && j < menu->height)
menu->frame_buf.data[j * (menu->frame_buf.pitch >> 1) + i] = color; menu->frame_buf.data[j * (menu->frame_buf.pitch >> 1) + i] = color;
} }
static void blit_line(int x, int y, const char *message, bool green) static void blit_line(menu_handle_t *menu, int x, int y, const char *message, bool green)
{ {
unsigned i, j; unsigned i, j;
menu_handle_t *menu = driver.menu;
if (!menu)
return;
while (*message) while (*message)
{ {
@ -240,8 +236,9 @@ static void rgui_render_messagebox(const char *message)
int x, y; int x, y;
unsigned width, glyphs_width, height; unsigned width, glyphs_width, height;
struct string_list *list = NULL; struct string_list *list = NULL;
menu_handle_t *menu = driver.menu;
if (!driver.menu || !message || !*message) if (!menu || !message || !*message)
return; return;
list = string_split(message, "\n"); list = string_split(message, "\n");
@ -274,21 +271,21 @@ static void rgui_render_messagebox(const char *message)
} }
height = FONT_HEIGHT_STRIDE * list->size + 6 + 10; height = FONT_HEIGHT_STRIDE * list->size + 6 + 10;
x = (driver.menu->width - width) / 2; x = (menu->width - width) / 2;
y = (driver.menu->height - height) / 2; y = (menu->height - height) / 2;
fill_rect(driver.menu, x + 5, y + 5, width - 10, height - 10, gray_filler); fill_rect(menu, x + 5, y + 5, width - 10, height - 10, gray_filler);
fill_rect(driver.menu, x, y, width - 5, 5, green_filler); fill_rect(menu, x, y, width - 5, 5, green_filler);
fill_rect(driver.menu, x + width - 5, y, 5, height - 5, green_filler); fill_rect(menu, x + width - 5, y, 5, height - 5, green_filler);
fill_rect(driver.menu, x + 5, y + height - 5, width - 5, 5, green_filler); fill_rect(menu, x + 5, y + height - 5, width - 5, 5, green_filler);
fill_rect(driver.menu, x, y + 5, 5, height - 5, green_filler); fill_rect(menu, x, y + 5, 5, height - 5, green_filler);
for (i = 0; i < list->size; i++) for (i = 0; i < list->size; i++)
{ {
const char *msg = list->elems[i].data; const char *msg = list->elems[i].data;
int offset_x = FONT_WIDTH_STRIDE * (glyphs_width - strlen(msg)) / 2; int offset_x = FONT_WIDTH_STRIDE * (glyphs_width - strlen(msg)) / 2;
int offset_y = FONT_HEIGHT_STRIDE * i; int offset_y = FONT_HEIGHT_STRIDE * i;
blit_line(x + 8 + offset_x, y + 8 + offset_y, msg, false); blit_line(menu, x + 8 + offset_x, y + 8 + offset_y, msg, false);
} }
end: end:
@ -314,33 +311,34 @@ static void rgui_render(void)
const char *label = NULL; const char *label = NULL;
const char *core_name = NULL; const char *core_name = NULL;
const char *core_version = NULL; const char *core_version = NULL;
menu_handle_t *menu = driver.menu;
if (driver.menu->need_refresh if (!menu || (menu->need_refresh
&& g_extern.is_menu && g_extern.is_menu
&& !driver.menu->msg_force) && !menu->msg_force))
return; return;
driver.menu->mouse.ptr = driver.menu->mouse.y / 11 - 2 + driver.menu->begin; menu->mouse.ptr = menu->mouse.y / 11 - 2 + menu->begin;
if (driver.menu->mouse.wheeldown && driver.menu->begin if (menu->mouse.wheeldown && menu->begin
< menu_list_get_size(driver.menu->menu_list) - RGUI_TERM_HEIGHT) < menu_list_get_size(menu->menu_list) - RGUI_TERM_HEIGHT)
driver.menu->begin++; menu->begin++;
if (driver.menu->mouse.wheelup && driver.menu->begin > 0) if (menu->mouse.wheelup && menu->begin > 0)
driver.menu->begin--; menu->begin--;
/* Do not scroll if all items are visible. */ /* Do not scroll if all items are visible. */
if (menu_list_get_size(driver.menu->menu_list) <= RGUI_TERM_HEIGHT) if (menu_list_get_size(menu->menu_list) <= RGUI_TERM_HEIGHT)
driver.menu->begin = 0; menu->begin = 0;
end = (driver.menu->begin + RGUI_TERM_HEIGHT <= end = (menu->begin + RGUI_TERM_HEIGHT <=
menu_list_get_size(driver.menu->menu_list)) ? menu_list_get_size(menu->menu_list)) ?
driver.menu->begin + RGUI_TERM_HEIGHT : menu->begin + RGUI_TERM_HEIGHT :
menu_list_get_size(driver.menu->menu_list); menu_list_get_size(menu->menu_list);
rgui_render_background(driver.menu); rgui_render_background(menu);
menu_list_get_last_stack(driver.menu->menu_list, menu_list_get_last_stack(menu->menu_list,
&dir, &label, &menu_type); &dir, &label, &menu_type);
#if 0 #if 0
@ -351,7 +349,7 @@ static void rgui_render(void)
menu_animation_ticker_line(title_buf, RGUI_TERM_WIDTH - 3, menu_animation_ticker_line(title_buf, RGUI_TERM_WIDTH - 3,
g_extern.frame_count / RGUI_TERM_START_X, title, true); g_extern.frame_count / RGUI_TERM_START_X, title, true);
blit_line(RGUI_TERM_START_X + RGUI_TERM_START_X, RGUI_TERM_START_X, title_buf, true); blit_line(menu, RGUI_TERM_START_X + RGUI_TERM_START_X, RGUI_TERM_START_X, title_buf, true);
core_name = g_extern.menu.info.library_name; core_name = g_extern.menu.info.library_name;
if (!core_name) if (!core_name)
@ -369,13 +367,13 @@ static void rgui_render(void)
snprintf(title_msg, sizeof(title_msg), "%s - %s %s", PACKAGE_VERSION, snprintf(title_msg, sizeof(title_msg), "%s - %s %s", PACKAGE_VERSION,
core_name, core_version); core_name, core_version);
blit_line( blit_line(menu,
RGUI_TERM_START_X + RGUI_TERM_START_X, RGUI_TERM_START_X + RGUI_TERM_START_X,
(RGUI_TERM_HEIGHT * FONT_HEIGHT_STRIDE) + (RGUI_TERM_HEIGHT * FONT_HEIGHT_STRIDE) +
RGUI_TERM_START_Y + 2, title_msg, true); RGUI_TERM_START_Y + 2, title_msg, true);
if (g_settings.menu.timedate_enable) if (g_settings.menu.timedate_enable)
blit_line( blit_line(menu,
(RGUI_TERM_WIDTH * FONT_HEIGHT_STRIDE) + (60), (RGUI_TERM_WIDTH * FONT_HEIGHT_STRIDE) + (60),
(RGUI_TERM_HEIGHT * FONT_HEIGHT_STRIDE) + (RGUI_TERM_HEIGHT * FONT_HEIGHT_STRIDE) +
RGUI_TERM_START_Y + 2, timedate, true); RGUI_TERM_START_Y + 2, timedate, true);
@ -384,7 +382,7 @@ static void rgui_render(void)
x = RGUI_TERM_START_X; x = RGUI_TERM_START_X;
y = RGUI_TERM_START_Y; y = RGUI_TERM_START_Y;
for (i = driver.menu->begin; i < end; i++, y += FONT_HEIGHT_STRIDE) for (i = menu->begin; i < end; i++, y += FONT_HEIGHT_STRIDE)
{ {
char message[PATH_MAX_LENGTH], type_str[PATH_MAX_LENGTH], char message[PATH_MAX_LENGTH], type_str[PATH_MAX_LENGTH],
entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH], entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH],
@ -394,23 +392,23 @@ static void rgui_render(void)
bool selected = false; bool selected = false;
menu_file_list_cbs_t *cbs = NULL; menu_file_list_cbs_t *cbs = NULL;
menu_list_get_at_offset(driver.menu->menu_list->selection_buf, i, &path, menu_list_get_at_offset(menu->menu_list->selection_buf, i, &path,
&entry_label, &type); &entry_label, &type);
cbs = (menu_file_list_cbs_t*) cbs = (menu_file_list_cbs_t*)
menu_list_get_actiondata_at_offset(driver.menu->menu_list->selection_buf, menu_list_get_actiondata_at_offset(menu->menu_list->selection_buf,
i); i);
if (cbs && cbs->action_get_representation) if (cbs && cbs->action_get_representation)
cbs->action_get_representation(driver.menu->menu_list->selection_buf, cbs->action_get_representation(menu->menu_list->selection_buf,
&w, type, i, label, &w, type, i, label,
type_str, sizeof(type_str), type_str, sizeof(type_str),
entry_label, path, entry_label, path,
path_buf, sizeof(path_buf)); path_buf, sizeof(path_buf));
selected = (i == driver.menu->selection_ptr); selected = (i == menu->selection_ptr);
if (i > (driver.menu->selection_ptr + 100)) if (i > (menu->selection_ptr + 100))
continue; continue;
menu_animation_ticker_line(entry_title_buf, RGUI_TERM_WIDTH - (w + 1 + 2), menu_animation_ticker_line(entry_title_buf, RGUI_TERM_WIDTH - (w + 1 + 2),
@ -426,16 +424,16 @@ static void rgui_render(void)
w, w,
type_str_buf); type_str_buf);
blit_line(x, y, message, selected); blit_line(menu, x, y, message, selected);
} }
#ifdef GEKKO #ifdef GEKKO
const char *message_queue; const char *message_queue;
if (driver.menu->msg_force) if (menu->msg_force)
{ {
message_queue = msg_queue_pull(g_extern.msg_queue); message_queue = msg_queue_pull(g_extern.msg_queue);
driver.menu->msg_force = false; menu->msg_force = false;
} }
else else
message_queue = driver.current_msg; message_queue = driver.current_msg;
@ -443,18 +441,18 @@ static void rgui_render(void)
rgui_render_messagebox(message_queue); rgui_render_messagebox(message_queue);
#endif #endif
if (driver.menu->keyboard.display) if (menu->keyboard.display)
{ {
char msg[PATH_MAX_LENGTH]; char msg[PATH_MAX_LENGTH];
const char *str = *driver.menu->keyboard.buffer; const char *str = *menu->keyboard.buffer;
if (!str) if (!str)
str = ""; str = "";
snprintf(msg, sizeof(msg), "%s\n%s", driver.menu->keyboard.label, str); snprintf(msg, sizeof(msg), "%s\n%s", menu->keyboard.label, str);
rgui_render_messagebox(msg); rgui_render_messagebox(msg);
} }
if (driver.menu->mouse.enable) if (menu->mouse.enable)
rgui_blit_cursor(driver.menu); rgui_blit_cursor(menu);
} }
static void *rgui_init(void) static void *rgui_init(void)

8
menu/drivers/rmenu.c
View File

@ -64,14 +64,14 @@ struct texture_image *menu_texture;
static bool render_normal = true; static bool render_normal = true;
static bool menu_texture_inited =false; static bool menu_texture_inited =false;
static int rmenu_entry_iterate(unsigned action) static int rmenu_entry_iterate(menu_handle_t *menu, unsigned action)
{ {
const char *label = NULL; const char *label = NULL;
menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*) menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*)
menu_list_get_actiondata_at_offset(driver.menu->menu_list->selection_buf, menu_list_get_actiondata_at_offset(menu->menu_list->selection_buf,
driver.menu->selection_ptr); menu->selection_ptr);
menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL); menu_list_get_last_stack(menu->menu_list, NULL, &label, NULL);
if (cbs && cbs->action_iterate) if (cbs && cbs->action_iterate)
return cbs->action_iterate(label, action); return cbs->action_iterate(label, action);

8
menu/drivers/rmenu_xui.cpp
View File

@ -58,14 +58,14 @@ HXUIOBJ root_menu;
HXUIOBJ current_menu; HXUIOBJ current_menu;
static msg_queue_t *xui_msg_queue; static msg_queue_t *xui_msg_queue;
static int rmenu_xui_entry_iterate(unsigned action) static int rmenu_xui_entry_iterate(menu_handle_t *menu, unsigned action)
{ {
const char *label = NULL; const char *label = NULL;
menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*) menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*)
menu_list_get_actiondata_at_offset(driver.menu->menu_list->selection_buf, menu_list_get_actiondata_at_offset(menu->menu_list->selection_buf,
driver.menu->selection_ptr); menu->selection_ptr);
menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL); menu_list_get_last_stack(menu->menu_list, NULL, &label, NULL);
if (cbs && cbs->action_iterate) if (cbs && cbs->action_iterate)
return cbs->action_iterate(label, action); return cbs->action_iterate(label, action);

8
menu/drivers/xmb.c
View File

@ -161,14 +161,14 @@ static float xmb_item_y(xmb_handle_t *xmb, int i, size_t current)
return iy; return iy;
} }
static int xmb_entry_iterate(unsigned action) static int xmb_entry_iterate(menu_handle_t *menu, unsigned action)
{ {
const char *label = NULL; const char *label = NULL;
menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*) menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*)
menu_list_get_actiondata_at_offset(driver.menu->menu_list->selection_buf, menu_list_get_actiondata_at_offset(menu->menu_list->selection_buf,
driver.menu->selection_ptr); menu->selection_ptr);
menu_list_get_last_stack(driver.menu->menu_list, NULL, &label, NULL); menu_list_get_last_stack(menu->menu_list, NULL, &label, NULL);
if (cbs && cbs->action_iterate) if (cbs && cbs->action_iterate)
return cbs->action_iterate(label, action); return cbs->action_iterate(label, action);

6
menu/menu.c
View File

@ -131,7 +131,7 @@ bool menu_load_content(void)
driver.menu->msg_force = true; driver.menu->msg_force = true;
if (driver.menu_ctx && driver.menu_ctx->entry_iterate) if (driver.menu_ctx && driver.menu_ctx->entry_iterate)
driver.menu_ctx->entry_iterate(MENU_ACTION_NOOP); driver.menu_ctx->entry_iterate(driver.menu, MENU_ACTION_NOOP);
draw_frame(); draw_frame();
@ -355,12 +355,12 @@ int menu_iterate(retro_input_t input,
int32_t ret = 0; int32_t ret = 0;
unsigned action = menu_input_frame(input, trigger_input); unsigned action = menu_input_frame(input, trigger_input);
if (driver.menu_ctx) if (driver.menu && driver.menu_ctx)
{ {
if (driver.menu_ctx->set_texture) if (driver.menu_ctx->set_texture)
driver.menu_ctx->set_texture(driver.menu); driver.menu_ctx->set_texture(driver.menu);
if (driver.menu_ctx->entry_iterate) if (driver.menu_ctx->entry_iterate)
ret = driver.menu_ctx->entry_iterate(action); ret = driver.menu_ctx->entry_iterate(driver.menu, action);
} }
if (g_extern.is_menu) if (g_extern.is_menu)

2
menu/menu_driver.h
View File

@ -204,7 +204,7 @@ typedef struct menu_ctx_driver
void (*list_clear)(void *); void (*list_clear)(void *);
void (*list_cache)(bool, unsigned); void (*list_cache)(bool, unsigned);
void (*list_set_selection)(void *); void (*list_set_selection)(void *);
int (*entry_iterate)(unsigned); int (*entry_iterate)(menu_handle_t *menu, unsigned);
const char *ident; const char *ident;
} menu_ctx_driver_t; } menu_ctx_driver_t;