mirror of
https://github.com/libretro/RetroArch
synced 2025-02-03 17:54:04 +00:00
add osk enable hotkey
This commit is contained in:
parent
20b6bbc659
commit
2f2a86e97f
@ -196,6 +196,7 @@ static const struct cmd_map map[] = {
|
|||||||
{ "CHEAT_TOGGLE", RARCH_CHEAT_TOGGLE },
|
{ "CHEAT_TOGGLE", RARCH_CHEAT_TOGGLE },
|
||||||
{ "SCREENSHOT", RARCH_SCREENSHOT },
|
{ "SCREENSHOT", RARCH_SCREENSHOT },
|
||||||
{ "MUTE", RARCH_MUTE },
|
{ "MUTE", RARCH_MUTE },
|
||||||
|
{ "OSK", RARCH_OSK },
|
||||||
{ "NETPLAY_FLIP", RARCH_NETPLAY_FLIP },
|
{ "NETPLAY_FLIP", RARCH_NETPLAY_FLIP },
|
||||||
{ "SLOWMOTION", RARCH_SLOWMOTION },
|
{ "SLOWMOTION", RARCH_SLOWMOTION },
|
||||||
{ "VOLUME_UP", RARCH_VOLUME_UP },
|
{ "VOLUME_UP", RARCH_VOLUME_UP },
|
||||||
|
@ -737,6 +737,7 @@ static const struct retro_keybind retro_keybinds_1[] = {
|
|||||||
{ true, RARCH_CHEAT_TOGGLE, RETRO_LBL_CHEAT_TOGGLE, RETROK_u, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_CHEAT_TOGGLE, RETRO_LBL_CHEAT_TOGGLE, RETROK_u, NO_BTN, 0, AXIS_NONE },
|
||||||
{ true, RARCH_SCREENSHOT, RETRO_LBL_SCREENSHOT, RETROK_F8, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_SCREENSHOT, RETRO_LBL_SCREENSHOT, RETROK_F8, NO_BTN, 0, AXIS_NONE },
|
||||||
{ true, RARCH_MUTE, RETRO_LBL_MUTE, RETROK_F9, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_MUTE, RETRO_LBL_MUTE, RETROK_F9, NO_BTN, 0, AXIS_NONE },
|
||||||
|
{ true, RARCH_OSK, RETRO_LBL_OSK, RETROK_F12, NO_BTN, 0, AXIS_NONE },
|
||||||
{ true, RARCH_NETPLAY_FLIP, RETRO_LBL_NETPLAY_FLIP, RETROK_i, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_NETPLAY_FLIP, RETRO_LBL_NETPLAY_FLIP, RETROK_i, NO_BTN, 0, AXIS_NONE },
|
||||||
{ true, RARCH_SLOWMOTION, RETRO_LBL_SLOWMOTION, RETROK_e, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_SLOWMOTION, RETRO_LBL_SLOWMOTION, RETROK_e, NO_BTN, 0, AXIS_NONE },
|
||||||
{ true, RARCH_ENABLE_HOTKEY, RETRO_LBL_ENABLE_HOTKEY, RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
|
{ true, RARCH_ENABLE_HOTKEY, RETRO_LBL_ENABLE_HOTKEY, RETROK_UNKNOWN, NO_BTN, 0, AXIS_NONE },
|
||||||
|
1
driver.h
1
driver.h
@ -113,6 +113,7 @@ enum
|
|||||||
RARCH_CHEAT_TOGGLE,
|
RARCH_CHEAT_TOGGLE,
|
||||||
RARCH_SCREENSHOT,
|
RARCH_SCREENSHOT,
|
||||||
RARCH_MUTE,
|
RARCH_MUTE,
|
||||||
|
RARCH_OSK,
|
||||||
RARCH_NETPLAY_FLIP,
|
RARCH_NETPLAY_FLIP,
|
||||||
RARCH_SLOWMOTION,
|
RARCH_SLOWMOTION,
|
||||||
RARCH_ENABLE_HOTKEY,
|
RARCH_ENABLE_HOTKEY,
|
||||||
|
@ -97,6 +97,7 @@ const struct input_bind_map input_config_bind_map[RARCH_BIND_LIST_END_NULL] = {
|
|||||||
DECLARE_META_BIND(2, cheat_toggle, RARCH_CHEAT_TOGGLE, "Cheat toggle"),
|
DECLARE_META_BIND(2, cheat_toggle, RARCH_CHEAT_TOGGLE, "Cheat toggle"),
|
||||||
DECLARE_META_BIND(2, screenshot, RARCH_SCREENSHOT, "Take screenshot"),
|
DECLARE_META_BIND(2, screenshot, RARCH_SCREENSHOT, "Take screenshot"),
|
||||||
DECLARE_META_BIND(2, audio_mute, RARCH_MUTE, "Audio mute toggle"),
|
DECLARE_META_BIND(2, audio_mute, RARCH_MUTE, "Audio mute toggle"),
|
||||||
|
DECLARE_META_BIND(2, osk_toggle, RARCH_OSK, "On-screen keyboard toggle"),
|
||||||
DECLARE_META_BIND(2, netplay_flip_players, RARCH_NETPLAY_FLIP, "Netplay flip users"),
|
DECLARE_META_BIND(2, netplay_flip_players, RARCH_NETPLAY_FLIP, "Netplay flip users"),
|
||||||
DECLARE_META_BIND(2, slowmotion, RARCH_SLOWMOTION, "Slow motion"),
|
DECLARE_META_BIND(2, slowmotion, RARCH_SLOWMOTION, "Slow motion"),
|
||||||
DECLARE_META_BIND(2, enable_hotkey, RARCH_ENABLE_HOTKEY, "Enable hotkeys"),
|
DECLARE_META_BIND(2, enable_hotkey, RARCH_ENABLE_HOTKEY, "Enable hotkeys"),
|
||||||
|
@ -64,6 +64,7 @@
|
|||||||
#define RETRO_LBL_CHEAT_TOGGLE "Cheat Toggle"
|
#define RETRO_LBL_CHEAT_TOGGLE "Cheat Toggle"
|
||||||
#define RETRO_LBL_SCREENSHOT "Screenshot"
|
#define RETRO_LBL_SCREENSHOT "Screenshot"
|
||||||
#define RETRO_LBL_MUTE "Mute Audio"
|
#define RETRO_LBL_MUTE "Mute Audio"
|
||||||
|
#define RETRO_LBL_OSK "Enable On-Screen Keyboard"
|
||||||
#define RETRO_LBL_NETPLAY_FLIP "Netplay Flip Users"
|
#define RETRO_LBL_NETPLAY_FLIP "Netplay Flip Users"
|
||||||
#define RETRO_LBL_SLOWMOTION "Slowmotion"
|
#define RETRO_LBL_SLOWMOTION "Slowmotion"
|
||||||
#define RETRO_LBL_ENABLE_HOTKEY "Enable Hotkey"
|
#define RETRO_LBL_ENABLE_HOTKEY "Enable Hotkey"
|
||||||
|
@ -229,6 +229,7 @@ typedef struct rarch_cmd_state
|
|||||||
bool quit_key_pressed;
|
bool quit_key_pressed;
|
||||||
bool screenshot_pressed;
|
bool screenshot_pressed;
|
||||||
bool mute_pressed;
|
bool mute_pressed;
|
||||||
|
bool osk_pressed;
|
||||||
bool volume_up_pressed;
|
bool volume_up_pressed;
|
||||||
bool volume_down_pressed;
|
bool volume_down_pressed;
|
||||||
bool reset_pressed;
|
bool reset_pressed;
|
||||||
|
10
runloop.c
10
runloop.c
@ -25,6 +25,7 @@
|
|||||||
#include "retroarch.h"
|
#include "retroarch.h"
|
||||||
#include "runloop.h"
|
#include "runloop.h"
|
||||||
#include "runloop_data.h"
|
#include "runloop_data.h"
|
||||||
|
#include "input/keyboard_line.h"
|
||||||
|
|
||||||
#ifdef HAVE_MENU
|
#ifdef HAVE_MENU
|
||||||
#include "menu/menu.h"
|
#include "menu/menu.h"
|
||||||
@ -528,6 +529,14 @@ static int do_state_checks(rarch_cmd_state_t *cmd)
|
|||||||
if (cmd->mute_pressed)
|
if (cmd->mute_pressed)
|
||||||
rarch_main_command(RARCH_CMD_AUDIO_MUTE_TOGGLE);
|
rarch_main_command(RARCH_CMD_AUDIO_MUTE_TOGGLE);
|
||||||
|
|
||||||
|
if (cmd->osk_pressed)
|
||||||
|
{
|
||||||
|
driver_t *driver = driver_get_ptr();
|
||||||
|
settings_t *settings = config_get_ptr();
|
||||||
|
|
||||||
|
driver->keyboard_linefeed_enable = !driver->keyboard_linefeed_enable;
|
||||||
|
}
|
||||||
|
|
||||||
if (cmd->volume_up_pressed)
|
if (cmd->volume_up_pressed)
|
||||||
rarch_main_command(RARCH_CMD_VOLUME_UP);
|
rarch_main_command(RARCH_CMD_VOLUME_UP);
|
||||||
else if (cmd->volume_down_pressed)
|
else if (cmd->volume_down_pressed)
|
||||||
@ -1023,6 +1032,7 @@ static void rarch_main_cmd_get_state(rarch_cmd_state_t *cmd,
|
|||||||
cmd->quit_key_pressed = BIT64_GET(input, RARCH_QUIT_KEY);
|
cmd->quit_key_pressed = BIT64_GET(input, RARCH_QUIT_KEY);
|
||||||
cmd->screenshot_pressed = BIT64_GET(trigger_input, RARCH_SCREENSHOT);
|
cmd->screenshot_pressed = BIT64_GET(trigger_input, RARCH_SCREENSHOT);
|
||||||
cmd->mute_pressed = BIT64_GET(trigger_input, RARCH_MUTE);
|
cmd->mute_pressed = BIT64_GET(trigger_input, RARCH_MUTE);
|
||||||
|
cmd->osk_pressed = BIT64_GET(trigger_input, RARCH_OSK);
|
||||||
cmd->volume_up_pressed = BIT64_GET(input, RARCH_VOLUME_UP);
|
cmd->volume_up_pressed = BIT64_GET(input, RARCH_VOLUME_UP);
|
||||||
cmd->volume_down_pressed = BIT64_GET(input, RARCH_VOLUME_DOWN);
|
cmd->volume_down_pressed = BIT64_GET(input, RARCH_VOLUME_DOWN);
|
||||||
cmd->reset_pressed = BIT64_GET(trigger_input, RARCH_RESET);
|
cmd->reset_pressed = BIT64_GET(trigger_input, RARCH_RESET);
|
||||||
|
@ -2820,6 +2820,9 @@ int setting_get_description(const char *label, char *msg,
|
|||||||
else if (!strcmp(label, "audio_mute"))
|
else if (!strcmp(label, "audio_mute"))
|
||||||
snprintf(msg, sizeof_msg,
|
snprintf(msg, sizeof_msg,
|
||||||
" -- Mute/unmute audio.");
|
" -- Mute/unmute audio.");
|
||||||
|
else if (!strcmp(label, "osk_enable"))
|
||||||
|
snprintf(msg, sizeof_msg,
|
||||||
|
" -- Enable/disable on-screen keyboard.");
|
||||||
else if (!strcmp(label, "screenshot"))
|
else if (!strcmp(label, "screenshot"))
|
||||||
snprintf(msg, sizeof_msg,
|
snprintf(msg, sizeof_msg,
|
||||||
" -- Take screenshot.");
|
" -- Take screenshot.");
|
||||||
|
Loading…
x
Reference in New Issue
Block a user