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

Make device name show up in RGUI.

Browse Source
This commit is contained in:
Themaister 2013-04-26 00:22:12 +02:00
parent 9a96e6a8f3
commit 66a1c01419
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/menu/rgui.c
View File

@ -570,8 +570,11 @@ static void render_text(rgui_handle_t *rgui)
strlcpy(type_str, "...", sizeof(type_str)); strlcpy(type_str, "...", sizeof(type_str));
break; break;
case RGUI_SETTINGS_BIND_DEVICE: case RGUI_SETTINGS_BIND_DEVICE:
strlcpy(type_str, g_settings.input.device_names[port], sizeof(type_str)); {
int map = g_settings.input.joypad_map[port];
strlcpy(type_str, g_settings.input.device_names[map], sizeof(type_str));
break; break;
}
case RGUI_SETTINGS_BIND_DPAD_EMULATION: case RGUI_SETTINGS_BIND_DPAD_EMULATION:
switch (g_settings.input.dpad_emulation[port]) switch (g_settings.input.dpad_emulation[port])
{ {

10
input/linuxraw_joypad.c
View File

@ -35,7 +35,7 @@ struct linuxraw_joypad
bool buttons[NUM_BUTTONS]; bool buttons[NUM_BUTTONS];
int16_t axes[NUM_AXES]; int16_t axes[NUM_AXES];
char ident[256]; char *ident;
}; };
static struct linuxraw_joypad g_pads[MAX_PLAYERS]; static struct linuxraw_joypad g_pads[MAX_PLAYERS];
@ -79,7 +79,7 @@ static void linuxraw_joypad_init_pad(const char *path, struct linuxraw_joypad *p
*pad->ident = '\0'; *pad->ident = '\0';
if (pad->fd >= 0) if (pad->fd >= 0)
{ {
if (ioctl(pad->fd, JSIOCGNAME(sizeof(pad->ident)), pad->ident) >= 0) if (ioctl(pad->fd, JSIOCGNAME(sizeof(g_settings.input.device_names[0])), pad->ident) >= 0)
RARCH_LOG("[Joypad]: Found pad: %s on %s.\n", pad->ident, path); RARCH_LOG("[Joypad]: Found pad: %s on %s.\n", pad->ident, path);
else else
RARCH_ERR("[Joypad]: Didn't find ident of %s.\n", path); RARCH_ERR("[Joypad]: Didn't find ident of %s.\n", path);
@ -122,8 +122,10 @@ static void handle_plugged_pad(void)
{ {
RARCH_LOG("[Joypad]: Joypad %s disconnected.\n", g_pads[index].ident); RARCH_LOG("[Joypad]: Joypad %s disconnected.\n", g_pads[index].ident);
close(g_pads[index].fd); close(g_pads[index].fd);
memset(&g_pads[index], 0, sizeof(g_pads[index])); memset(g_pads[index].buttons, 0, sizeof(g_pads[index].buttons));
memset(g_pads[index].axes, 0, sizeof(g_pads[index].axes));
g_pads[index].fd = -1; g_pads[index].fd = -1;
*g_pads[index].ident = '\0';
} }
} }
// Sometimes, device will be created before acess to it is established. // Sometimes, device will be created before acess to it is established.
@ -174,6 +176,7 @@ static bool linuxraw_joypad_init(void)
{ {
struct linuxraw_joypad *pad = &g_pads[i]; struct linuxraw_joypad *pad = &g_pads[i];
pad->fd = -1; pad->fd = -1;
pad->ident = g_settings.input.device_names[i];
char path[PATH_MAX]; char path[PATH_MAX];
snprintf(path, sizeof(path), "/dev/input/js%u", i); snprintf(path, sizeof(path), "/dev/input/js%u", i);
@ -181,6 +184,7 @@ static bool linuxraw_joypad_init(void)
linuxraw_joypad_init_pad(path, pad); linuxraw_joypad_init_pad(path, pad);
if (pad->fd >= 0) if (pad->fd >= 0)
poll_pad(pad); poll_pad(pad);
} }
g_notify = inotify_init(); g_notify = inotify_init();