Skip to content

Commit

Permalink
Allow udev input to be used with X11 context
Browse files Browse the repository at this point in the history
  • Loading branch information
Zoran Vuckovic committed Jun 1, 2017
1 parent a4358de commit 2056ebc
Showing 1 changed file with 17 additions and 1 deletion.
18 changes: 17 additions & 1 deletion gfx/drivers_context/x_ctx.c
Expand Up @@ -36,6 +36,9 @@

#endif

#include <string/stdstring.h>

#include "../../configuration.h"
#include "../../frontend/frontend_driver.h"
#include "../common/gl_common.h"
#include "../common/x11_common.h"
Expand Down Expand Up @@ -900,8 +903,21 @@ static void gfx_ctx_x_input_driver(void *data,
const char *joypad_name,
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_data = xinput;
}
Expand Down

0 comments on commit 2056ebc

Please sign in to comment.