fi
# Obtain protocols headers include directives
-PKG_CHECK_MODULES([X11], [xproto kbproto >= 1.0.4])
+PKG_CHECK_MODULES([X11], [kbproto >= 1.0.4])
# Define a configuration option for the XKB config root
xkb_base=`$PKG_CONFIG --variable=xkb_base xkeyboard-config`
return rtrn;
}
+/*
+ * IMPORTATNT
+ * The indices used for the legacy core modifiers is derived from
+ * the order of the names in this table. It matches the values
+ * ShiftMapIndex, LockMapIndex, etc. from X11/X.h. Take note before
+ * changing.
+ */
static const char *modNames[XkbNumModifiers] = {
- [ShiftMapIndex] = "Shift",
- [LockMapIndex] = "Lock",
- [ControlMapIndex] = "Control",
- [Mod1MapIndex] = "Mod1",
- [Mod2MapIndex] = "Mod2",
- [Mod3MapIndex] = "Mod3",
- [Mod4MapIndex] = "Mod4",
- [Mod5MapIndex] = "Mod5",
+ "Shift",
+ "Lock",
+ "Control",
+ "Mod1",
+ "Mod2",
+ "Mod3",
+ "Mod4",
+ "Mod5",
};
xkb_mod_index_t
action->dflt.value = 1;
}
else if (action->type == XkbSA_ISOLock) {
- action->iso.real_mods = LockMask;
+ action->iso.real_mods = ModNameToIndex(XKB_MOD_NAME_CAPS);
}
}