This commit is contained in:
Kovid Goyal 2018-03-29 00:05:37 +05:30
parent 9ba2c4b397
commit 80f3fe6e9f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 5 additions and 5 deletions

2
glfw/wl_init.c vendored
View File

@ -498,7 +498,7 @@ static void keyboardHandleModifiers(void* data,
uint32_t modsLocked,
uint32_t group)
{
xkb_glfw_update_modifiers(modsDepressed, modsLatched, modsLocked);
xkb_glfw_update_modifiers(modsDepressed, modsLatched, modsLocked, group);
}
static void keyboardHandleRepeatInfo(void* data,

8
glfw/xkb_glfw.h vendored
View File

@ -76,8 +76,8 @@ typedef struct {
struct xkb_keymap* keymap;
struct xkb_state* state;
struct xkb_compose_state* composeState;
short int keycodes[256];
short int scancodes[GLFW_KEY_LAST + 1];
short int keycodes[256];
short int scancodes[GLFW_KEY_LAST + 1];
xkb_mod_mask_t controlMask;
xkb_mod_mask_t altMask;
@ -165,7 +165,7 @@ typedef struct {
if (!GLFW_XKB_GLOBAL_NAME.context) \
{ \
_glfwInputError(GLFW_PLATFORM_ERROR, \
"Failed to initialize xkb context"); \
"Failed to initialize XKB context"); \
return GLFW_FALSE; \
} \
int scancode; \
@ -354,7 +354,7 @@ typedef struct {
}
#define xkb_glfw_update_modifiers(depressed, latched, locked) {\
#define xkb_glfw_update_modifiers(depressed, latched, locked, group) {\
xkb_mod_mask_t mask; \
unsigned int modifiers = 0; \
if (!GLFW_XKB_GLOBAL_NAME.keymap) return; \