mirrors/maomaowm
1
0
Fork 0
mirror of https://github.com/DreamMaoMao/maomaowm.git synced 2025-11-26 07:00:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

opt: simple keyboard layout switch

Browse source
This commit is contained in:
DreamMaoMao 2025-11-01 21:42:26 +08:00
parent 4ee55fc0ba
commit 3c4c169fca
1 changed files with 7 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/dispatch/bind_define.h
View file

@ -839,35 +839,12 @@ int switch_keyboard_layout(const Arg *arg) {
} }
xkb_layout_index_t next = (current + 1) % num_layouts; xkb_layout_index_t next = (current + 1) % num_layouts;
// 2. 创建上下文
struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
if (!context) {
wlr_log(WLR_ERROR, "Failed to create XKB context");
return 0;
}
// 安全地处理 layout 字符串
const char *current_layout = xkb_rules.layout;
if (!current_layout || strlen(current_layout) == 0) {
wlr_log(WLR_INFO, "Using default layout 'us'");
current_layout = "us";
}
// 5. 创建新 keymap
struct xkb_keymap *new_keymap = xkb_keymap_new_from_names(
context, &xkb_rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
if (!new_keymap) {
wlr_log(WLR_ERROR, "Failed to create keymap for layouts: %s",
xkb_rules.layout);
goto cleanup_context;
}
// 6. 应用新 keymap // 6. 应用新 keymap
unsigned int depressed = keyboard->modifiers.depressed; unsigned int depressed = keyboard->modifiers.depressed;
unsigned int latched = keyboard->modifiers.latched; unsigned int latched = keyboard->modifiers.latched;
unsigned int locked = keyboard->modifiers.locked; unsigned int locked = keyboard->modifiers.locked;
wlr_keyboard_set_keymap(keyboard, new_keymap); wlr_keyboard_set_keymap(keyboard, keyboard->keymap);
wlr_keyboard_notify_modifiers(keyboard, depressed, latched, locked, next); wlr_keyboard_notify_modifiers(keyboard, depressed, latched, locked, next);
keyboard->modifiers.group = 0; keyboard->modifiers.group = 0;
@ -881,24 +858,17 @@ int switch_keyboard_layout(const Arg *arg) {
continue; continue;
} }
keyboard = (struct wlr_keyboard *)id->device_data; struct wlr_keyboard *tkb = (struct wlr_keyboard *)id->device_data;
wlr_keyboard_set_keymap(keyboard, new_keymap); wlr_keyboard_set_keymap(tkb, keyboard->keymap);
wlr_keyboard_notify_modifiers(keyboard, depressed, latched, locked, wlr_keyboard_notify_modifiers(tkb, depressed, latched, locked, next);
next); tkb->modifiers.group = 0;
keyboard->modifiers.group = 0;
// 7. 更新 seat // 7. 更新 seat
wlr_seat_set_keyboard(seat, keyboard); wlr_seat_set_keyboard(seat, tkb);
wlr_seat_keyboard_notify_modifiers(seat, &keyboard->modifiers); wlr_seat_keyboard_notify_modifiers(seat, &tkb->modifiers);
} }
// 8. 清理资源
xkb_keymap_unref(new_keymap);
cleanup_context:
xkb_context_unref(context);
printstatus(); printstatus();
return 0; return 0;
} }