break change: support bind flag

This commit is contained in:
DreamMaoMao
2025-11-06 09:14:48 +08:00
parent 48c34802f3
commit 539fd233da
2 changed files with 62 additions and 12 deletions

View File

@@ -40,6 +40,8 @@ typedef struct {
char mode[28];
bool iscommonmode;
bool isdefaultmode;
bool islockapply;
bool isreleaseapply;
} KeyBinding;
typedef struct {
@@ -410,6 +412,35 @@ char *sanitize_string(char *str) {
return str;
}
// 解析bind组合字符串
void parse_bind_flags(const char *str, KeyBinding *kb) {
// 检查是否以"bind"开头
if (strncmp(str, "bind", 4) != 0) {
return;
}
const char *suffix = str + 4; // 跳过"bind"
// 遍历后缀字符
for (int i = 0; suffix[i] != '\0'; i++) {
switch (suffix[i]) {
case 's':
kb->keysymcode.type = KEY_TYPE_SYM;
break;
case 'l':
kb->islockapply = true;
break;
case 'r':
kb->isreleaseapply = true;
break;
default:
// 忽略其他字符或可根据需要处理错误
break;
}
}
}
int parse_circle_direction(const char *str) {
// 将输入字符串转换为小写
char lowerStr[10];
@@ -1928,8 +1959,7 @@ void parse_option(Config *config, char *key, char *value) {
config->exec_once_count++;
} else if (strncmp(key, "bind", 4) == 0 ||
strncmp(key, "bindsym", 7) == 0) {
} else if (regex_match("^bind[s|l|r]*$", key)) {
config->key_bindings =
realloc(config->key_bindings,
(config->key_bindings_count + 1) * sizeof(KeyBinding));
@@ -1975,9 +2005,9 @@ void parse_option(Config *config, char *key, char *value) {
binding->iscommonmode = false;
}
parse_bind_flags(key, binding);
binding->keysymcode = parse_key(keysym_str, binding->keysymcode.type);
binding->mod = parse_mod(mod_str);
binding->keysymcode =
parse_key(keysym_str, strncmp(key, "bindsym", 7) == 0);
binding->arg.v = NULL;
binding->arg.v2 = NULL;
binding->arg.v3 = NULL;
@@ -2930,6 +2960,7 @@ void set_default_key_bindings(Config *config) {
default_key_bindings[i];
config->key_bindings[config->key_bindings_count + i].iscommonmode =
true;
config->key_bindings[config->key_bindings_count + i].islockapply = true;
}
// 更新按键绑定的总数