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

Handle key_event in udev.

Browse Source 
Use libxkbcommon for this.
This commit is contained in:
Themaister 2013-12-08 00:56:24 +01:00
parent 292418492e
commit 3a8608fb70
3 changed files with 91 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -332,6 +332,11 @@ ifeq ($(HAVE_UDEV), 1)
JOYCONFIG_OBJ += tools/udev_joypad.o
endif
ifeq ($(HAVE_XKBCOMMON), 1)
DEFINES += $(XKBCOMMON_CFLAGS)
LIBS += $(XKBCOMMON_LIBS)
endif
ifeq ($(HAVE_NEON),1)
OBJ += audio/sinc_neon.o
# When compiled without this, tries to attempt to compile sinc lerp,

84
input/udev_input.c
View File

@ -29,6 +29,16 @@
#include <linux/types.h>
#include <linux/input.h>
#ifdef HAVE_CONFIG_H
#include "../config.h"
#endif
// Need libxkbcommon to translate raw evdev events to characters
// which can be passed to keyboard callback in a sensible way.
#ifdef HAVE_XKBCOMMON
#include <xkbcommon/xkbcommon.h>
#endif
typedef struct udev_input udev_input_t;
struct input_device;
@ -62,6 +72,17 @@ 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;
struct
{
xkb_mod_index_t index;
uint16_t bit;
} mod_map[5];
#endif
const rarch_joypad_driver_t *joypad;
uint8_t key_state[(KEY_MAX + 7) / 8];
@ -89,6 +110,35 @@ static inline void set_bit(uint8_t *buf, unsigned bit)
buf[bit >> 3] |= 1 << (bit & 7);
}
#ifdef HAVE_XKBCOMMON
static void handle_xkb(udev_input_t *udev, int code, int value)
{
int xk_code = code + 8; // Convert Linux evdev to X11 (xkbcommon docs say so at least ...)
if (value == 2) // Repeat, release first explicitly.
xkb_state_update_key(udev->xkb_state, xk_code, XKB_KEY_UP);
uint32_t utf32 = 0;
if (value)
{
xkb_keysym_t sym = xkb_state_key_get_one_sym(udev->xkb_state, xk_code);
utf32 = xkb_keysym_to_utf32(sym);
}
xkb_state_update_key(udev->xkb_state, xk_code, value ? XKB_KEY_DOWN : XKB_KEY_UP);
// Build mod state.
uint16_t mod = 0;
unsigned i;
for (i = 0; i < ARRAY_SIZE(udev->mod_map); i++)
if (udev->mod_map[i].index != XKB_MOD_INVALID)
mod |= xkb_state_mod_index_is_active(udev->xkb_state, udev->mod_map[i].index, XKB_STATE_MODS_EFFECTIVE) > 0 ? udev->mod_map[i].bit : 0;
if (g_extern.system.key_event)
g_extern.system.key_event(value, input_translate_keysym_to_rk(code), utf32, mod);
}
#endif
static void udev_handle_keyboard(udev_input_t *udev, const struct input_event *event, struct input_device *dev)
{
switch (event->type)
@ -98,6 +148,11 @@ static void udev_handle_keyboard(udev_input_t *udev, const struct input_event *e
set_bit(udev->key_state, event->code);
else
clear_bit(udev->key_state, event->code);
#ifdef HAVE_XKBCOMMON
if (udev->xkb_state)
handle_xkb(udev, event->code, event->value);
#endif
break;
default:
@ -507,6 +562,15 @@ static void udev_input_free(void *data)
if (udev->udev)
udev_unref(udev->udev);
#ifdef HAVE_XKBCOMMON
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);
#endif
free(udev);
}
@ -564,6 +628,26 @@ static void *udev_input_init(void)
udev_monitor_enable_receiving(udev->monitor);
}
#ifdef HAVE_XKBCOMMON
udev->xkb_ctx = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
// Uses "default" layout, which seems to be US layout.
if (udev->xkb_ctx)
udev->xkb_map = xkb_keymap_new_from_names(udev->xkb_ctx, NULL, XKB_MAP_COMPILE_NO_FLAGS);
if (udev->xkb_map)
udev->xkb_state = xkb_state_new(udev->xkb_map);
udev->mod_map[0].index = xkb_keymap_mod_get_index(udev->xkb_map, XKB_MOD_NAME_CAPS);
udev->mod_map[0].bit = RETROKMOD_CAPSLOCK;
udev->mod_map[1].index = xkb_keymap_mod_get_index(udev->xkb_map, XKB_MOD_NAME_SHIFT);
udev->mod_map[1].bit = RETROKMOD_SHIFT;
udev->mod_map[2].index = xkb_keymap_mod_get_index(udev->xkb_map, XKB_MOD_NAME_CTRL);
udev->mod_map[2].bit = RETROKMOD_CTRL;
udev->mod_map[3].index = xkb_keymap_mod_get_index(udev->xkb_map, XKB_MOD_NAME_ALT);
udev->mod_map[3].bit = RETROKMOD_ALT;
udev->mod_map[4].index = xkb_keymap_mod_get_index(udev->xkb_map, XKB_MOD_NAME_LOGO);
udev->mod_map[4].bit = RETROKMOD_META;
#endif
udev->epfd = epoll_create(32);
if (udev->epfd < 0)
{

3
qb/config.libs.sh
View File

@ -236,6 +236,7 @@ check_pkgconf FREETYPE freetype2
check_pkgconf X11 x11
[ "$HAVE_X11" = "no" ] && HAVE_XEXT=no && HAVE_XF86VM=no && HAVE_XINERAMA=no
check_pkgconf XKBCOMMON xkbcommon 0.3
check_pkgconf XEXT xext
check_pkgconf XF86VM xxf86vm
check_pkgconf XINERAMA xinerama
@ -260,6 +261,6 @@ add_define_make OS "$OS"
# Creates config.mk and config.h.
add_define_make GLOBAL_CONFIG_DIR "$GLOBAL_CONFIG_DIR"
VARS="RGUI ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL OPENGL OMAP GLES VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 SDL_IMAGE ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XVIDEO X11 XEXT XF86VM XINERAMA NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2"
VARS="RGUI ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL OPENGL OMAP GLES VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 SDL_IMAGE ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2"
create_config_make config.mk $VARS
create_config_header config.h $VARS