Skip to content

Commit 32765d2

Browse files
committed
rg_input: Renamed rg_input_get_key_mapping to rg_input_key_is_present
It seems more descriptive. It returns true if the key is present/exists on the current device.
1 parent d18b73f commit 32765d2

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

components/retro-go/rg_gui.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2039,7 +2039,7 @@ void rg_gui_options_menu(void)
20392039
void rg_gui_about_menu(void)
20402040
{
20412041
const rg_app_t *app = rg_system_get_app();
2042-
bool have_option_btn = rg_input_get_key_mapping(RG_KEY_OPTION);
2042+
bool have_option_btn = rg_input_key_is_present(RG_KEY_OPTION);
20432043

20442044
// TODO: Add indicator whether or not the build is a release, and if it's official (built by me)
20452045
rg_gui_option_t options[20] = {
@@ -2245,7 +2245,7 @@ int rg_gui_savestate_menu(const char *title, const char *rom_path)
22452245
void rg_gui_game_menu(void)
22462246
{
22472247
const char *rom_path = rg_system_get_app()->romPath;
2248-
bool have_option_btn = rg_input_get_key_mapping(RG_KEY_OPTION);
2248+
bool have_option_btn = rg_input_key_is_present(RG_KEY_OPTION);
22492249
const rg_gui_option_t choices[] = {
22502250
{1000, _("Save & Continue"), NULL, RG_DIALOG_FLAG_NORMAL, NULL},
22512251
{2000, _("Save & Quit"), NULL, RG_DIALOG_FLAG_NORMAL, NULL},

components/retro-go/rg_input.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,11 @@ void rg_input_deinit(void)
372372
RG_LOGI("Input terminated.\n");
373373
}
374374

375+
bool rg_input_key_is_present(rg_key_t mask)
376+
{
377+
return (gamepad_mapped & mask) == mask;
378+
}
379+
375380
uint32_t rg_input_read_gamepad(void)
376381
{
377382
#ifdef RG_TARGET_SDL2
@@ -424,10 +429,3 @@ const char *rg_input_get_key_name(rg_key_t key)
424429
default: return "Unknown";
425430
}
426431
}
427-
428-
const char *rg_input_get_key_mapping(rg_key_t key)
429-
{
430-
if ((gamepad_mapped & key) == key)
431-
return "PHYSICAL";
432-
return NULL;
433-
}

components/retro-go/rg_input.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,11 @@ typedef struct
9090

9191
void rg_input_init(void);
9292
void rg_input_deinit(void);
93+
bool rg_input_key_is_present(rg_key_t mask);
9394
bool rg_input_key_is_pressed(rg_key_t mask);
9495
bool rg_input_wait_for_key(rg_key_t mask, bool pressed, int timeout_ms);
95-
const char *rg_input_get_key_name(rg_key_t key);
96-
const char *rg_input_get_key_mapping(rg_key_t key);
9796
uint32_t rg_input_read_gamepad(void);
98-
int rg_input_read_keyboard(void);
9997
rg_battery_t rg_input_read_battery(void);
10098
bool rg_input_read_gamepad_raw(uint32_t *out);
101-
bool rg_input_read_keyboard_raw(int *out);
10299
bool rg_input_read_battery_raw(rg_battery_t *out);
100+
const char *rg_input_get_key_name(rg_key_t key);

0 commit comments

Comments
 (0)