mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2026-04-06 07:15:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

opt: optimize keymap set

Browse source
This commit is contained in:
DreamMaoMao 2025-10-22 13:24:36 +08:00
parent 86cedaadca
commit c69b736d0e
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/config/preset.h
View file

@ -123,6 +123,10 @@ static const struct xkb_rule_names xkb_fallback_rules = {
.options = NULL, .options = NULL,
}; };
static const struct xkb_rule_names xkb_default_rules = {
.options = NULL,
};
struct xkb_rule_names xkb_rules = { struct xkb_rule_names xkb_rules = {
/* can specify fields: rules, model, layout, variant, options */ /* can specify fields: rules, model, layout, variant, options */
/* example: /* example:

2
src/dispatch/bind_define.h
View file

@ -868,7 +868,7 @@ int switch_keyboard_layout(const Arg *arg) {
if (!check_keyboard_rules_validate(&rules)) { if (!check_keyboard_rules_validate(&rules)) {
wlr_log(WLR_ERROR, wlr_log(WLR_ERROR,
"Keyboard rules validation failed, skipping layout reset"); "Keyboard rules validation failed, skipping layout reset");
rules = xkb_fallback_rules; rules = xkb_default_rules;
} }
char *layout_buf = (char *)rules.layout; // 假设这是可修改的 char *layout_buf = (char *)rules.layout; // 假设这是可修改的

4
src/mango.c
View file

@ -2329,7 +2329,7 @@ KeyboardGroup *createkeyboardgroup(void) {
if (!check_keyboard_rules_validate(&rules)) { if (!check_keyboard_rules_validate(&rules)) {
wlr_log(WLR_ERROR, wlr_log(WLR_ERROR,
"Keyboard rules validation failed, skipping layout reset"); "Keyboard rules validation failed, skipping layout reset");
rules = xkb_fallback_rules; rules = xkb_default_rules;
} }
/* Prepare an XKB keymap and assign it to the keyboard group. */ /* Prepare an XKB keymap and assign it to the keyboard group. */
@ -4571,7 +4571,7 @@ void reset_keyboard_layout(void) {
if (!check_keyboard_rules_validate(&rules)) { if (!check_keyboard_rules_validate(&rules)) {
wlr_log(WLR_ERROR, wlr_log(WLR_ERROR,
"Keyboard rules validation failed, skipping layout reset"); "Keyboard rules validation failed, skipping layout reset");
rules = xkb_fallback_rules; rules = xkb_default_rules;
} }
// Create context // Create context