mirror of
https://github.com/DreamMaoMao/maomaowm.git
synced 2026-03-28 07:58:47 -04:00
feat: support index arg in switch_keyboard_layout
This commit is contained in:
parent
005180b03c
commit
b5754f237f
2 changed files with 5 additions and 0 deletions
|
|
@ -997,6 +997,7 @@ FuncType parse_func_name(char *func_name, Arg *arg, char *arg_value,
|
||||||
(*arg).v = strdup(arg_value);
|
(*arg).v = strdup(arg_value);
|
||||||
} else if (strcmp(func_name, "switch_keyboard_layout") == 0) {
|
} else if (strcmp(func_name, "switch_keyboard_layout") == 0) {
|
||||||
func = switch_keyboard_layout;
|
func = switch_keyboard_layout;
|
||||||
|
(*arg).i = CLAMP_INT(atoi(arg_value), 0, 100);
|
||||||
} else if (strcmp(func_name, "setlayout") == 0) {
|
} else if (strcmp(func_name, "setlayout") == 0) {
|
||||||
func = setlayout;
|
func = setlayout;
|
||||||
(*arg).v = strdup(arg_value);
|
(*arg).v = strdup(arg_value);
|
||||||
|
|
|
||||||
|
|
@ -903,6 +903,10 @@ int32_t switch_keyboard_layout(const Arg *arg) {
|
||||||
}
|
}
|
||||||
xkb_layout_index_t next = (current + 1) % num_layouts;
|
xkb_layout_index_t next = (current + 1) % num_layouts;
|
||||||
|
|
||||||
|
if (arg->i > 0 && arg->i <= num_layouts) {
|
||||||
|
next = arg->i - 1;
|
||||||
|
}
|
||||||
|
|
||||||
// 6. 应用新 keymap
|
// 6. 应用新 keymap
|
||||||
uint32_t depressed = keyboard->modifiers.depressed;
|
uint32_t depressed = keyboard->modifiers.depressed;
|
||||||
uint32_t latched = keyboard->modifiers.latched;
|
uint32_t latched = keyboard->modifiers.latched;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue