mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-04 16:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2644 from diablodiab/master

Browse Source 
Extends Android keyboard functionality to allow for more than one keyboard
This commit is contained in:
Twinaphex 2016-01-15 09:37:51 +01:00
commit e2942f2de1
1 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
input/drivers/android_input.c
View File

@ -39,6 +39,7 @@
#endif #endif
#define MAX_TOUCH 16 #define MAX_TOUCH 16
#define MAX_NUM_KEYBOARDS 3
typedef struct typedef struct
{ {
@ -53,9 +54,10 @@ struct input_pointer
int16_t full_x, full_y; int16_t full_x, full_y;
}; };
static int id_1 = -1; static int pad_id1 = -1;
static int id_2 = -1; static int pad_id2 = -1;
static int id_3 = -1; static int kbd_id[MAX_NUM_KEYBOARDS];
static int kbd_num = 0;
enum enum
{ {
@ -450,8 +452,8 @@ static bool android_input_init_handle(void)
RARCH_LOG("Set engine_handle_dpad to 'Get Axis Value' (for reading extra analog sticks)"); RARCH_LOG("Set engine_handle_dpad to 'Get Axis Value' (for reading extra analog sticks)");
engine_handle_dpad = engine_handle_dpad_getaxisvalue; engine_handle_dpad = engine_handle_dpad_getaxisvalue;
} }
id_1 = -1; pad_id1 = -1;
id_2 = -1; pad_id2 = -1;
return true; return true;
} }
@ -549,6 +551,14 @@ static INLINE int android_input_poll_event_type_motion(
return 0; return 0;
} }
bool is_keyboard_id(int id)
{
for(int i=0; i<kbd_num; i++)
if (id == kbd_id[i]) return true;
return false;
}
static INLINE void android_input_poll_event_type_keyboard( static INLINE void android_input_poll_event_type_keyboard(
AInputEvent *event, int keycode, int *handled) AInputEvent *event, int keycode, int *handled)
{ {
@ -677,13 +687,13 @@ static void handle_hotplug(android_input_data_t *android_data,
RARCH_LOG("Special Device Detected: %s\n", device_model); RARCH_LOG("Special Device Detected: %s\n", device_model);
{ {
#if 0 #if 0
RARCH_LOG("- Pads Mapped: %d\n- Device Name: %s\n- IDS: %d, %d, %d", android_data->pads_connected, device_name, id, id_1, id_2); RARCH_LOG("- Pads Mapped: %d\n- Device Name: %s\n- IDS: %d, %d, %d", android_data->pads_connected, device_name, id, pad_id1, pad_id2);
#endif #endif
/* remove the remote if it is mapped */ /* remove the remote if it is mapped */
if (strstr(android_data->pad_states[0].name,"SHIELD Remote")) if (strstr(android_data->pad_states[0].name,"SHIELD Remote"))
{ {
id_1 = -1; pad_id1 = -1;
id_2 = -1; pad_id2 = -1;
android_data->pads_connected = 0; android_data->pads_connected = 0;
*port = 0; *port = 0;
strlcpy(name_buf, device_name, sizeof(name_buf)); strlcpy(name_buf, device_name, sizeof(name_buf));
@ -696,10 +706,10 @@ static void handle_hotplug(android_input_data_t *android_data,
* store the id for later use * store the id for later use
*/ */
if (strstr(device_name, "NVIDIA Corporation NVIDIA Controller v01.03") && android_data->pads_connected==0) if (strstr(device_name, "NVIDIA Corporation NVIDIA Controller v01.03") && android_data->pads_connected==0)
id_1 = id; pad_id1 = id;
else if (strstr(device_name, "Virtual") && id_1 != -1) else if (strstr(device_name, "Virtual") && pad_id1 != -1)
{ {
id = id_1; id = pad_id1;
return; return;
} }
@ -718,12 +728,12 @@ static void handle_hotplug(android_input_data_t *android_data,
/* only use the hack if the device is one of the built-in devices */ /* only use the hack if the device is one of the built-in devices */
RARCH_LOG("Special Device Detected: %s\n", device_model); RARCH_LOG("Special Device Detected: %s\n", device_model);
{ {
if ( id_1 < 0 ) if ( pad_id1 < 0 )
id_1 = id; pad_id1 = id;
else else
id_2 = id; pad_id2 = id;
if ( id_2 > 0) if ( pad_id2 > 0)
return; return;
strlcpy (name_buf, "NVIDIA SHIELD Portable", sizeof(name_buf)); strlcpy (name_buf, "NVIDIA SHIELD Portable", sizeof(name_buf));
@ -741,12 +751,12 @@ static void handle_hotplug(android_input_data_t *android_data,
/* only use the hack if the device is one of the built-in devices */ /* only use the hack if the device is one of the built-in devices */
RARCH_LOG("Special Device Detected: %s\n", device_model); RARCH_LOG("Special Device Detected: %s\n", device_model);
{ {
if ( id_1 < 0 ) if ( pad_id1 < 0 )
id_1 = id; pad_id1 = id;
else else
id_2 = id; pad_id2 = id;
if ( id_2 > 0) if ( pad_id2 > 0)
return; return;
strlcpy (name_buf, "GPD XD", sizeof(name_buf)); strlcpy (name_buf, "GPD XD", sizeof(name_buf));
@ -764,12 +774,12 @@ static void handle_hotplug(android_input_data_t *android_data,
/* only use the hack if the device is one of the built-in devices */ /* only use the hack if the device is one of the built-in devices */
RARCH_LOG("Special Device Detected: %s\n", device_model); RARCH_LOG("Special Device Detected: %s\n", device_model);
{ {
if ( id_1 < 0 ) if ( pad_id1 < 0 )
id_1 = id; pad_id1 = id;
else else
id_2 = id; pad_id2 = id;
if ( id_2 > 0) if ( pad_id2 > 0)
return; return;
strlcpy (name_buf, "XPERIA Play", sizeof(name_buf)); strlcpy (name_buf, "XPERIA Play", sizeof(name_buf));
@ -787,12 +797,12 @@ static void handle_hotplug(android_input_data_t *android_data,
/* only use the hack if the device is one of the built-in devices */ /* only use the hack if the device is one of the built-in devices */
RARCH_LOG("ARCHOS GAMEPAD Detected: %s\n", device_model); RARCH_LOG("ARCHOS GAMEPAD Detected: %s\n", device_model);
{ {
if ( id_1 < 0 ) if ( pad_id1 < 0 )
id_1 = id; pad_id1 = id;
else else
id_2 = id; pad_id2 = id;
if ( id_2 > 0) if ( pad_id2 > 0)
return; return;
strlcpy (name_buf, "ARCHOS GamePad", sizeof(name_buf)); strlcpy (name_buf, "ARCHOS GamePad", sizeof(name_buf));
@ -846,17 +856,17 @@ static void handle_hotplug(android_input_data_t *android_data,
strlcpy(name_buf, "Moga IME", sizeof(name_buf)); strlcpy(name_buf, "Moga IME", sizeof(name_buf));
// if device is keyboard only and didn't match any of the devices above // if device is keyboard only and didn't match any of the devices above
// then assume it is a keyboard, register the id, and return unless another // then assume it is a keyboard, register the id, and return unless the
// keyboard is already registered // maximum number of keyboards are already registered
else if(source == AINPUT_SOURCE_KEYBOARD && id_3 == -1) else if(source == AINPUT_SOURCE_KEYBOARD && kbd_num < MAX_NUM_KEYBOARDS)
{ {
id_3 = id; kbd_id[kbd_num] = id;
kbd_num++;
return; return;
} }
// if device was not keyboard only, yet did not match any of the devices // if device was not keyboard only, yet did not match any of the devices
// above or another keyboard was already mapped, then try to autoconfigure // then try to autoconfigure as gamepad based on device_name
// as gamepad based on device_name
else if (!string_is_empty(device_name)) else if (!string_is_empty(device_name))
strlcpy(name_buf, device_name, sizeof(name_buf)); strlcpy(name_buf, device_name, sizeof(name_buf));
@ -915,8 +925,8 @@ static int android_input_get_id(AInputEvent *event)
{ {
int id = AInputEvent_getDeviceId(event); int id = AInputEvent_getDeviceId(event);
if (id == id_2) if (id == pad_id2)
id = id_1; id = pad_id1;
return id; return id;
} }
@ -940,7 +950,7 @@ static void android_input_poll_input(void *data)
int id = android_input_get_id(event); int id = android_input_get_id(event);
int port = android_input_get_id_port(android_data, id, source); int port = android_input_get_id_port(android_data, id, source);
if (port < 0 && id != id_3) if (port < 0 && !is_keyboard_id(id))
handle_hotplug(android_data, android_app, handle_hotplug(android_data, android_app,
&port, id, source); &port, id, source);
@ -955,8 +965,10 @@ static void android_input_poll_input(void *data)
{ {
int keycode = AKeyEvent_getKeyCode(event); int keycode = AKeyEvent_getKeyCode(event);
if (id == id_3 && !predispatched) if (is_keyboard_id(id))
android_input_poll_event_type_keyboard(event, keycode, &handled); {
if (!predispatched) android_input_poll_event_type_keyboard(event, keycode, &handled);
}
else else
android_input_poll_event_type_key(android_app, android_input_poll_event_type_key(android_app,
event, port, keycode, source, type_event, &handled); event, port, keycode, source, type_event, &handled);