ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move linefeed enable enums to input_keyboard.c

This commit is contained in:
twinaphex 2016-03-23 06:18:09 +01:00
parent 92d2765157
commit 2fee5edba4
5 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
input/input_driver.c
View File

@ -17,7 +17,7 @@
#include <string.h> #include <string.h>
#include "input_driver.h" #include "input_driver.h"
#include "input_keyboard.h"
#include "input_remapping.h" #include "input_remapping.h"
#include "../retroarch.h" #include "../retroarch.h"
@ -639,7 +639,6 @@ bool input_driver_ctl(enum rarch_input_ctl_state state, void *data)
static bool input_driver_block_hotkey = false; static bool input_driver_block_hotkey = false;
static bool input_driver_block_libretro_input = false; static bool input_driver_block_libretro_input = false;
static bool input_driver_osk_enabled = false; static bool input_driver_osk_enabled = false;
static bool input_driver_keyboard_linefeed_enable = false;
static bool input_driver_nonblock_state = false; static bool input_driver_nonblock_state = false;
static bool input_driver_flushing_input = false; static bool input_driver_flushing_input = false;
static bool input_driver_data_own = false; static bool input_driver_data_own = false;
@ -677,9 +676,9 @@ bool input_driver_ctl(enum rarch_input_ctl_state state, void *data)
current_input_data = NULL; current_input_data = NULL;
break; break;
case RARCH_INPUT_CTL_DESTROY: case RARCH_INPUT_CTL_DESTROY:
input_keyboard_ctl(RARCH_INPUT_KEYBOARD_CTL_DESTROY, NULL);
input_driver_block_hotkey = false; input_driver_block_hotkey = false;
input_driver_block_libretro_input = false; input_driver_block_libretro_input = false;
input_driver_keyboard_linefeed_enable = false;
input_driver_nonblock_state = false; input_driver_nonblock_state = false;
input_driver_flushing_input = false; input_driver_flushing_input = false;
input_driver_data_own = false; input_driver_data_own = false;
@ -778,14 +777,6 @@ bool input_driver_ctl(enum rarch_input_ctl_state state, void *data)
break; break;
case RARCH_INPUT_CTL_IS_OSK_ENABLED: case RARCH_INPUT_CTL_IS_OSK_ENABLED:
return input_driver_osk_enabled; return input_driver_osk_enabled;
case RARCH_INPUT_CTL_SET_KEYBOARD_LINEFEED_ENABLED:
input_driver_keyboard_linefeed_enable = true;
break;
case RARCH_INPUT_CTL_UNSET_KEYBOARD_LINEFEED_ENABLED:
input_driver_keyboard_linefeed_enable = false;
break;
case RARCH_INPUT_CTL_IS_KEYBOARD_LINEFEED_ENABLED:
return input_driver_keyboard_linefeed_enable;
case RARCH_INPUT_CTL_COMMAND_INIT: case RARCH_INPUT_CTL_COMMAND_INIT:
#ifdef HAVE_COMMAND #ifdef HAVE_COMMAND
if (!settings->stdin_cmd_enable && !settings->network_cmd_enable) if (!settings->stdin_cmd_enable && !settings->network_cmd_enable)

3
input/input_driver.h
View File

@ -75,9 +75,6 @@ enum rarch_input_ctl_state
RARCH_INPUT_CTL_SET_OSK_ENABLED, RARCH_INPUT_CTL_SET_OSK_ENABLED,
RARCH_INPUT_CTL_UNSET_OSK_ENABLED, RARCH_INPUT_CTL_UNSET_OSK_ENABLED,
RARCH_INPUT_CTL_IS_OSK_ENABLED, RARCH_INPUT_CTL_IS_OSK_ENABLED,
RARCH_INPUT_CTL_SET_KEYBOARD_LINEFEED_ENABLED,
RARCH_INPUT_CTL_UNSET_KEYBOARD_LINEFEED_ENABLED,
RARCH_INPUT_CTL_IS_KEYBOARD_LINEFEED_ENABLED,
RARCH_INPUT_CTL_COMMAND_INIT, RARCH_INPUT_CTL_COMMAND_INIT,
RARCH_INPUT_CTL_COMMAND_DEINIT, RARCH_INPUT_CTL_COMMAND_DEINIT,
RARCH_INPUT_CTL_REMOTE_INIT, RARCH_INPUT_CTL_REMOTE_INIT,

17
input/input_keyboard.c
View File

@ -52,9 +52,9 @@ static void input_keyboard_line_toggle_osk(bool enable)
return; return;
if (enable) if (enable)
input_driver_ctl(RARCH_INPUT_CTL_SET_KEYBOARD_LINEFEED_ENABLED, NULL); input_driver_ctl(RARCH_INPUT_KEYBOARD_CTL_SET_LINEFEED_ENABLED, NULL);
else else
input_driver_ctl(RARCH_INPUT_CTL_UNSET_KEYBOARD_LINEFEED_ENABLED, NULL); input_driver_ctl(RARCH_INPUT_KEYBOARD_CTL_UNSET_LINEFEED_ENABLED, NULL);
} }
/** /**
@ -298,8 +298,21 @@ void input_keyboard_event(bool down, unsigned code,
bool input_keyboard_ctl(enum rarch_input_keyboard_ctl_state state, void *data) bool input_keyboard_ctl(enum rarch_input_keyboard_ctl_state state, void *data)
{ {
static bool input_driver_keyboard_linefeed_enable = false;
switch (state) switch (state)
{ {
case RARCH_INPUT_KEYBOARD_CTL_DESTROY:
input_driver_keyboard_linefeed_enable = false;
break;
case RARCH_INPUT_KEYBOARD_CTL_SET_LINEFEED_ENABLED:
input_driver_keyboard_linefeed_enable = true;
break;
case RARCH_INPUT_KEYBOARD_CTL_UNSET_LINEFEED_ENABLED:
input_driver_keyboard_linefeed_enable = false;
break;
case RARCH_INPUT_KEYBOARD_CTL_IS_LINEFEED_ENABLED:
return input_driver_keyboard_linefeed_enable;
case RARCH_INPUT_KEYBOARD_CTL_NONE: case RARCH_INPUT_KEYBOARD_CTL_NONE:
default: default:
break; break;

6
input/input_keyboard.h
View File

@ -29,7 +29,11 @@ extern "C" {
enum rarch_input_keyboard_ctl_state enum rarch_input_keyboard_ctl_state
{ {
RARCH_INPUT_KEYBOARD_CTL_NONE = 0 RARCH_INPUT_KEYBOARD_CTL_NONE = 0,
RARCH_INPUT_KEYBOARD_CTL_DESTROY,
RARCH_INPUT_KEYBOARD_CTL_SET_LINEFEED_ENABLED,
RARCH_INPUT_KEYBOARD_CTL_UNSET_LINEFEED_ENABLED,
RARCH_INPUT_KEYBOARD_CTL_IS_LINEFEED_ENABLED,
}; };
/* Keyboard line reader. Handles textual input in a direct fashion. */ /* Keyboard line reader. Handles textual input in a direct fashion. */

20
runloop.c
View File

@ -688,13 +688,13 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
if (runloop_cmd_triggered(cmd, RARCH_OSK)) if (runloop_cmd_triggered(cmd, RARCH_OSK))
{ {
if (input_driver_ctl( if (input_keyboard_ctl(
RARCH_INPUT_CTL_IS_KEYBOARD_LINEFEED_ENABLED, NULL)) RARCH_INPUT_KEYBOARD_CTL_IS_LINEFEED_ENABLED, NULL))
input_driver_ctl( input_keyboard_ctl(
RARCH_INPUT_CTL_UNSET_KEYBOARD_LINEFEED_ENABLED, NULL); RARCH_INPUT_KEYBOARD_CTL_UNSET_LINEFEED_ENABLED, NULL);
else else
input_driver_ctl( input_keyboard_ctl(
RARCH_INPUT_CTL_SET_KEYBOARD_LINEFEED_ENABLED, NULL); RARCH_INPUT_KEYBOARD_CTL_SET_LINEFEED_ENABLED, NULL);
} }
if (runloop_cmd_press(cmd, RARCH_VOLUME_UP)) if (runloop_cmd_press(cmd, RARCH_VOLUME_UP))
@ -1191,15 +1191,15 @@ static void runloop_iterate_linefeed_overlay(settings_t *settings)
static char prev_overlay_restore = false; static char prev_overlay_restore = false;
bool osk_enable = input_driver_ctl(RARCH_INPUT_CTL_IS_OSK_ENABLED, NULL); bool osk_enable = input_driver_ctl(RARCH_INPUT_CTL_IS_OSK_ENABLED, NULL);
if (osk_enable && !input_driver_ctl( if (osk_enable && !input_keyboard_ctl(
RARCH_INPUT_CTL_IS_KEYBOARD_LINEFEED_ENABLED, NULL)) RARCH_INPUT_KEYBOARD_CTL_IS_LINEFEED_ENABLED, NULL))
{ {
input_driver_ctl(RARCH_INPUT_CTL_UNSET_OSK_ENABLED, NULL); input_driver_ctl(RARCH_INPUT_CTL_UNSET_OSK_ENABLED, NULL);
prev_overlay_restore = true; prev_overlay_restore = true;
event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL); event_cmd_ctl(EVENT_CMD_OVERLAY_DEINIT, NULL);
} }
else if (!osk_enable && input_driver_ctl( else if (!osk_enable && input_keyboard_ctl(
RARCH_INPUT_CTL_IS_KEYBOARD_LINEFEED_ENABLED, NULL)) RARCH_INPUT_KEYBOARD_CTL_IS_LINEFEED_ENABLED, NULL))
{ {
input_driver_ctl(RARCH_INPUT_CTL_SET_OSK_ENABLED, NULL); input_driver_ctl(RARCH_INPUT_CTL_SET_OSK_ENABLED, NULL);
prev_overlay_restore = false; prev_overlay_restore = false;