...
This commit is contained in:
parent
9ba2c4b397
commit
80f3fe6e9f
2
glfw/wl_init.c
vendored
2
glfw/wl_init.c
vendored
@ -498,7 +498,7 @@ static void keyboardHandleModifiers(void* data,
|
|||||||
uint32_t modsLocked,
|
uint32_t modsLocked,
|
||||||
uint32_t group)
|
uint32_t group)
|
||||||
{
|
{
|
||||||
xkb_glfw_update_modifiers(modsDepressed, modsLatched, modsLocked);
|
xkb_glfw_update_modifiers(modsDepressed, modsLatched, modsLocked, group);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void keyboardHandleRepeatInfo(void* data,
|
static void keyboardHandleRepeatInfo(void* data,
|
||||||
|
|||||||
8
glfw/xkb_glfw.h
vendored
8
glfw/xkb_glfw.h
vendored
@ -76,8 +76,8 @@ typedef struct {
|
|||||||
struct xkb_keymap* keymap;
|
struct xkb_keymap* keymap;
|
||||||
struct xkb_state* state;
|
struct xkb_state* state;
|
||||||
struct xkb_compose_state* composeState;
|
struct xkb_compose_state* composeState;
|
||||||
short int keycodes[256];
|
short int keycodes[256];
|
||||||
short int scancodes[GLFW_KEY_LAST + 1];
|
short int scancodes[GLFW_KEY_LAST + 1];
|
||||||
|
|
||||||
xkb_mod_mask_t controlMask;
|
xkb_mod_mask_t controlMask;
|
||||||
xkb_mod_mask_t altMask;
|
xkb_mod_mask_t altMask;
|
||||||
@ -165,7 +165,7 @@ typedef struct {
|
|||||||
if (!GLFW_XKB_GLOBAL_NAME.context) \
|
if (!GLFW_XKB_GLOBAL_NAME.context) \
|
||||||
{ \
|
{ \
|
||||||
_glfwInputError(GLFW_PLATFORM_ERROR, \
|
_glfwInputError(GLFW_PLATFORM_ERROR, \
|
||||||
"Failed to initialize xkb context"); \
|
"Failed to initialize XKB context"); \
|
||||||
return GLFW_FALSE; \
|
return GLFW_FALSE; \
|
||||||
} \
|
} \
|
||||||
int scancode; \
|
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; \
|
xkb_mod_mask_t mask; \
|
||||||
unsigned int modifiers = 0; \
|
unsigned int modifiers = 0; \
|
||||||
if (!GLFW_XKB_GLOBAL_NAME.keymap) return; \
|
if (!GLFW_XKB_GLOBAL_NAME.keymap) return; \
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user