mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2025-10-31 22:25:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

opt: normal num key match KP_ num key in keybind

Browse source
This commit is contained in:
DreamMaoMao 2025-04-22 09:16:14 +08:00
parent bb381c3051
commit 2c2c99aa50
3 changed files with 60 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/maomao.c
View file

@ -3690,7 +3690,7 @@ keybinding(uint32_t mods, xkb_keysym_t sym) {
break;
k = &config.key_bindings[ji];
if (CLEANMASK(mods) == CLEANMASK(k->mod) &&
xkb_keysym_to_lower(sym) == k->keysym && k->func) {
normalize_keysym(sym) == normalize_keysym(k->keysym) && k->func) {
k->func(&k->arg);
handled = 1;
}

22
src/parse_config.h
View file

@ -254,6 +254,26 @@ long int parse_color(const char *hex_str) {
return hex_num;
}
xkb_keysym_t normalize_keysym(xkb_keysym_t sym) {
// 首先转换为小写
sym = xkb_keysym_to_lower(sym);
// 将数字小键盘键转换为普通数字键
switch (sym) {
case XKB_KEY_KP_0: return XKB_KEY_0;
case XKB_KEY_KP_1: return XKB_KEY_1;
case XKB_KEY_KP_2: return XKB_KEY_2;
case XKB_KEY_KP_3: return XKB_KEY_3;
case XKB_KEY_KP_4: return XKB_KEY_4;
case XKB_KEY_KP_5: return XKB_KEY_5;
case XKB_KEY_KP_6: return XKB_KEY_6;
case XKB_KEY_KP_7: return XKB_KEY_7;
case XKB_KEY_KP_8: return XKB_KEY_8;
case XKB_KEY_KP_9: return XKB_KEY_9;
default: return sym;
}
}
// 辅助函数：检查字符串是否以指定的前缀开头（忽略大小写）
static bool starts_with_ignore_case(const char *str, const char *prefix) {
while (*prefix) {
@ -299,7 +319,7 @@ uint32_t parse_mod(const char *mod_str) {
}
xkb_keysym_t parse_keysym(const char *keysym_str) {
return xkb_keysym_to_lower(xkb_keysym_from_name(keysym_str, XKB_KEYSYM_NO_FLAGS));
return xkb_keysym_from_name(keysym_str, XKB_KEYSYM_NO_FLAGS);
}
int parse_button(const char *str) {