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

Allow udev input to be used with X11 context

Browse Source
This commit is contained in:
Zoran Vuckovic 2017-06-02 01:08:28 +02:00
parent a4358deb0d
commit 2056ebc803
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gfx/drivers_context/x_ctx.c
View File

@ -36,6 +36,9 @@
#endif #endif
#include <string/stdstring.h>
#include "../../configuration.h"
#include "../../frontend/frontend_driver.h" #include "../../frontend/frontend_driver.h"
#include "../common/gl_common.h" #include "../common/gl_common.h"
#include "../common/x11_common.h" #include "../common/x11_common.h"
@ -900,8 +903,21 @@ static void gfx_ctx_x_input_driver(void *data,
const char *joypad_name, const char *joypad_name,
const input_driver_t **input, void **input_data) const input_driver_t **input, void **input_data)
{ {
void *xinput = input_x.init(joypad_name); #ifdef HAVE_UDEV
settings_t *settings = config_get_ptr();
if (string_is_equal_fast(settings->arrays.input_driver, "udev", 5))
{
*input_data = input_udev.init(joypad_name);
if (*input_data)
{
*input = &input_udev;
return;
}
}
#endif
void *xinput = input_x.init(joypad_name);
*input = xinput ? &input_x : NULL; *input = xinput ? &input_x : NULL;
*input_data = xinput; *input_data = xinput;
} }