Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-06-02 19:57:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

I forgot a few files.

Browse source
This commit is contained in:
oshaboy 2024-02-03 17:36:44 +02:00
parent 6fdfa1cb70
commit 91613a47b3
3 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
input/drivers/udev_input.c
View file

@ -3579,6 +3579,7 @@ static void udev_input_handle_hotplug(udev_input_t *udev)
for (i = 0; i < MAX_USERS; i++)
{
input_config_set_mouse_display_name(i, "N/A");
input_config_set_sensor_display_name(i, "N/A");
udev->pointers[i] = -1;
udev->keyboards[i] = -1;
}
@ -3588,7 +3589,9 @@ static void udev_input_handle_hotplug(udev_input_t *udev)
{
udev_input_device_t * cur_device=udev->devices[i];
do {
if (cur_device->type == UDEV_INPUT_SENSOR);
if (cur_device->type == UDEV_INPUT_SENSOR){
input_config_set_sensor_display_name(mouse, cur_device->ident);
}
else if (cur_device->type != UDEV_INPUT_KEYBOARD)
{
/* Pointers */
@ -4330,6 +4333,7 @@ static void *udev_input_init(const char *joypad_driver)
RARCH_LOG("[udev]: Sensor: \"%s\" %s.\n",
curdevice->ident,
curdevice->devnode);
input_config_set_sensor_display_name(mouse, curdevice->ident);
}
else if (curdevice->type != UDEV_INPUT_KEYBOARD)
{

22
input/input_driver.c
View file

@ -4239,7 +4239,13 @@ const char *input_config_get_mouse_display_name(unsigned port)
return NULL;
return input_st->input_mouse_info[port].display_name;
}
const char *input_config_get_sensor_display_name(unsigned port)
{
input_driver_state_t *input_st = &input_driver_st;
if (string_is_empty(input_st->input_sensor_info[port].display_name))
return NULL;
return input_st->input_sensor_info[port].display_name;
}
void input_config_set_mouse_display_name(unsigned port, const char *name)
{
char name_ascii[NAME_MAX_LENGTH];
@ -4255,7 +4261,21 @@ void input_config_set_mouse_display_name(unsigned port, const char *name)
strlcpy(input_st->input_mouse_info[port].display_name, name_ascii,
sizeof(input_st->input_mouse_info[port].display_name));
}
void input_config_set_sensor_display_name(unsigned port, const char *name)
{
char name_ascii[NAME_MAX_LENGTH];
input_driver_state_t *input_st = &input_driver_st;
name_ascii[0] = '\0';
/* Strip non-ASCII characters */
if (!string_is_empty(name))
string_copy_only_ascii(name_ascii, name);
if (!string_is_empty(name_ascii))
strlcpy(input_st->input_sensor_info[port].display_name, name_ascii,
sizeof(input_st->input_sensor_info[port].display_name));
}
void input_keyboard_mapping_bits(unsigned mode, unsigned key)
{
input_driver_state_t *input_st = &input_driver_st;

5
input/input_driver.h
View file

@ -282,7 +282,7 @@ typedef struct
{
char display_name[256];
} input_mouse_info_t;
typedef input_mouse_info_t input_sensor_info_t;
typedef struct input_remote input_remote_t;
typedef struct input_remote_state
@ -540,6 +540,7 @@ typedef struct
input_mapper_t mapper; /* uint32_t alignment */
input_device_info_t input_device_info[MAX_INPUT_DEVICES]; /* unsigned alignment */
input_mouse_info_t input_mouse_info[MAX_INPUT_DEVICES];
input_sensor_info_t input_sensor_info[MAX_INPUT_DEVICES];
unsigned old_analog_dpad_mode[MAX_USERS];
unsigned old_libretro_device[MAX_USERS];
unsigned osk_last_codepoint;
@ -743,6 +744,7 @@ void input_config_set_device_name(unsigned port, const char *name);
*/
void input_config_set_device_display_name(unsigned port, const char *name);
void input_config_set_mouse_display_name(unsigned port, const char *name);
void input_config_set_sensor_display_name(unsigned port, const char *name);
/**
* Set the configuration name for the device in the specified port
@ -830,6 +832,7 @@ unsigned input_config_get_device(unsigned port);
const char *input_config_get_device_name(unsigned port);
const char *input_config_get_device_display_name(unsigned port);
const char *input_config_get_mouse_display_name(unsigned port);
const char *input_config_get_sensor_display_name(unsigned port);
const char *input_config_get_device_config_name(unsigned port);
const char *input_config_get_device_joypad_driver(unsigned port);