KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'bug3446-fix' of https://github.com/orki/kitty

Browse Source
This commit is contained in:
Kovid Goyal 2021-04-08 08:37:55 +05:30
commit 4eb8b1db01
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
glfw/xkb_glfw.c vendored
View File

@ -353,7 +353,7 @@ glfw_xkb_update_masks(_GLFWXKBData *xkb) {
if (succeeded) { if (succeeded) {
unsigned indx, shifted; unsigned indx, shifted;
for (indx = 0, shifted = 1; used_bits; ++indx, shifted <<= 1, used_bits >>= 1) { for (indx = 0, shifted = 1; used_bits; ++indx, shifted <<= 1, used_bits >>= 1) {
#define S( a ) if ( xkb->a##Mask == shifted ) xkb->a##Idx = indx #define S( a ) if ( ( xkb->a##Mask & shifted ) == shifted ) xkb->a##Idx = indx
S(alt); S(super); S(hyper); S(meta); S(numLock); S(alt); S(super); S(hyper); S(meta); S(numLock);
#undef S #undef S
} }
@ -362,11 +362,11 @@ glfw_xkb_update_masks(_GLFWXKBData *xkb) {
S(control, XKB_MOD_NAME_CTRL); S(control, XKB_MOD_NAME_CTRL);
S(shift, XKB_MOD_NAME_SHIFT); S(shift, XKB_MOD_NAME_SHIFT);
S(capsLock, XKB_MOD_NAME_CAPS); S(capsLock, XKB_MOD_NAME_CAPS);
#define C(a, n) if (xkb->a##Idx == XKB_MOD_INVALID) { S(a, n); } if (!succeeded) {
C(numLock, XKB_MOD_NAME_NUM); S(numLock, XKB_MOD_NAME_NUM);
C(alt, XKB_MOD_NAME_ALT); S(alt, XKB_MOD_NAME_ALT);
C(super, XKB_MOD_NAME_LOGO); S(super, XKB_MOD_NAME_LOGO);
#undef C }
#undef S #undef S
debug("Modifier indices alt:%u super:%u hyper:%u meta:%u numlock:%u\n", debug("Modifier indices alt:%u super:%u hyper:%u meta:%u numlock:%u\n",
xkb->altIdx, xkb->superIdx, xkb->hyperIdx, xkb->metaIdx, xkb->numLockIdx); xkb->altIdx, xkb->superIdx, xkb->hyperIdx, xkb->metaIdx, xkb->numLockIdx);
@ -496,10 +496,25 @@ active_unknown_modifiers(_GLFWXKBData *xkb, struct xkb_state *state) {
return ans; return ans;
} }
static unsigned int
update_one_modifier(XKBStateGroup *group, xkb_mod_mask_t mask,
xkb_mod_index_t idx, unsigned int mod) {
if ( idx == XKB_MOD_INVALID )
return 0;
/* Optimization in the case of a single real modifier */
if ( mask && ( ( mask & ( mask-1 ) ) == 0 ) )
return (xkb_state_mod_index_is_active(group->state, idx, XKB_STATE_MODS_EFFECTIVE) == 1) ? mod : 0;
/* Multiple real mods map to the same virtual mod */
for ( unsigned indx = 0; indx < 32 && mask; ++indx, mask >>= 1 )
if ( ( mask & 1 ) && xkb_state_mod_index_is_active(group->state, indx, XKB_STATE_MODS_EFFECTIVE) == 1)
return mod;
return 0;
}
static void static void
update_modifiers(_GLFWXKBData *xkb) { update_modifiers(_GLFWXKBData *xkb) {
XKBStateGroup *group = &xkb->states; XKBStateGroup *group = &xkb->states;
#define S(attr, name) if (xkb_state_mod_index_is_active(group->state, xkb->attr##Idx, XKB_STATE_MODS_EFFECTIVE) == 1) group->modifiers |= GLFW_MOD_##name #define S(attr, name) group->modifiers |= update_one_modifier( group, xkb->attr##Mask, xkb->attr##Idx, GLFW_MOD_##name )
S(control, CONTROL); S(alt, ALT); S(shift, SHIFT); S(super, SUPER); S(hyper, HYPER); S(meta, META); S(capsLock, CAPS_LOCK); S(numLock, NUM_LOCK); S(control, CONTROL); S(alt, ALT); S(shift, SHIFT); S(super, SUPER); S(hyper, HYPER); S(meta, META); S(capsLock, CAPS_LOCK); S(numLock, NUM_LOCK);
#undef S #undef S
xkb->states.activeUnknownModifiers = active_unknown_modifiers(xkb, xkb->states.state); xkb->states.activeUnknownModifiers = active_unknown_modifiers(xkb, xkb->states.state);