Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Xkb setup by calling xkbcommon function

This commit is contained in:
Peter Junos 2015-05-27 02:09:34 +02:00
parent 835c13bd80
commit 594c01dc36
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
xkb.c
View File

@ -25,7 +25,6 @@
#include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon.h>
#include <xkbcommon/xkbcommon-x11.h> #include <xkbcommon/xkbcommon-x11.h>
/* \brief switch keyboard layout /* \brief switch keyboard layout
* \param L The Lua VM state. * \param L The Lua VM state.
* \return The number of elements pushed on stack. * \return The number of elements pushed on stack.
@ -243,20 +242,18 @@ void
xkb_init(void) xkb_init(void)
{ {
/* check that XKB extension present in this X server */ int success_xkb = xkb_x11_setup_xkb_extension(globalconf.connection,
const xcb_query_extension_reply_t *xkb_r; XKB_X11_MIN_MAJOR_XKB_VERSION,
xkb_r = xcb_get_extension_data(globalconf.connection, &xcb_xkb_id); XKB_X11_MIN_MINOR_XKB_VERSION,
if (!xkb_r || !xkb_r->present) 0,
{ NULL,
fatal("Xkb extension not present"); NULL,
} NULL,
NULL);
/* check xkb version */
xcb_xkb_use_extension_cookie_t ext_cookie = xcb_xkb_use_extension(globalconf.connection, 1, 0); if (!success_xkb) {
xcb_xkb_use_extension_reply_t *ext_reply = xcb_xkb_use_extension_reply (globalconf.connection, ext_cookie, NULL); fatal("XKB not found or not supported");
if (!ext_reply || !ext_reply->supported)
{
fatal("Required xkb extension is not supported");
} }
uint16_t map = XCB_XKB_EVENT_TYPE_STATE_NOTIFY | XCB_XKB_EVENT_TYPE_MAP_NOTIFY | XCB_XKB_EVENT_TYPE_NEW_KEYBOARD_NOTIFY; uint16_t map = XCB_XKB_EVENT_TYPE_STATE_NOTIFY | XCB_XKB_EVENT_TYPE_MAP_NOTIFY | XCB_XKB_EVENT_TYPE_NEW_KEYBOARD_NOTIFY;