CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-08 04:39:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(RGUI) Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-08-15 17:51:08 +02:00
parent a73695aca9
commit ade279c0ba
1 changed files with 77 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
menu/drivers/rgui.c
View File

@ -137,16 +137,14 @@ static uint16_t rgui_green_filler(unsigned x, unsigned y)
#endif
}
static void rgui_fill_rect(size_t pitch,
static void rgui_fill_rect(
uint16_t *data,
size_t pitch,
unsigned x, unsigned y,
unsigned width, unsigned height,
uint16_t (*col)(unsigned x, unsigned y))
{
unsigned i, j;
uint16_t *data = (uint16_t*)rgui_framebuf_data;
if (!data || !col)
return;
for (j = y; j < y + height; j++)
for (i = x; i < x + width; i++)
@ -154,6 +152,7 @@ static void rgui_fill_rect(size_t pitch,
}
static void rgui_color_rect(
uint16_t *data,
size_t pitch,
unsigned fb_width, unsigned fb_height,
unsigned x, unsigned y,
@ -161,10 +160,6 @@ static void rgui_color_rect(
uint16_t color)
{
unsigned i, j;
uint16_t *data = (uint16_t*)rgui_framebuf_data;
if (!data)
return;
for (j = y; j < y + height; j++)
for (i = x; i < x + width; i++)
@ -175,14 +170,11 @@ static void rgui_color_rect(
static void blit_line(int x, int y,
const char *message, uint16_t color)
{
unsigned i, j;
size_t pitch = menu_display_get_framebuffer_pitch();
if (!rgui_framebuf_data)
return;
while (!string_is_empty(message))
{
unsigned i, j;
const uint8_t *font_fb = menu_display_get_font_framebuffer();
uint32_t symbol = utf8_walk(&message);
@ -267,12 +259,15 @@ static void rgui_render_background(void)
dst += pitch_in_pixels * 4;
}
rgui_fill_rect(fb_pitch, 5, 5, fb_width - 10, 5, rgui_green_filler);
rgui_fill_rect(fb_pitch, 5, fb_height - 10, fb_width - 10, 5, rgui_green_filler);
if (rgui_framebuf_data)
{
rgui_fill_rect(rgui_framebuf_data, fb_pitch, 5, 5, fb_width - 10, 5, rgui_green_filler);
rgui_fill_rect(rgui_framebuf_data, fb_pitch, 5, fb_height - 10, fb_width - 10, 5, rgui_green_filler);
rgui_fill_rect(fb_pitch, 5, 5, 5, fb_height - 10, rgui_green_filler);
rgui_fill_rect(fb_pitch, fb_width - 10, 5, 5, fb_height - 10,
rgui_green_filler);
rgui_fill_rect(rgui_framebuf_data, fb_pitch, 5, 5, 5, fb_height - 10, rgui_green_filler);
rgui_fill_rect(rgui_framebuf_data, fb_pitch, fb_width - 10, 5, 5, fb_height - 10,
rgui_green_filler);
}
}
static void rgui_set_message(void *data, const char *message)
@ -337,15 +332,23 @@ static void rgui_render_messagebox(const char *message)
x = (fb_width - width) / 2;
y = (fb_height - height) / 2;
rgui_fill_rect(fb_pitch, x + 5, y + 5, width - 10,
height - 10, rgui_gray_filler);
rgui_fill_rect(fb_pitch, x, y, width - 5, 5, rgui_green_filler);
rgui_fill_rect(fb_pitch, x + width - 5, y, 5,
height - 5, rgui_green_filler);
rgui_fill_rect(fb_pitch, x + 5, y + height - 5,
width - 5, 5, rgui_green_filler);
rgui_fill_rect(fb_pitch, x, y + 5, 5,
height - 5, rgui_green_filler);
if (rgui_framebuf_data)
{
rgui_fill_rect(rgui_framebuf_data,
fb_pitch, x + 5, y + 5, width - 10,
height - 10, rgui_gray_filler);
rgui_fill_rect(rgui_framebuf_data,
fb_pitch, x, y, width - 5, 5, rgui_green_filler);
rgui_fill_rect(rgui_framebuf_data,
fb_pitch, x + width - 5, y, 5,
height - 5, rgui_green_filler);
rgui_fill_rect(rgui_framebuf_data,
fb_pitch, x + 5, y + height - 5,
width - 5, 5, rgui_green_filler);
rgui_fill_rect(rgui_framebuf_data,
fb_pitch, x, y + 5, 5,
height - 5, rgui_green_filler);
}
color = NORMAL_COLOR(settings);
@ -355,7 +358,8 @@ static void rgui_render_messagebox(const char *message)
int offset_x = (int)(FONT_WIDTH_STRIDE * (glyphs_width - utf8len(msg)) / 2);
int offset_y = (int)(FONT_HEIGHT_STRIDE * i);
blit_line(x + 8 + offset_x, y + 8 + offset_y, msg, color);
if (rgui_framebuf_data)
blit_line(x + 8 + offset_x, y + 8 + offset_y, msg, color);
}
end:
@ -372,8 +376,11 @@ static void rgui_blit_cursor(void)
menu_display_get_fb_size(&fb_width, &fb_height,
&fb_pitch);
rgui_color_rect(fb_pitch, fb_width, fb_height, x, y - 5, 1, 11, 0xFFFF);
rgui_color_rect(fb_pitch, fb_width, fb_height, x - 5, y, 11, 1, 0xFFFF);
if (rgui_framebuf_data)
{
rgui_color_rect(rgui_framebuf_data, fb_pitch, fb_width, fb_height, x, y - 5, 1, 11, 0xFFFF);
rgui_color_rect(rgui_framebuf_data, fb_pitch, fb_width, fb_height, x - 5, y, 11, 1, 0xFFFF);
}
}
static void rgui_frame(void *data, video_frame_info_t *video_info)
@ -423,7 +430,9 @@ static void rgui_render(void *data, bool is_idle)
/* if the framebuffer changed size, recache the background */
if (rgui->last_width != fb_width || rgui->last_height != fb_height)
{
rgui_fill_rect(fb_pitch, 0, fb_height, fb_width, 4, rgui_gray_filler);
if (rgui_framebuf_data)
rgui_fill_rect(rgui_framebuf_data,
fb_pitch, 0, fb_height, fb_width, 4, rgui_gray_filler);
rgui->last_width = fb_width;
rgui->last_height = fb_height;
}
@ -513,27 +522,32 @@ static void rgui_render(void *data, bool is_idle)
strlcpy(back_buf, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK), sizeof(back_buf));
strlcpy(back_msg, string_to_upper(back_buf), sizeof(back_msg));
blit_line(
RGUI_TERM_START_X(fb_width),
RGUI_TERM_START_X(fb_width),
back_msg,
TITLE_COLOR(settings));
if (rgui_framebuf_data)
blit_line(
RGUI_TERM_START_X(fb_width),
RGUI_TERM_START_X(fb_width),
back_msg,
TITLE_COLOR(settings));
}
strlcpy(title_buf, string_to_upper(title_buf), sizeof(title_buf));
blit_line(
(int)(RGUI_TERM_START_X(fb_width) + (RGUI_TERM_WIDTH(fb_width)
- utf8len(title_buf)) * FONT_WIDTH_STRIDE / 2),
RGUI_TERM_START_X(fb_width),
title_buf, TITLE_COLOR(settings));
if (rgui_framebuf_data)
blit_line(
(int)(RGUI_TERM_START_X(fb_width) + (RGUI_TERM_WIDTH(fb_width)
- utf8len(title_buf)) * FONT_WIDTH_STRIDE / 2),
RGUI_TERM_START_X(fb_width),
title_buf, TITLE_COLOR(settings));
if (settings->bools.menu_core_enable &&
menu_entries_get_core_title(title_msg, sizeof(title_msg)) == 0)
blit_line(
RGUI_TERM_START_X(fb_width),
(RGUI_TERM_HEIGHT(fb_width, fb_height) * FONT_HEIGHT_STRIDE) +
RGUI_TERM_START_Y(fb_height) + 2, title_msg, hover_color);
{
if (rgui_framebuf_data)
blit_line(
RGUI_TERM_START_X(fb_width),
(RGUI_TERM_HEIGHT(fb_width, fb_height) * FONT_HEIGHT_STRIDE) +
RGUI_TERM_START_Y(fb_height) + 2, title_msg, hover_color);
}
if (settings->bools.menu_timedate_enable)
{
@ -548,10 +562,11 @@ static void rgui_render(void *data, bool is_idle)
menu_display_timedate(&datetime);
blit_line(
RGUI_TERM_WIDTH(fb_width) * FONT_WIDTH_STRIDE - RGUI_TERM_START_X(fb_width),
(RGUI_TERM_HEIGHT(fb_width, fb_height) * FONT_HEIGHT_STRIDE) +
RGUI_TERM_START_Y(fb_height) + 2, timedate, hover_color);
if (rgui_framebuf_data)
blit_line(
RGUI_TERM_WIDTH(fb_width) * FONT_WIDTH_STRIDE - RGUI_TERM_START_X(fb_width),
(RGUI_TERM_HEIGHT(fb_width, fb_height) * FONT_HEIGHT_STRIDE) +
RGUI_TERM_START_Y(fb_height) + 2, timedate, hover_color);
}
x = RGUI_TERM_START_X(fb_width);
@ -567,6 +582,7 @@ static void rgui_render(void *data, bool is_idle)
char message[255];
char entry_title_buf[255];
char type_str_buf[255];
size_t entry_title_buf_utf8len, entry_title_buf_len;
unsigned entry_spacing = menu_entry_get_spacing((unsigned)i);
bool entry_selected = menu_entry_is_currently_selected((unsigned)i);
size_t selection = menu_navigation_get_selection();
@ -597,16 +613,20 @@ static void rgui_render(void *data, bool is_idle)
menu_animation_ticker(&ticker);
entry_title_buf_utf8len = utf8len(entry_title_buf);
entry_title_buf_len = strlen(entry_title_buf);
snprintf(message, sizeof(message), "%c %-*.*s %-*s",
entry_selected ? '>' : ' ',
(int)(RGUI_TERM_WIDTH(fb_width) - (entry_spacing + 1 + 2) - utf8len(entry_title_buf) + strlen(entry_title_buf)),
(int)(RGUI_TERM_WIDTH(fb_width) - (entry_spacing + 1 + 2) - utf8len(entry_title_buf) + strlen(entry_title_buf)),
(int)(RGUI_TERM_WIDTH(fb_width) - (entry_spacing + 1 + 2) - entry_title_buf_utf8len + entry_title_buf_len),
(int)(RGUI_TERM_WIDTH(fb_width) - (entry_spacing + 1 + 2) - entry_title_buf_utf8len + entry_title_buf_len),
entry_title_buf,
entry_spacing,
type_str_buf);
blit_line(x, y, message,
entry_selected ? hover_color : normal_color);
if (rgui_framebuf_data)
blit_line(x, y, message,
entry_selected ? hover_color : normal_color);
}
if (menu_input_dialog_get_display_kb())
@ -686,8 +706,10 @@ static void *rgui_init(void **userdata, bool video_is_threaded)
if (!ret)
goto error;
rgui_fill_rect(fb_pitch, 0, fb_height,
fb_width, 4, rgui_gray_filler);
if (rgui_framebuf_data)
rgui_fill_rect(rgui_framebuf_data,
fb_pitch, 0, fb_height,
fb_width, 4, rgui_gray_filler);
rgui->last_width = fb_width;
rgui->last_height = fb_height;