mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-20 07:24:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Gate Wayland modifier autodiscovery behind an environment variable

Browse Source
This commit is contained in:
Ravi R Kiran
2021-08-17 21:46:09 -05:00
parent 1b88a68b55
commit 75df0cbcf5
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
glfw/xkb_glfw.c vendored
View File

@@ -515,15 +515,17 @@ static int local_modifier_mapping(_GLFWXKBData *xkb) {
}
}
if ( algorithm.failed )
debug( "Wayland modifier autodetection algorithm failed; using defaults\n" );
return !algorithm.failed;
}
static void
glfw_xkb_update_masks(_GLFWXKBData *xkb) {
// Should find better solution under Wayland
// See https://github.com/kovidgoyal/kitty/pull/3430 for discussion
// See https://github.com/kovidgoyal/kitty/pull/3943 for discussion
if ( !local_modifier_mapping( xkb ) ) {
if ( getenv( "KITTY_WAYLAND_DETECT_MODIFIERS" ) == NULL || !local_modifier_mapping( xkb ) ) {
#define S( a ) xkb->a##Idx = XKB_MOD_INVALID; xkb->a##Mask = 0
S(hyper); S(meta);
#undef S