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

move most xkbcommon code to keyboard_event_xkb.c

Browse Source
This commit is contained in:
twinaphex 2015-11-17 07:28:45 +01:00
parent 53aa251008
commit 3bc125b6da
2 changed files with 112 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
input/drivers/udev_input.c
View File

@ -45,15 +45,6 @@
#include "../../config.h"
#endif
#ifdef HAVE_XKBCOMMON
/* We need libxkbcommon to translate raw evdev events to characters
* which can be passed to keyboard callback in a sensible way. */
#include <xkbcommon/xkbcommon.h>
#define MOD_MAP_SIZE 5
#endif
typedef struct udev_input udev_input_t;
struct input_device;
@ -90,13 +81,6 @@ struct udev_input
struct udev *udev;
struct udev_monitor *monitor;
#ifdef HAVE_XKBCOMMON
struct xkb_context *xkb_ctx;
struct xkb_keymap *xkb_map;
struct xkb_state *xkb_state;
xkb_mod_index_t *mod_map_idx;
uint16_t *mod_map_bit;
#endif
const input_device_driver_t *joypad;
uint8_t key_state[(KEY_MAX + 7) / 8];
@ -111,11 +95,11 @@ struct udev_input
};
#ifdef HAVE_XKBCOMMON
void handle_xkb(
struct xkb_state *xkb_state,
xkb_mod_index_t *mod_map_idx,
uint16_t *mod_map_bit,
int code, int value);
int init_xkb(void);
void free_xkb(void);
void handle_xkb(int code, int value);
#endif
static void udev_handle_keyboard(udev_input_t *udev,
@ -130,7 +114,7 @@ static void udev_handle_keyboard(udev_input_t *udev,
BIT_CLEAR(udev->key_state, event->code);
#ifdef HAVE_XKBCOMMON
handle_xkb(udev->xkb_state, udev->mod_map_idx, udev->mod_map_bit, event->code, event->value);
handle_xkb(event->code, event->value);
#endif
break;
@ -644,16 +628,7 @@ static void udev_input_free(void *data)
udev_unref(udev->udev);
#ifdef HAVE_XKBCOMMON
if (udev->mod_map_idx)
free(udev->mod_map_idx);
if (udev->mod_map_bit)
free(udev->mod_map_bit);
if (udev->xkb_map)
xkb_keymap_unref(udev->xkb_map);
if (udev->xkb_ctx)
xkb_context_unref(udev->xkb_ctx);
if (udev->xkb_state)
xkb_state_unref(udev->xkb_state);
free_xkb();
#endif
free(udev);
@ -722,63 +697,8 @@ static void *udev_input_init(void)
}
#ifdef HAVE_XKBCOMMON
udev->mod_map_idx = (xkb_mod_index_t *)calloc(MOD_MAP_SIZE, sizeof(xkb_mod_index_t));
if (!udev->mod_map_idx)
if (init_xkb() == -1)
goto error;
udev->mod_map_bit = (uint16_t*)calloc(MOD_MAP_SIZE, sizeof(uint16_t));
if (!udev->mod_map_bit)
goto error;
udev->xkb_ctx = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
if (udev->xkb_ctx)
{
struct string_list *list = NULL;
struct xkb_rule_names rule = {0};
rule.rules = "evdev";
if (*settings->input.keyboard_layout)
{
list = string_split(settings->input.keyboard_layout, ":");
if (list && list->size >= 2)
rule.variant = list->elems[1].data;
if (list && list->size >= 1)
rule.layout = list->elems[0].data;
}
udev->xkb_map = xkb_keymap_new_from_names(udev->xkb_ctx, &rule, XKB_MAP_COMPILE_NO_FLAGS);
if (list)
string_list_free(list);
}
if (udev->xkb_map)
{
xkb_mod_index_t *map_idx = (xkb_mod_index_t*)&udev->mod_map_idx[0];
uint16_t *map_bit = (uint16_t*)&udev->mod_map_bit[0];
udev->xkb_state = xkb_state_new(udev->xkb_map);
*map_idx = xkb_keymap_mod_get_index(udev->xkb_map, XKB_MOD_NAME_CAPS);
map_idx++;
*map_bit = RETROKMOD_CAPSLOCK;
map_bit++;
*map_idx = xkb_keymap_mod_get_index(udev->xkb_map, XKB_MOD_NAME_SHIFT);
map_idx++;
*map_bit = RETROKMOD_SHIFT;
map_bit++;
*map_idx = xkb_keymap_mod_get_index(udev->xkb_map, XKB_MOD_NAME_CTRL);
map_idx++;
*map_bit = RETROKMOD_CTRL;
map_bit++;
*map_idx = xkb_keymap_mod_get_index(udev->xkb_map, XKB_MOD_NAME_ALT);
map_idx++;
*map_bit = RETROKMOD_ALT;
map_bit++;
*map_idx = xkb_keymap_mod_get_index(udev->xkb_map, XKB_MOD_NAME_LOGO);
*map_bit = RETROKMOD_META;
}
#endif
udev->epfd = epoll_create(32);

112
input/drivers_keyboard/keyboard_event_xkb.c
View File

@ -14,28 +14,124 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
/* We need libxkbcommon to translate raw evdev events to characters
* which can be passed to keyboard callback in a sensible way. */
#include <xkbcommon/xkbcommon.h>
#include <string/string_list.h>
#include "../input_joypad_driver.h"
#include "../input_keymaps.h"
#include "../keyboard_line.h"
#include "../../configuration.h"
#define MOD_MAP_SIZE 5
static struct xkb_context *xkb_ctx;
static struct xkb_keymap *xkb_map;
static struct xkb_state *xkb_state;
static xkb_mod_index_t *mod_map_idx;
static uint16_t *mod_map_bit;
void free_xkb(void)
{
if (mod_map_idx)
free(mod_map_idx);
if (mod_map_bit)
free(mod_map_bit);
if (xkb_map)
xkb_keymap_unref(xkb_map);
if (xkb_ctx)
xkb_context_unref(xkb_ctx);
if (xkb_state)
xkb_state_unref(xkb_state);
mod_map_idx = NULL;
mod_map_bit = NULL;
xkb_map = NULL;
xkb_ctx = NULL;
xkb_state = NULL;
}
int init_xkb(void)
{
settings_t *settings = config_get_ptr();
mod_map_idx = (xkb_mod_index_t *)calloc(MOD_MAP_SIZE, sizeof(xkb_mod_index_t));
if (!mod_map_idx)
goto error;
mod_map_bit = (uint16_t*)calloc(MOD_MAP_SIZE, sizeof(uint16_t));
if (!mod_map_bit)
goto error;
xkb_ctx = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
if (xkb_ctx)
{
struct string_list *list = NULL;
struct xkb_rule_names rule = {0};
rule.rules = "evdev";
if (*settings->input.keyboard_layout)
{
list = string_split(settings->input.keyboard_layout, ":");
if (list && list->size >= 2)
rule.variant = list->elems[1].data;
if (list && list->size >= 1)
rule.layout = list->elems[0].data;
}
xkb_map = xkb_keymap_new_from_names(xkb_ctx, &rule, XKB_MAP_COMPILE_NO_FLAGS);
if (list)
string_list_free(list);
}
if (xkb_map)
{
xkb_mod_index_t *map_idx = (xkb_mod_index_t*)&mod_map_idx[0];
uint16_t *map_bit = (uint16_t*)&mod_map_bit[0];
xkb_state = xkb_state_new(xkb_map);
*map_idx = xkb_keymap_mod_get_index(xkb_map, XKB_MOD_NAME_CAPS);
map_idx++;
*map_bit = RETROKMOD_CAPSLOCK;
map_bit++;
*map_idx = xkb_keymap_mod_get_index(xkb_map, XKB_MOD_NAME_SHIFT);
map_idx++;
*map_bit = RETROKMOD_SHIFT;
map_bit++;
*map_idx = xkb_keymap_mod_get_index(xkb_map, XKB_MOD_NAME_CTRL);
map_idx++;
*map_bit = RETROKMOD_CTRL;
map_bit++;
*map_idx = xkb_keymap_mod_get_index(xkb_map, XKB_MOD_NAME_ALT);
map_idx++;
*map_bit = RETROKMOD_ALT;
map_bit++;
*map_idx = xkb_keymap_mod_get_index(xkb_map, XKB_MOD_NAME_LOGO);
*map_bit = RETROKMOD_META;
}
return 0;
error:
free_xkb();
return -1;
}
/* FIXME: Don't handle composed and dead-keys properly.
* Waiting for support in libxkbcommon ... */
void handle_xkb(
struct xkb_state *xkb_state,
xkb_mod_index_t *mod_map_idx,
uint16_t *mod_map_bit,
int code, int value)
void handle_xkb(int code, int value)
{
unsigned i;
const xkb_keysym_t *syms = NULL;
unsigned num_syms = 0;
uint16_t mod = 0;
unsigned num_syms = 0;
uint16_t mod = 0;
/* Convert Linux evdev to X11 (xkbcommon docs say so at least ...) */
int xk_code = code + 8;
int xk_code = code + 8;
if (!xkb_state)
return;