mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3906 from lasers/add-monochrome-jagged

Browse Source 
Add Monochrome Jagged
This commit is contained in:
Jean-André Santoni 2016-10-31 08:20:33 +01:00 committed by GitHub
commit 659235c572
8 changed files with 48 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
intl/msg_hash_chs.c
View File

@ -605,7 +605,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len)
{
/* Work around C89 limitations */
char u[501];
const char * t =
const char * t =
"RetroArch relies on an unique form of\n"
"audio/video synchronization where it needs to be\n"
"calibrated against the refresh rate of your\n"
@ -3911,6 +3911,8 @@ const char *msg_hash_to_str_chs(enum msg_hash_enums msg)
return "菜单Shader管线";
case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME:
return "Monochrome";
case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED:
return "Monochrome Jagged";
case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI:
return "FlatUI";
case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE:
@ -4602,7 +4604,7 @@ const char *msg_hash_to_str_chs(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_LANG_ESPERANTO:
return "世界语";
case MENU_ENUM_LABEL_VALUE_LANG_VIETNAMESE:
return "越南语";
return "越南语";
case MENU_ENUM_LABEL_VALUE_LEFT_ANALOG:
return "左侧摇杆";
case MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG:

8
intl/msg_hash_jp.c
View File

@ -137,7 +137,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len)
"Complete by toggling eject again.");
break;
case RARCH_GRAB_MOUSE_TOGGLE:
snprintf(s, len,
snprintf(s, len,
"Toggles mouse grab. \n"
" \n"
"When mouse is grabbed, RetroArch hides the \n"
@ -1482,7 +1482,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len)
" Possible values are [0.0, 1.0].");
break;
case MENU_ENUM_LABEL_INPUT_TURBO_PERIOD:
snprintf(s, len,
snprintf(s, len,
"Turbo period.\n"
" \n"
"Describes the period of which turbo-enabled\n"
@ -1492,7 +1492,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len)
);
break;
case MENU_ENUM_LABEL_INPUT_DUTY_CYCLE:
snprintf(s, len,
snprintf(s, len,
"Duty cycle.\n"
" \n"
"Describes how long the period of a turbo-enabled\n"
@ -3941,6 +3941,8 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
return "メニューのシェーダーパイプライン";
case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME:
return "モノクローム";
case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED:
return "モノクローム Jagged";
case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI:
return "フラットUI";
case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE:

2
intl/msg_hash_us.c
View File

@ -3941,6 +3941,8 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
return "Menu Shader Pipeline";
case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME:
return "Monochrome";
case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED:
return "Monochrome Jagged";
case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI:
return "FlatUI";
case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE:

4
intl/msg_hash_vn.c
View File

@ -626,7 +626,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len)
{
/* Work around C89 limitations */
char u[501];
const char * t =
const char * t =
"RetroArch relies on an unique form of\n"
"audio/video synchronization where it needs to be\n"
"calibrated against the refresh rate of your\n"
@ -3943,6 +3943,8 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg)
return "Menu Shader Pipeline";
case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME:
return "Monochrome";
case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED:
return "Monochrome Jagged";
case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI:
return "FlatUI";
case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE:

26
menu/cbs/menu_cbs_get_value.c
View File

@ -216,12 +216,12 @@ static void menu_action_setting_disp_set_label_pipeline(
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF), len);
break;
case XMB_SHADER_PIPELINE_SIMPLE_RIBBON:
strlcpy(s,
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON_SIMPLIFIED), len);
break;
case XMB_SHADER_PIPELINE_RIBBON:
strlcpy(s,
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON), len);
break;
@ -307,7 +307,7 @@ static void menu_action_setting_disp_set_label_shader_default_filter(
return;
if (settings->video.smooth)
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LINEAR), len);
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LINEAR), len);
else
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NEAREST), len);
}
@ -335,7 +335,7 @@ static void menu_action_setting_disp_set_label_shader_parameter(
if (!shader_info.data)
return;
param = &shader_info.data->parameters[type -
param = &shader_info.data->parameters[type -
MENU_SETTINGS_SHADER_PARAMETER_0];
if (!param)
@ -451,7 +451,7 @@ static void menu_action_setting_disp_set_label_input_desc(
const struct retro_keybind *auto_bind = NULL;
const struct retro_keybind *keybind = NULL;
settings_t *settings = config_get_ptr();
unsigned inp_desc_index_offset =
unsigned inp_desc_index_offset =
type - MENU_SETTINGS_INPUT_DESC_BEGIN;
unsigned inp_desc_user = inp_desc_index_offset /
(RARCH_FIRST_CUSTOM_BIND + 4);
@ -463,7 +463,7 @@ static void menu_action_setting_disp_set_label_input_desc(
return;
descriptor[0] = '\0';
remap_id = settings->input.remap_ids
[inp_desc_user][inp_desc_button_index_offset];
@ -479,11 +479,11 @@ static void menu_action_setting_disp_set_label_input_desc(
{
if(strstr(descriptor, "Auto") && !strstr(descriptor,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE)))
strlcpy(s,
strlcpy(s,
descriptor,
len);
else
strlcpy(s,
strlcpy(s,
msg_hash_to_str(settings->input.binds[inp_desc_user][remap_id].enum_idx),
len);
}
@ -532,9 +532,9 @@ static void menu_action_setting_disp_set_label_cheat(
if (cheat_index < cheat_manager_get_buf_size())
snprintf(s, len, "%s : (%s)",
(cheat_manager_get_code(cheat_index) != NULL)
? cheat_manager_get_code(cheat_index) :
? cheat_manager_get_code(cheat_index) :
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE),
cheat_manager_get_code_state(cheat_index) ?
cheat_manager_get_code_state(cheat_index) ?
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON) :
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF)
);
@ -743,6 +743,10 @@ static void menu_action_setting_disp_set_label_xmb_theme(
strlcpy(s,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL), len);
break;
case XMB_ICON_THEME_MONOCHROME_JAGGED:
strlcpy(s,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED), len);
break;
case XMB_ICON_THEME_CUSTOM:
strlcpy(s,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM), len);
@ -936,7 +940,7 @@ static void menu_action_setting_disp_set_label_thumbnails(
MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_SCREENSHOTS), len);
break;
case 2:
strlcpy(s,
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_TITLE_SCREENS), len);
break;

32
menu/drivers/xmb.c
View File

@ -367,6 +367,8 @@ const char *xmb_theme_ident(void)
return "pixel";
case XMB_ICON_THEME_CUSTOM:
return "custom";
case XMB_ICON_THEME_MONOCHROME_JAGGED:
return "monochrome-jagged";
case XMB_ICON_THEME_MONOCHROME:
default:
break;
@ -1543,7 +1545,7 @@ static void xmb_context_reset_horizontal_list(
continue;
}
iconpath[0] = sysname[0] = texturepath[0] =
iconpath[0] = sysname[0] = texturepath[0] =
content_texturepath[0] = '\0';
file_list_get_at_offset(xmb->horizontal_list, i,
@ -1719,7 +1721,7 @@ static void xmb_populate_entries(void *data,
}
static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
xmb_node_t *core_node, xmb_node_t *node,
xmb_node_t *core_node, xmb_node_t *node,
enum msg_hash_enums enum_idx, unsigned type, bool active)
{
switch (enum_idx)
@ -1847,13 +1849,13 @@ char* word_wrap (char* buffer, char* string, int line_width) {
unsigned i = 0;
int k, counter;
while(i < strlen( string ) )
while(i < strlen( string ) )
{
/* copy string until the end of the line is reached */
for ( counter = 1; counter <= line_width; counter++ )
for ( counter = 1; counter <= line_width; counter++ )
{
/* check if end of string reached */
if ( i == strlen( string ) )
if ( i == strlen( string ) )
{
buffer[ i ] = 0;
return buffer;
@ -1861,24 +1863,24 @@ char* word_wrap (char* buffer, char* string, int line_width) {
buffer[ i ] = string[ i ];
/* check for newlines embedded in the original input
/* check for newlines embedded in the original input
* and reset the index */
if ( buffer[ i ] == '\n' )
counter = 1;
counter = 1;
i++;
}
/* check for whitespace */
if ( isspace( string[ i ] ) )
if ( isspace( string[ i ] ) )
{
buffer[i] = '\n';
i++;
}
}
else
{
/* check for nearest whitespace back in string */
for ( k = i; k > 0; k--)
for ( k = i; k > 0; k--)
{
if ( isspace( string[ k ] ) )
if ( isspace( string[ k ] ) )
{
buffer[ k ] = '\n';
/* set string index back to character after this one */
@ -2232,7 +2234,7 @@ static void xmb_draw_bg(
#if 0
RARCH_LOG("DRAW BG %d %d \n",width,height);
#endif
bool running = menu_display_libretro_running();
draw.x = 0;
@ -2251,8 +2253,8 @@ static void xmb_draw_bg(
menu_display_set_viewport();
#ifdef HAVE_SHADERPIPELINE
if (settings->menu.xmb.shader_pipeline > XMB_SHADER_PIPELINE_WALLPAPER
&&
if (settings->menu.xmb.shader_pipeline > XMB_SHADER_PIPELINE_WALLPAPER
&&
(settings->menu.xmb.menu_color_theme != XMB_THEME_WALLPAPER))
{
draw.color = xmb_gradient_ident();
@ -2543,7 +2545,7 @@ static void xmb_frame(void *data)
xmb->selection_buf_old,
xmb->menu_stack_old,
xmb->selection_ptr_old,
(xmb_list_get_size(xmb, MENU_LIST_PLAIN) > 1)
(xmb_list_get_size(xmb, MENU_LIST_PLAIN) > 1)
? xmb->categories.selection_ptr : xmb->categories.selection_ptr_old,
&item_color[0],
width,

1
menu/menu_display.h
View File

@ -64,6 +64,7 @@ enum xmb_icon_theme
XMB_ICON_THEME_FLATUI,
XMB_ICON_THEME_RETROACTIVE,
XMB_ICON_THEME_PIXEL,
XMB_ICON_THEME_MONOCHROME_JAGGED,
XMB_ICON_THEME_CUSTOM
};

1
msg_hash.h
View File

@ -352,6 +352,7 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_JAGGED,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LEGACY_RED,