mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Apple/General_) Turn setting_data into general code - this code

Browse Source 
will be used for exposing a list of generic menu settings to
WIMP menus and other such things (already used by the Apple port
in tihs way)
This commit is contained in:
twinaphex 2014-05-03 18:38:29 +02:00
parent 583514ae95
commit de7cf52227
13 changed files with 148 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -12,6 +12,7 @@ OBJ = frontend/frontend.o \
hash.o \
driver.o \
settings.o \
settings_data.o \
dynamic.o \
dynamic_dummy.o \
message_queue.o \

1
Makefile.emscripten
View File

@ -8,6 +8,7 @@ OBJ = frontend/platform/platform_emscripten.o \
driver.o \
conf/config_file.o \
settings.o \
settings_data.o \
hash.o \
dynamic.o \
dynamic_dummy.o \

1
Makefile.win
View File

@ -11,6 +11,7 @@ OBJ = frontend/frontend.o \
driver.o \
conf/config_file.o \
settings.o \
settings_data.o \
hash.o \
dynamic.o \
dynamic_dummy.o \

2
apple/OSX/settings.m
View File

@ -15,7 +15,7 @@
#import <objc/runtime.h>
#import "../common/RetroArch_Apple.h"
#include "../common/setting_data.h"
#include "../../settings_data.h"
#include "../../input/apple_input.h"
#include "../../driver.h"

2
apple/common/RetroArch_Apple.h
View File

@ -21,7 +21,7 @@
#import <CoreFoundation/CoreFoundation.h>
#include "../../frontend/info/core_info.h"
#include "setting_data.h"
#include "../../settings_data.h"
#include "apple_export.h"
#define GSEVENT_TYPE_KEYDOWN 10

2
apple/common/utility.m
View File

@ -16,7 +16,7 @@
#include <sys/stat.h>
#include "RetroArch_Apple.h"
#include "setting_data.h"
#include "../../settings_data.h"
#include "../../general.h"
#include "../../file.h"

4
apple/iOS/menu.h
View File

@ -16,9 +16,9 @@
#ifndef __APPLE_RARCH_IOS_MENU_H__
#define __APPLE_RARCH_IOS_MENU_H__
#include "frontend/menu/history.h"
#include "../../frontend/menu/history.h"
#include "views.h"
#include "apple/common/setting_data.h"
#include "../../settings_data.h"
@protocol RAMenuItemBase
- (UITableViewCell*)cellForTableView:(UITableView*)tableView;

2
apple/iOS/platform.m
View File

@ -19,7 +19,7 @@
#include "rarch_wrapper.h"
#include "../../input/apple_input.h"
#include "apple/common/setting_data.h"
#include "../../settings_data.h"
#include "apple/common/apple_gamecontroller.h"
#include "menu.h"

2
frontend/platform/platform_apple.c
View File

@ -17,7 +17,7 @@
#include "../menu/menu_common.h"
#include "../../apple/common/rarch_wrapper.h"
#include "../../apple/common/apple_export.h"
#include "../../apple/common/setting_data.h"
#include "../../settings_data.h"
#include "../frontend.h"

4
griffin/griffin.c
View File

@ -668,9 +668,7 @@ XML
APPLE EXTENSIONS
============================================================ */
#if defined(IOS) || defined(OSX)
#include "../apple/common/setting_data.c"
#endif
#include "../settings_data.c"
#ifdef __cplusplus
}

2
msvc/msvc-2010/RetroArch-msvc2010.vcxproj
View File

@ -322,6 +322,8 @@
</ClCompile>
<ClCompile Include="..\..\settings.c">
</ClCompile>
<ClCompile Include="..\..\settings_data.c">
</ClCompile>
<ClCompile Include="..\..\thread.c">
</ClCompile>
</ItemGroup>

140
apple/common/setting_data.c → settings_data.c
View File

@ -13,18 +13,10 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "setting_data.h"
#include "../../config.def.h"
// HACK
struct settings fake_settings;
struct global fake_extern;
void setting_data_load_current(void)
{
memcpy(&fake_settings, &g_settings, sizeof(struct settings));
memcpy(&fake_extern, &g_extern, sizeof(struct global));
}
#include "settings_data.h"
#include "file_path.h"
#include "input/input_common.h"
#include "config.def.h"
#define ENFORCE_RANGE(setting, type) \
{ \
@ -37,6 +29,16 @@ void setting_data_load_current(void)
} \
}
// HACK
struct settings fake_settings;
struct global fake_extern;
void setting_data_load_current(void)
{
memcpy(&fake_settings, &g_settings, sizeof(struct settings));
memcpy(&fake_extern, &g_extern, sizeof(struct global));
}
// Input
static const char* get_input_config_prefix(const rarch_setting_t* setting)
{
@ -52,6 +54,8 @@ static const char* get_input_config_key(const rarch_setting_t* setting, const ch
return buffer;
}
//FIXME - make portable
#ifdef APPLE
static const char* get_key_name(const rarch_setting_t* setting)
{
if (BINDFOR(*setting).key == RETROK_UNKNOWN)
@ -65,6 +69,7 @@ static const char* get_key_name(const rarch_setting_t* setting)
return "nul";
}
#endif
static const char* get_button_name(const rarch_setting_t* setting)
@ -74,7 +79,7 @@ static const char* get_button_name(const rarch_setting_t* setting)
if (BINDFOR(*setting).joykey == NO_BTN)
return "nul";
snprintf(buffer, 32, "%lld", BINDFOR(*setting).joykey);
snprintf(buffer, 32, "%lld", (long long int)(BINDFOR(*setting).joykey));
return buffer;
}
@ -94,7 +99,6 @@ static const char* get_axis_name(const rarch_setting_t* setting)
return buffer;
}
//
void setting_data_reset_setting(const rarch_setting_t* setting)
{
switch (setting->type)
@ -116,7 +120,6 @@ void setting_data_reset_setting(const rarch_setting_t* setting)
break;
case ST_STRING:
case ST_PATH:
{
if (setting->default_value.string)
{
if (setting->type == ST_STRING)
@ -125,7 +128,6 @@ void setting_data_reset_setting(const rarch_setting_t* setting)
fill_pathname_expand_special(setting->value.string, setting->default_value.string, setting->size);
}
break;
}
default:
break;
}
@ -136,16 +138,17 @@ void setting_data_reset_setting(const rarch_setting_t* setting)
void setting_data_reset(const rarch_setting_t* settings)
{
const rarch_setting_t *i;
memset(&fake_settings, 0, sizeof(fake_settings));
memset(&fake_extern, 0, sizeof(fake_extern));
for (const rarch_setting_t* i = settings; i->type != ST_NONE; i ++)
for (i = settings; i->type != ST_NONE; i ++)
setting_data_reset_setting(i);
}
bool setting_data_load_config_path(const rarch_setting_t* settings, const char* path)
{
config_file_t* config = config_file_new(path);
config_file_t* config = (config_file_t*)config_file_new(path);
if (config)
{
@ -158,43 +161,47 @@ bool setting_data_load_config_path(const rarch_setting_t* settings, const char*
bool setting_data_load_config(const rarch_setting_t* settings, config_file_t* config)
{
const rarch_setting_t *i;
if (!config)
return false;
for (const rarch_setting_t* i = settings; i->type != ST_NONE; i ++)
for (i = settings; i->type != ST_NONE; i ++)
{
switch (i->type)
{
case ST_BOOL: config_get_bool (config, i->name, i->value.boolean); break;
case ST_PATH: config_get_path (config, i->name, i->value.string, i->size); break;
case ST_STRING: config_get_array (config, i->name, i->value.string, i->size); break;
case ST_BOOL:
config_get_bool (config, i->name, i->value.boolean);
break;
case ST_PATH:
config_get_path (config, i->name, i->value.string, i->size);
break;
case ST_STRING:
config_get_array (config, i->name, i->value.string, i->size);
break;
case ST_INT:
config_get_int(config, i->name, i->value.integer);
ENFORCE_RANGE(i, integer);
break;
case ST_UINT:
config_get_uint(config, i->name, i->value.unsigned_integer);
ENFORCE_RANGE(i, unsigned_integer);
break;
case ST_FLOAT:
config_get_float(config, i->name, i->value.fraction);
ENFORCE_RANGE(i, fraction);
break;
case ST_BIND:
{
const char *prefix = (const char *)get_input_config_prefix(i);
input_config_parse_key (config, prefix, i->name, i->value.keybind);
input_config_parse_joy_button(config, prefix, i->name, i->value.keybind);
input_config_parse_joy_axis (config, prefix, i->name, i->value.keybind);
break;
}
case ST_HEX: break;
default: break;
break;
case ST_HEX:
break;
default:
break;
}
}
@ -218,10 +225,11 @@ bool setting_data_save_config_path(const rarch_setting_t* settings, const char*
bool setting_data_save_config(const rarch_setting_t* settings, config_file_t* config)
{
const rarch_setting_t *i;
if (!config)
return false;
for (const rarch_setting_t* i = settings; i->type != ST_NONE; i ++)
for (i = settings; i->type != ST_NONE; i ++)
{
switch (i->type)
{
@ -247,7 +255,10 @@ bool setting_data_save_config(const rarch_setting_t* settings, config_file_t* co
config_set_float(config, i->name, *i->value.fraction);
break;
case ST_BIND:
//FIXME: make portable
#ifdef APPLE
config_set_string(config, get_input_config_key(i, 0 ), get_key_name(i));
#endif
config_set_string(config, get_input_config_key(i, "btn" ), get_button_name(i));
config_set_string(config, get_input_config_key(i, "axis"), get_axis_name(i));
break;
@ -263,10 +274,11 @@ bool setting_data_save_config(const rarch_setting_t* settings, config_file_t* co
const rarch_setting_t* setting_data_find_setting(const rarch_setting_t* settings, const char* name)
{
const rarch_setting_t *i;
if (!name)
return 0;
for (const rarch_setting_t* i = settings; i->type != ST_NONE; i ++)
for (i = settings; i->type != ST_NONE; i ++)
if (i->type <= ST_GROUP && strcmp(i->name, name) == 0)
return i;
@ -333,7 +345,9 @@ const char* setting_data_get_string_representation(const rarch_setting_t* settin
strlcpy(buffer, setting->value.string, length);
break;
case ST_BIND:
#ifdef APPLE
snprintf(buffer, length, "[KB:%s] [JS:%s] [AX:%s]", get_key_name(setting), get_button_name(setting), get_axis_name(setting));
#endif
break;
default:
return "";
@ -349,7 +363,7 @@ rarch_setting_t setting_data_group_setting(enum setting_type type, const char* n
}
#define DEFINE_BASIC_SETTING_TYPE(TAG, TYPE, VALUE, SETTING_TYPE) \
rarch_setting_t setting_data_##TAG##_setting(const char* name, const char* description, TYPE* target, TYPE default_value) \
rarch_setting_t setting_data_##TAG##_setting(const char* name, const char* description, TYPE* target, TYPE default_value) \
{ \
rarch_setting_t result = { SETTING_TYPE, name, sizeof(TYPE), description }; \
result.value.VALUE = target; \
@ -357,10 +371,10 @@ rarch_setting_t setting_data_##TAG##_setting(const char* name, const char* descr
return result; \
}
DEFINE_BASIC_SETTING_TYPE(bool, bool, boolean, ST_BOOL)
DEFINE_BASIC_SETTING_TYPE(int, int, integer, ST_INT)
DEFINE_BASIC_SETTING_TYPE(uint, unsigned int, unsigned_integer, ST_UINT)
DEFINE_BASIC_SETTING_TYPE(float, float, fraction, ST_FLOAT)
DEFINE_BASIC_SETTING_TYPE(bool, bool, boolean, ST_BOOL)
DEFINE_BASIC_SETTING_TYPE(int, int, integer, ST_INT)
DEFINE_BASIC_SETTING_TYPE(uint, unsigned int, unsigned_integer, ST_UINT)
DEFINE_BASIC_SETTING_TYPE(float, float, fraction, ST_FLOAT)
rarch_setting_t setting_data_string_setting(enum setting_type type,
const char* name, const char* description, char* target,
@ -388,7 +402,9 @@ rarch_setting_t setting_data_bind_setting(const char* name,
static const uint32_t features = SD_FEATURE_SHADERS;
#elif defined(OSX)
static const uint32_t features = SD_FEATURE_VIDEO_MODE | SD_FEATURE_SHADERS |
SD_FEATURE_VSYNC | SD_FEATURE_AUDIO_DEVICE;
SD_FEATURE_VSYNC | SD_FEATURE_AUDIO_DEVICE;
#else
static const uint32_t features = SD_FEATURE_VSYNC;
#endif
#define g_settings fake_settings
@ -415,18 +431,38 @@ static const uint32_t features = SD_FEATURE_VIDEO_MODE | SD_FEATURE_SHADERS |
#define WITH_RANGE(MIN, MAX) \
(list[index - 1]).min = MIN; \
(list[index - 1]).max = MAX; \
WITH_FLAGS(SD_FLAG_HAS_RANGE)
(list[index - 1]).max = MAX; \
WITH_FLAGS(SD_FLAG_HAS_RANGE)
#define WITH_VALUES(VALUES) (list[index -1]).values = VALUES;
const rarch_setting_t* setting_data_get_list(void)
{
static rarch_setting_t list[512] = { 0 };
int i, player, index;
static rarch_setting_t list[512];
static bool initialized = false;
if (!initialized)
{
for (i = 0; i < 512; i++)
{
list[i].type = ST_NONE;
list[i].name = NULL;
list[i].size = 0;
list[i].short_description = NULL;
list[i].index = 0;
list[i].min = 0;
list[i].max = 0;
list[i].values = NULL;
list[i].flags = 0;
}
initialized = true;
}
if (list[0].type == ST_NONE)
{
unsigned index = 0;
index = 0;
/***********/
/* DRIVERS */
@ -434,7 +470,9 @@ const rarch_setting_t* setting_data_get_list(void)
WITH_FEATURE(SD_FEATURE_MULTI_DRIVER) START_GROUP("Drivers")
START_SUB_GROUP("Drivers")
CONFIG_STRING(g_settings.video.driver, "video_driver", "Video Driver", config_get_default_video())
#ifdef HAVE_OPENGL
CONFIG_STRING(g_settings.video.gl_context, "video_gl_context", "OpenGL Driver", "")
#endif
CONFIG_STRING(g_settings.audio.driver, "audio_driver", "Audio Driver", config_get_default_audio())
CONFIG_STRING(g_settings.input.driver, "input_driver", "Input Driver", config_get_default_input())
CONFIG_STRING(g_settings.input.joypad_driver, "input_joypad_driver", "Joypad Driver", "")
@ -642,17 +680,17 @@ const rarch_setting_t* setting_data_get_list(void)
#ifdef ANDROID
START_SUB_GROUP("Android")
CONFIG_INT(g_settings.input.back_behavior, "input_back_behavior", "Back Behavior", BACK_BUTTON_QUIT)
CONFIG_INT(g_settings.input.icade_profile[0], "input_autodetect_icade_profile_pad1", "iCade 1", DEFAULT_ME_YO)
CONFIG_INT(g_settings.input.icade_profile[1], "input_autodetect_icade_profile_pad2", "iCade 2", DEFAULT_ME_YO)
CONFIG_INT(g_settings.input.icade_profile[2], "input_autodetect_icade_profile_pad3", "iCade 3", DEFAULT_ME_YO)
CONFIG_INT(g_settings.input.icade_profile[3], "input_autodetect_icade_profile_pad4", "iCade 4", DEFAULT_ME_YO)
CONFIG_UINT(g_settings.input.back_behavior, "input_back_behavior", "Back Behavior", BACK_BUTTON_QUIT)
CONFIG_UINT(g_settings.input.icade_profile[0], "input_autodetect_icade_profile_pad1", "iCade 1", DEFAULT_ME_YO)
CONFIG_UINT(g_settings.input.icade_profile[1], "input_autodetect_icade_profile_pad2", "iCade 2", DEFAULT_ME_YO)
CONFIG_UINT(g_settings.input.icade_profile[2], "input_autodetect_icade_profile_pad3", "iCade 3", DEFAULT_ME_YO)
CONFIG_UINT(g_settings.input.icade_profile[3], "input_autodetect_icade_profile_pad4", "iCade 4", DEFAULT_ME_YO)
END_SUB_GROUP()
#endif
// The second argument to config bind is 1 based for players and 0 only for meta keys
START_SUB_GROUP("Meta Keys")
for (int i = 0; i != RARCH_BIND_LIST_END; i ++)
for (i = 0; i != RARCH_BIND_LIST_END; i ++)
if (input_config_bind_map[i].meta)
{
const struct input_bind_map* bind = &input_config_bind_map[i];
@ -660,19 +698,21 @@ const rarch_setting_t* setting_data_get_list(void)
}
END_SUB_GROUP()
for (int player = 0; player < MAX_PLAYERS; player ++)
for (player = 0; player < MAX_PLAYERS; player ++)
{
const struct retro_keybind* const defaults = (player == 0) ? retro_keybinds_1 : retro_keybinds_rest;
char buffer[32];
snprintf(buffer, 32, "Player %d", player + 1);
START_SUB_GROUP(strdup(buffer))
for (int i = 0; i != RARCH_BIND_LIST_END; i ++)
for (i = 0; i != RARCH_BIND_LIST_END; i ++)
{
if (!input_config_bind_map[i].meta)
{
const struct input_bind_map* bind = &input_config_bind_map[i];
CONFIG_BIND(g_settings.input.binds[player][i], player + 1, bind->base, bind->desc, &defaults[i])
}
}
END_SUB_GROUP()
}
END_GROUP()

11
apple/common/setting_data.h → settings_data.h
View File

@ -13,10 +13,10 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __APPLE_RARCH_SETTING_DATA_H__
#define __APPLE_RARCH_SETTING_DATA_H__
#ifndef __RARCH_SETTINGS_DATA_H__
#define __RARCH_SETTINGS_DATA_H__
#include "../../general.h"
#include "general.h"
enum setting_type
{
@ -125,7 +125,8 @@ rarch_setting_t setting_data_bind_setting(const char* name, const char* descript
void setting_data_load_current(void);
const rarch_setting_t* setting_data_get_list(void);
// Keyboard
#include "../../input/apple_keycode.h"
#ifdef APPLE
#include "input/apple_keycode.h"
#endif
#endif