#include <string.h>
#include <sys/ioctl.h>
#include <linux/input.h>
-#include <X11/extensions/XKBcommon.h>
+#include <xkbcommon/xkbcommon.h>
#include "kbd.h"
#include "log.h"
* (Some keycodes may have more groups than others, and so the effective
* group may not make sense for a certain keycode).
*/
-static uint8_t wrap_group_keycode(struct xkb_desc *desc, KeyCode keycode,
+static uint8_t wrap_group_keycode(struct xkb_desc *desc, xkb_keycode_t keycode,
int16_t group)
{
int num_groups;
* See [Lib] Table 17.4 for logic.
*/
static bool process_group_action(struct xkb_desc *desc, struct xkb_state *state,
- KeyCode keycode, enum kmscon_key_state key_state,
+ xkb_keycode_t keycode, enum kmscon_key_state key_state,
struct xkb_group_action *action)
{
int16_t group = action->group;
* See [Lib] Table 17.1 for logic.
* */
static bool process_mod_action(struct xkb_desc *desc, struct xkb_state *state,
- KeyCode keycode, enum kmscon_key_state key_state,
+ xkb_keycode_t keycode, enum kmscon_key_state key_state,
struct xkb_mod_action *action)
{
uint8_t mods;
* was changed.
*/
static bool process_action(struct xkb_desc *desc, struct xkb_state *state,
- KeyCode keycode, enum kmscon_key_state key_state,
+ xkb_keycode_t keycode, enum kmscon_key_state key_state,
union xkb_action *action)
{
if (!action)
* the modifiers to shift the keycode; this is determined by the key_type
* object mapped to the (keycode, group) pair.
*/
-static uint16_t find_shift_level(struct xkb_desc *desc, KeyCode keycode,
+static uint16_t find_shift_level(struct xkb_desc *desc, xkb_keycode_t keycode,
uint8_t mods, uint8_t group)
{
int i;
}
/* Whether to send out a repeat event for the key. */
-static bool should_key_repeat(struct xkb_desc *desc, KeyCode keycode)
+static bool should_key_repeat(struct xkb_desc *desc, xkb_keycode_t keycode)
{
unsigned const char *pkr;
{
struct xkb_desc *desc;
struct xkb_state *state;
- KeyCode keycode;
+ xkb_keycode_t keycode;
uint8_t group;
uint16_t shift_level;
uint32_t sym;
return 0;
}
-static int init_compat_for_keysym(struct xkb_desc *desc, KeyCode keycode,
+static int init_compat_for_keysym(struct xkb_desc *desc, xkb_keycode_t keycode,
uint8_t group, uint16_t level)
{
int ret;
return 0;
}
-static int init_compat_for_keycode(struct xkb_desc *desc, KeyCode keycode)
+static int init_compat_for_keycode(struct xkb_desc *desc, xkb_keycode_t keycode)
{
int ret;
int i, bit;