diff --git a/meson.build b/meson.build index 0565609..d71eb59 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('mango', ['c', 'cpp'], - version : '0.12.0', + version : '0.11.0', ) subdir('protocols') diff --git a/src/animation/client.h b/src/animation/client.h index 8de9b06..849bc10 100644 --- a/src/animation/client.h +++ b/src/animation/client.h @@ -363,6 +363,7 @@ void apply_border(Client *c) { current_corner_location = set_client_corner_location(c); } + // Handle no-border cases if (hit_no_border && smartgaps) { c->bw = 0; c->fake_no_border = true; @@ -980,12 +981,6 @@ void resize(Client *c, struct wlr_box geo, int32_t interact) { c->bw = 0; } - bool hit_no_border = check_hit_no_border(c); - if (hit_no_border && smartgaps) { - c->bw = 0; - c->fake_no_border = true; - } - // c->geom 是真实的窗口大小和位置，跟过度的动画无关，用于计算布局 c->configure_serial = client_set_size(c, c->geom.width - 2 * c->bw, c->geom.height - 2 * c->bw); @@ -1054,11 +1049,20 @@ void client_set_focused_opacity_animation(Client *c) { sizeof(c->opacity_animation.target_border_color)); c->opacity_animation.target_opacity = c->focused_opacity; c->opacity_animation.time_started = get_now_in_ms(); - memcpy(c->opacity_animation.initial_border_color, - c->opacity_animation.current_border_color, - sizeof(c->opacity_animation.initial_border_color)); - c->opacity_animation.initial_opacity = c->opacity_animation.current_opacity; - + if (c->opacity_animation.running) { + memcpy(c->opacity_animation.initial_border_color, + c->opacity_animation.current_border_color, + sizeof(c->opacity_animation.initial_border_color)); + c->opacity_animation.initial_opacity = + c->opacity_animation.current_opacity; + } else { + memcpy(c->opacity_animation.initial_border_color, border_color, + sizeof(c->opacity_animation.initial_border_color)); + memcpy(c->opacity_animation.current_border_color, border_color, + sizeof(c->opacity_animation.current_border_color)); + c->opacity_animation.initial_opacity = c->unfocused_opacity; + c->opacity_animation.current_opacity = c->unfocused_opacity; + } c->opacity_animation.running = true; } @@ -1078,10 +1082,20 @@ void client_set_unfocused_opacity_animation(Client *c) { c->opacity_animation.target_opacity = c->unfocused_opacity; c->opacity_animation.time_started = get_now_in_ms(); - memcpy(c->opacity_animation.initial_border_color, - c->opacity_animation.current_border_color, - sizeof(c->opacity_animation.initial_border_color)); - c->opacity_animation.initial_opacity = c->opacity_animation.current_opacity; + if (c->opacity_animation.running) { + memcpy(c->opacity_animation.initial_border_color, + c->opacity_animation.current_border_color, + sizeof(c->opacity_animation.initial_border_color)); + c->opacity_animation.initial_opacity = + c->opacity_animation.current_opacity; + } else { + memcpy(c->opacity_animation.initial_border_color, border_color, + sizeof(c->opacity_animation.initial_border_color)); + memcpy(c->opacity_animation.current_border_color, border_color, + sizeof(c->opacity_animation.current_border_color)); + c->opacity_animation.initial_opacity = c->focused_opacity; + c->opacity_animation.current_opacity = c->focused_opacity; + } c->opacity_animation.running = true; } @@ -1116,12 +1130,7 @@ bool client_apply_focus_opacity(Client *c) { if (target_opacity > opacity) { target_opacity = opacity; } - memcpy(c->opacity_animation.current_border_color, - c->opacity_animation.target_border_color, - sizeof(c->opacity_animation.current_border_color)); - c->opacity_animation.current_opacity = target_opacity; client_set_opacity(c, target_opacity); - client_set_border_color(c, c->opacity_animation.target_border_color); } else if (animations && c->opacity_animation.running) { struct timespec now; @@ -1152,7 +1161,7 @@ bool client_apply_focus_opacity(Client *c) { eased_progress; } client_set_border_color(c, c->opacity_animation.current_border_color); - if (linear_progress >= 1.0f) { + if (linear_progress == 1.0f) { c->opacity_animation.running = false; } else { return true; diff --git a/src/config/parse_config.h b/src/config/parse_config.h index b795a81..b2535b1 100644 --- a/src/config/parse_config.h +++ b/src/config/parse_config.h @@ -101,13 +101,15 @@ typedef struct { } ConfigWinRule; typedef struct { - const char *name; // Monitor name - int32_t rr; // Rotate and flip (assume integer) - float scale; // Monitor scale factor - int32_t x, y; // Monitor position - int32_t width, height; // Monitor resolution - float refresh; // Refresh rate - int32_t vrr; // variable refresh rate + const char *name; // 显示器名称 + float mfact; // 主区域比例 + int32_t nmaster; // 主区域窗口数量 + const char *layout; // 布局名称（字符串） + int32_t rr; // 旋转和翻转（假设为整数） + float scale; // 显示器缩放比例 + int32_t x, y; // 显示器位置 + int32_t width, height; // 显示器分辨率 + float refresh; // 刷新率 } ConfigMonitorRule; // 修改后的宏定义 @@ -154,11 +156,9 @@ typedef struct { } GestureBinding; typedef struct { - int32_t id; - char *layout_name; + int32_t id; // 标签ID (1-9) + char *layout_name; // 布局名称 char *monitor_name; - float mfact; - int32_t nmaster; int32_t no_render_border; int32_t no_hide; } ConfigTagRule; @@ -232,7 +232,6 @@ typedef struct { int32_t center_when_single_stack; uint32_t hotarea_size; - uint32_t hotarea_corner; uint32_t enable_hotarea; uint32_t ov_tab_mode; int32_t overviewgappi; @@ -244,8 +243,6 @@ typedef struct { int32_t idleinhibit_ignore_visible; int32_t sloppyfocus; int32_t warpcursor; - int32_t drag_corner; - int32_t drag_warp_cursor; /* keyboard */ int32_t repeat_rate; @@ -347,6 +344,7 @@ typedef struct { int32_t single_scratchpad; int32_t xwayland_persistence; int32_t syncobj_enable; + int32_t adaptive_sync; int32_t allow_tearing; int32_t allow_shortcuts_inhibit; int32_t allow_lock_transparent; @@ -405,10 +403,7 @@ int32_t parse_double_array(const char *input, double *output, char *endptr; double val = strtod(token, &endptr); if (endptr == token || *endptr != '\0') { - fprintf( - stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid number in array: %s\n", - token); + fprintf(stderr, "Error: Invalid number in array: %s\n", token); free(dup); return -1; } @@ -460,9 +455,7 @@ void parse_bind_flags(const char *str, KeyBinding *kb) { kb->ispassapply = true; break; default: - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Unknown bind flag: %c\n", - suffix[i]); + // 忽略其他字符或可根据需要处理错误 break; } } @@ -550,58 +543,15 @@ static bool starts_with_ignore_case(const char *str, const char *prefix) { return true; } -static char *combine_args_until_empty(char *values[], int count) { - // find the first empty string - int first_empty = count; - for (int i = 0; i < count; i++) { - // check if it's empty: empty string or only contains "0" (initialized) - if (values[i][0] == '\0' || - (strlen(values[i]) == 1 && values[i][0] == '0')) { - first_empty = i; - break; - } - } - - // if there are no valid parameters, return an empty string - if (first_empty == 0) { - return strdup(""); - } - - // calculate the total length - size_t total_len = 0; - for (int i = 0; i < first_empty; i++) { - total_len += strlen(values[i]); - } - // plus the number of commas (first_empty-1 commas) - total_len += (first_empty - 1); - - // allocate memory and concatenate - char *combined = malloc(total_len + 1); - if (combined == NULL) { - return strdup(""); - } - - combined[0] = '\0'; - for (int i = 0; i < first_empty; i++) { - if (i > 0) { - strcat(combined, ","); - } - strcat(combined, values[i]); - } - - return combined; -} - uint32_t parse_mod(const char *mod_str) { if (!mod_str || !*mod_str) { - return UINT32_MAX; + return 0; } uint32_t mod = 0; char input_copy[256]; char *token; char *saveptr = NULL; - bool match_success = false; // 复制并转换为小写 strncpy(input_copy, mod_str, sizeof(input_copy) - 1); @@ -639,56 +589,35 @@ uint32_t parse_mod(const char *mod_str) { case 108: mod |= WLR_MODIFIER_ALT; break; - default: - fprintf(stderr, - "unknown modifier keycode: \033[1m\033[31m%s\n", - token); - break; } } } else { // 完整的 modifier 检查（保留原始所有检查项） - if (!strcmp(token, "super") || !strcmp(token, "super_l") || - !strcmp(token, "super_r")) { + if (strstr(token, "super") || strstr(token, "super_l") || + strstr(token, "super_r")) { mod |= WLR_MODIFIER_LOGO; - match_success = true; } - if (!strcmp(token, "ctrl") || !strcmp(token, "ctrl_l") || - !strcmp(token, "ctrl_r")) { + if (strstr(token, "ctrl") || strstr(token, "ctrl_l") || + strstr(token, "ctrl_r")) { mod |= WLR_MODIFIER_CTRL; - match_success = true; } - if (!strcmp(token, "shift") || !strcmp(token, "shift_l") || - !strcmp(token, "shift_r")) { + if (strstr(token, "shift") || strstr(token, "shift_l") || + strstr(token, "shift_r")) { mod |= WLR_MODIFIER_SHIFT; - match_success = true; } - if (!strcmp(token, "alt") || !strcmp(token, "alt_l") || - !strcmp(token, "alt_r")) { + if (strstr(token, "alt") || strstr(token, "alt_l") || + strstr(token, "alt_r")) { mod |= WLR_MODIFIER_ALT; - match_success = true; } - if (!strcmp(token, "hyper") || !strcmp(token, "hyper_l") || - !strcmp(token, "hyper_r")) { + if (strstr(token, "hyper") || strstr(token, "hyper_l") || + strstr(token, "hyper_r")) { mod |= WLR_MODIFIER_MOD3; - match_success = true; - } - if (!strcmp(token, "none")) { - match_success = true; } } token = strtok_r(NULL, "+", &saveptr); } - if (!match_success) { - mod = UINT32_MAX; - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Unknown modifier: " - "\033[1m\033[31m%s\n", - mod_str); - } - return mod; } @@ -779,9 +708,8 @@ KeySymCode parse_key(const char *key_str, bool isbindsym) { return kc; } - // change key string to keysym, case insensitive - xkb_keysym_t sym = - xkb_keysym_from_name(key_str, XKB_KEYSYM_CASE_INSENSITIVE); + // 普通键名直接转换 + xkb_keysym_t sym = xkb_keysym_from_name(key_str, XKB_KEYSYM_NO_FLAGS); if (isbindsym) { kc.type = KEY_TYPE_SYM; @@ -805,17 +733,13 @@ KeySymCode parse_key(const char *key_str, bool isbindsym) { // 无法解析的键名 kc.type = KEY_TYPE_SYM; kc.keysym = XKB_KEY_NoSymbol; - fprintf( - stderr, - "\033[1m\033[31m[ERROR]:\033[33m Unknown key: \033[1m\033[31m%s\n", - key_str); // keycode 字段保持为0 } return kc; } -uint32_t parse_button(const char *str) { +int32_t parse_button(const char *str) { // 将输入字符串转换为小写 char lowerStr[20]; int32_t i = 0; @@ -843,11 +767,7 @@ uint32_t parse_button(const char *str) { } else if (strcmp(lowerStr, "btn_task") == 0) { return BTN_TASK; } else { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Unknown button: " - "\033[1m\033[31m%s\n", - str); - return UINT32_MAX; + return 0; } } @@ -898,12 +818,6 @@ FuncType parse_func_name(char *func_name, Arg *arg, char *arg_value, char *arg_value5) { FuncType func = NULL; - (*arg).i = 0; - (*arg).i2 = 0; - (*arg).f = 0.0f; - (*arg).f2 = 0.0f; - (*arg).ui = 0; - (*arg).ui2 = 0; (*arg).v = NULL; (*arg).v2 = NULL; (*arg).v3 = NULL; @@ -1054,14 +968,10 @@ FuncType parse_func_name(char *func_name, Arg *arg, char *arg_value, (*arg).ui = atoi(arg_value); } else if (strcmp(func_name, "spawn") == 0) { func = spawn; - char *values[] = {arg_value, arg_value2, arg_value3, arg_value4, - arg_value5}; - (*arg).v = combine_args_until_empty(values, 5); + (*arg).v = strdup(arg_value); } else if (strcmp(func_name, "spawn_shell") == 0) { func = spawn_shell; - char *values[] = {arg_value, arg_value2, arg_value3, arg_value4, - arg_value5}; - (*arg).v = combine_args_until_empty(values, 5); + (*arg).v = strdup(arg_value); } else if (strcmp(func_name, "spawn_on_empty") == 0) { func = spawn_on_empty; (*arg).v = strdup(arg_value); // 注意：之后需要释放这个内存 @@ -1203,7 +1113,7 @@ void run_exec_once() { } } -bool parse_option(Config *config, char *key, char *value) { +void parse_option(Config *config, char *key, char *value) { if (strcmp(key, "keymode") == 0) { snprintf(config->keymode, sizeof(config->keymode), "%.27s", value); } else if (strcmp(key, "animations") == 0) { @@ -1254,70 +1164,53 @@ bool parse_option(Config *config, char *key, char *value) { int32_t num = parse_double_array(value, config->animation_curve_move, 4); if (num != 4) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to parse " - "animation_curve_move: %s\n", + fprintf(stderr, "Error: Failed to parse animation_curve_move: %s\n", value); - return false; } } else if (strcmp(key, "animation_curve_open") == 0) { int32_t num = parse_double_array(value, config->animation_curve_open, 4); if (num != 4) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to parse " - "animation_curve_open: %s\n", + fprintf(stderr, "Error: Failed to parse animation_curve_open: %s\n", value); - return false; } } else if (strcmp(key, "animation_curve_tag") == 0) { int32_t num = parse_double_array(value, config->animation_curve_tag, 4); if (num != 4) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to parse " - "animation_curve_tag: %s\n", + fprintf(stderr, "Error: Failed to parse animation_curve_tag: %s\n", value); - return false; } } else if (strcmp(key, "animation_curve_close") == 0) { int32_t num = parse_double_array(value, config->animation_curve_close, 4); if (num != 4) { fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to parse " - "animation_curve_close: %s\n", + "Error: Failed to parse animation_curve_close: %s\n", value); - return false; } } else if (strcmp(key, "animation_curve_focus") == 0) { int32_t num = parse_double_array(value, config->animation_curve_focus, 4); if (num != 4) { fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to parse " - "animation_curve_focus: %s\n", + "Error: Failed to parse animation_curve_focus: %s\n", value); - return false; } } else if (strcmp(key, "animation_curve_opafadein") == 0) { int32_t num = parse_double_array(value, config->animation_curve_opafadein, 4); if (num != 4) { fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to parse " - "animation_curve_opafadein: %s\n", + "Error: Failed to parse animation_curve_opafadein: %s\n", value); - return false; } } else if (strcmp(key, "animation_curve_opafadeout") == 0) { int32_t num = parse_double_array(value, config->animation_curve_opafadeout, 4); if (num != 4) { fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to parse " - "animation_curve_opafadeout: %s\n", + "Error: Failed to parse animation_curve_opafadeout: %s\n", value); - return false; } } else if (strcmp(key, "scroller_structs") == 0) { config->scroller_structs = atoi(value); @@ -1383,6 +1276,8 @@ bool parse_option(Config *config, char *key, char *value) { config->xwayland_persistence = atoi(value); } else if (strcmp(key, "syncobj_enable") == 0) { config->syncobj_enable = atoi(value); + } else if (strcmp(key, "adaptive_sync") == 0) { + config->adaptive_sync = atoi(value); } else if (strcmp(key, "allow_tearing") == 0) { config->allow_tearing = atoi(value); } else if (strcmp(key, "allow_shortcuts_inhibit") == 0) { @@ -1438,9 +1333,8 @@ bool parse_option(Config *config, char *key, char *value) { config->scroller_proportion_preset = (float *)malloc(float_count * sizeof(float)); if (!config->scroller_proportion_preset) { - fprintf(stderr, "\033[1m\033[31m[ERROR]:\033[33m Memory " - "allocation failed\n"); - return false; + fprintf(stderr, "Error: Memory allocation failed\n"); + return; } // 3. 解析 value 中的浮点数 @@ -1453,18 +1347,16 @@ bool parse_option(Config *config, char *key, char *value) { while (token != NULL && i < float_count) { if (sscanf(token, "%f", &value_set) != 1) { fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid float " - "value in " + "Error: Invalid float value in " "scroller_proportion_preset: %s\n", token); free(value_copy); free(config->scroller_proportion_preset); config->scroller_proportion_preset = NULL; - return false; + return; } - // Clamp the value between 0.0 and 1.0 (or your desired - // range) + // Clamp the value between 0.0 and 1.0 (or your desired range) config->scroller_proportion_preset[i] = CLAMP_FLOAT(value_set, 0.1f, 1.0f); @@ -1475,14 +1367,13 @@ bool parse_option(Config *config, char *key, char *value) { // 4. 检查解析的浮点数数量是否匹配 if (i != float_count) { fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid " - "scroller_proportion_preset format: %s\n", + "Error: Invalid scroller_proportion_preset format: %s\n", value); free(value_copy); free(config->scroller_proportion_preset); // 释放已分配的内存 config->scroller_proportion_preset = NULL; // 防止野指针 config->scroller_proportion_preset_count = 0; - return false; + return; } config->scroller_proportion_preset_count = float_count; @@ -1501,9 +1392,8 @@ bool parse_option(Config *config, char *key, char *value) { config->circle_layout = (char **)malloc(string_count * sizeof(char *)); memset(config->circle_layout, 0, string_count * sizeof(char *)); if (!config->circle_layout) { - fprintf(stderr, "\033[1m\033[31m[ERROR]:\033[33m Memory " - "allocation failed\n"); - return false; + fprintf(stderr, "Error: Memory allocation failed\n"); + return; } // 3. 解析 value 中的字符串 @@ -1518,9 +1408,7 @@ bool parse_option(Config *config, char *key, char *value) { config->circle_layout[i] = strdup(cleaned_token); if (!config->circle_layout[i]) { fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Memory allocation " - "failed for " - "string: %s\n", + "Error: Memory allocation failed for string: %s\n", token); // 释放之前分配的内存 for (int32_t j = 0; j < i; j++) { @@ -1530,7 +1418,7 @@ bool parse_option(Config *config, char *key, char *value) { free(value_copy); config->circle_layout = NULL; // 防止野指针 config->circle_layout_count = 0; - return false; + return; } token = strtok(NULL, ","); i++; @@ -1538,10 +1426,7 @@ bool parse_option(Config *config, char *key, char *value) { // 4. 检查解析的字符串数量是否匹配 if (i != string_count) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid circle_layout " - "format: %s\n", - value); + fprintf(stderr, "Error: Invalid circle_layout format: %s\n", value); // 释放之前分配的内存 for (int32_t j = 0; j < i; j++) { free(config->circle_layout[j]); @@ -1550,7 +1435,7 @@ bool parse_option(Config *config, char *key, char *value) { free(value_copy); config->circle_layout = NULL; // 防止野指针 config->circle_layout_count = 0; - return false; + return; } config->circle_layout_count = string_count; @@ -1568,8 +1453,6 @@ bool parse_option(Config *config, char *key, char *value) { config->center_when_single_stack = atoi(value); } else if (strcmp(key, "hotarea_size") == 0) { config->hotarea_size = atoi(value); - } else if (strcmp(key, "hotarea_corner") == 0) { - config->hotarea_corner = atoi(value); } else if (strcmp(key, "enable_hotarea") == 0) { config->enable_hotarea = atoi(value); } else if (strcmp(key, "ov_tab_mode") == 0) { @@ -1592,10 +1475,6 @@ bool parse_option(Config *config, char *key, char *value) { config->sloppyfocus = atoi(value); } else if (strcmp(key, "warpcursor") == 0) { config->warpcursor = atoi(value); - } else if (strcmp(key, "drag_corner") == 0) { - config->drag_corner = atoi(value); - } else if (strcmp(key, "drag_warp_cursor") == 0) { - config->drag_warp_cursor = atoi(value); } else if (strcmp(key, "smartgaps") == 0) { config->smartgaps = atoi(value); } else if (strcmp(key, "repeat_rate") == 0) { @@ -1657,12 +1536,7 @@ bool parse_option(Config *config, char *key, char *value) { } else if (strcmp(key, "rootcolor") == 0) { int64_t color = parse_color(value); if (color == -1) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid rootcolor " - "format: " - "%s\n", - value); - return false; + fprintf(stderr, "Error: Invalid rootcolor format: %s\n", value); } else { convert_hex_to_rgba(config->rootcolor, color); } @@ -1670,172 +1544,68 @@ bool parse_option(Config *config, char *key, char *value) { } else if (strcmp(key, "shadowscolor") == 0) { int64_t color = parse_color(value); if (color == -1) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid shadowscolor " - "format: %s\n", - value); - return false; + fprintf(stderr, "Error: Invalid shadowscolor format: %s\n", value); } else { convert_hex_to_rgba(config->shadowscolor, color); } } else if (strcmp(key, "bordercolor") == 0) { int64_t color = parse_color(value); if (color == -1) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid bordercolor " - "format: %s\n", - value); - return false; + fprintf(stderr, "Error: Invalid bordercolor format: %s\n", value); } else { convert_hex_to_rgba(config->bordercolor, color); } } else if (strcmp(key, "focuscolor") == 0) { int64_t color = parse_color(value); if (color == -1) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid focuscolor " - "format: %s\n", - value); - return false; + fprintf(stderr, "Error: Invalid focuscolor format: %s\n", value); } else { convert_hex_to_rgba(config->focuscolor, color); } } else if (strcmp(key, "maximizescreencolor") == 0) { int64_t color = parse_color(value); if (color == -1) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid " - "maximizescreencolor " - "format: %s\n", + fprintf(stderr, "Error: Invalid maximizescreencolor format: %s\n", value); - return false; } else { convert_hex_to_rgba(config->maximizescreencolor, color); } } else if (strcmp(key, "urgentcolor") == 0) { int64_t color = parse_color(value); if (color == -1) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid urgentcolor " - "format: %s\n", - value); - return false; + fprintf(stderr, "Error: Invalid urgentcolor format: %s\n", value); } else { convert_hex_to_rgba(config->urgentcolor, color); } } else if (strcmp(key, "scratchpadcolor") == 0) { int64_t color = parse_color(value); if (color == -1) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid " - "scratchpadcolor " - "format: %s\n", + fprintf(stderr, "Error: Invalid scratchpadcolor format: %s\n", value); - return false; } else { convert_hex_to_rgba(config->scratchpadcolor, color); } } else if (strcmp(key, "globalcolor") == 0) { int64_t color = parse_color(value); if (color == -1) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid globalcolor " - "format: %s\n", - value); - return false; + fprintf(stderr, "Error: Invalid globalcolor format: %s\n", value); } else { convert_hex_to_rgba(config->globalcolor, color); } } else if (strcmp(key, "overlaycolor") == 0) { int64_t color = parse_color(value); if (color == -1) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid overlaycolor " - "format: %s\n", - value); - return false; + fprintf(stderr, "Error: Invalid overlaycolor format: %s\n", value); } else { convert_hex_to_rgba(config->overlaycolor, color); } - } else if (strcmp(key, "monitorrule") == 0) { - config->monitor_rules = - realloc(config->monitor_rules, (config->monitor_rules_count + 1) * - sizeof(ConfigMonitorRule)); - if (!config->monitor_rules) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to allocate " - "memory for monitor rules\n"); - return false; - } - - ConfigMonitorRule *rule = - &config->monitor_rules[config->monitor_rules_count]; - memset(rule, 0, sizeof(ConfigMonitorRule)); - - // 设置默认值 - rule->name = NULL; - rule->rr = 0; - rule->scale = 1.0f; - rule->x = INT32_MAX; - rule->y = INT32_MAX; - rule->width = -1; - rule->height = -1; - rule->refresh = 0.0f; - rule->vrr = 0; - - bool parse_error = false; - char *token = strtok(value, ","); - while (token != NULL) { - char *colon = strchr(token, ':'); - if (colon != NULL) { - *colon = '\0'; - char *key = token; - char *val = colon + 1; - - trim_whitespace(key); - trim_whitespace(val); - - if (strcmp(key, "name") == 0) { - rule->name = strdup(val); - } else if (strcmp(key, "rr") == 0) { - rule->rr = CLAMP_INT(atoi(val), 0, 7); - } else if (strcmp(key, "scale") == 0) { - rule->scale = CLAMP_FLOAT(atof(val), 0.001f, 1000.0f); - } else if (strcmp(key, "x") == 0) { - rule->x = atoi(val); - } else if (strcmp(key, "y") == 0) { - rule->y = atoi(val); - } else if (strcmp(key, "width") == 0) { - rule->width = CLAMP_INT(atoi(val), 1, INT32_MAX); - } else if (strcmp(key, "height") == 0) { - rule->height = CLAMP_INT(atoi(val), 1, INT32_MAX); - } else if (strcmp(key, "refresh") == 0) { - rule->refresh = CLAMP_FLOAT(atof(val), 0.001f, 1000.0f); - } else if (strcmp(key, "vrr") == 0) { - rule->vrr = CLAMP_INT(atoi(val), 0, 1); - } else { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Unknown " - "monitor rule " - "option:\033[1m\033[31m %s\n", - key); - parse_error = true; - } - } - token = strtok(NULL, ","); - } - - config->monitor_rules_count++; - return !parse_error; } else if (strcmp(key, "tagrule") == 0) { config->tag_rules = realloc(config->tag_rules, (config->tag_rules_count + 1) * sizeof(ConfigTagRule)); if (!config->tag_rules) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to allocate " - "memory for tag rules\n"); - return false; + fprintf(stderr, "Error: Failed to allocate memory for tag rules\n"); + return; } ConfigTagRule *rule = &config->tag_rules[config->tag_rules_count]; @@ -1845,12 +1615,7 @@ bool parse_option(Config *config, char *key, char *value) { rule->id = 0; rule->layout_name = NULL; rule->monitor_name = NULL; - rule->nmaster = 0; - rule->mfact = 0.0f; - rule->no_render_border = 0; - rule->no_hide = 0; - bool parse_error = false; char *token = strtok(value, ","); while (token != NULL) { char *colon = strchr(token, ':'); @@ -1872,33 +1637,20 @@ bool parse_option(Config *config, char *key, char *value) { rule->no_render_border = CLAMP_INT(atoi(val), 0, 1); } else if (strcmp(key, "no_hide") == 0) { rule->no_hide = CLAMP_INT(atoi(val), 0, 1); - } else if (strcmp(key, "nmaster") == 0) { - rule->nmaster = CLAMP_INT(atoi(val), 1, 99); - } else if (strcmp(key, "mfact") == 0) { - rule->mfact = CLAMP_FLOAT(atof(val), 0.1f, 0.9f); - } else { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Unknown " - "tag rule " - "option:\033[1m\033[31m %s\n", - key); - parse_error = true; } } token = strtok(NULL, ","); } config->tag_rules_count++; - return !parse_error; } else if (strcmp(key, "layerrule") == 0) { config->layer_rules = realloc(config->layer_rules, (config->layer_rules_count + 1) * sizeof(ConfigLayerRule)); if (!config->layer_rules) { fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to allocate " - "memory for layer rules\n"); - return false; + "Error: Failed to allocate memory for layer rules\n"); + return; } ConfigLayerRule *rule = &config->layer_rules[config->layer_rules_count]; @@ -1912,7 +1664,6 @@ bool parse_option(Config *config, char *key, char *value) { rule->noanim = 0; rule->noshadow = 0; - bool parse_error = false; char *token = strtok(value, ","); while (token != NULL) { char *colon = strchr(token, ':'); @@ -1936,13 +1687,6 @@ bool parse_option(Config *config, char *key, char *value) { rule->noanim = CLAMP_INT(atoi(val), 0, 1); } else if (strcmp(key, "noshadow") == 0) { rule->noshadow = CLAMP_INT(atoi(val), 0, 1); - } else { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Unknown " - "layer rule " - "option:\033[1m\033[31m %s\n", - key); - parse_error = true; } } token = strtok(NULL, ","); @@ -1954,16 +1698,14 @@ bool parse_option(Config *config, char *key, char *value) { } config->layer_rules_count++; - return !parse_error; } else if (strcmp(key, "windowrule") == 0) { config->window_rules = realloc(config->window_rules, (config->window_rules_count + 1) * sizeof(ConfigWinRule)); if (!config->window_rules) { fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to allocate " - "memory for window rules\n"); - return false; + "Error: Failed to allocate memory for window rules\n"); + return; } ConfigWinRule *rule = &config->window_rules[config->window_rules_count]; @@ -2019,7 +1761,6 @@ bool parse_option(Config *config, char *key, char *value) { rule->globalkeybinding = (KeyBinding){0}; - bool parse_error = false; char *token = strtok(value, ","); while (token != NULL) { char *colon = strchr(token, ':'); @@ -2119,37 +1860,86 @@ bool parse_option(Config *config, char *key, char *value) { rule->globalkeybinding.mod = parse_mod(mod_str); rule->globalkeybinding.keysymcode = parse_key(keysym_str, false); - if (rule->globalkeybinding.mod == UINT32_MAX) { - return false; - } - if (rule->globalkeybinding.keysymcode.type == - KEY_TYPE_SYM && - rule->globalkeybinding.keysymcode.keysym == - XKB_KEY_NoSymbol) { - return false; - } - } else { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Unknown " - "window rule " - "option:\033[1m\033[31m %s\n", - key); - parse_error = true; } } token = strtok(NULL, ","); } config->window_rules_count++; - return !parse_error; + } else if (strcmp(key, "monitorrule") == 0) { + config->monitor_rules = + realloc(config->monitor_rules, (config->monitor_rules_count + 1) * + sizeof(ConfigMonitorRule)); + if (!config->monitor_rules) { + fprintf(stderr, + "Error: Failed to allocate memory for monitor rules\n"); + return; + } + + ConfigMonitorRule *rule = + &config->monitor_rules[config->monitor_rules_count]; + memset(rule, 0, sizeof(ConfigMonitorRule)); + + // 临时存储每个字段的原始字符串 + char raw_name[256], raw_layout[256]; + char raw_mfact[256], raw_nmaster[256], raw_rr[256]; + char raw_scale[256], raw_x[256], raw_y[256], raw_width[256], + raw_height[256], raw_refresh[256]; + + // 先读取所有字段为字符串 + int32_t parsed = + sscanf(value, + "%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255[" + "^,],%255[^,],%255[^,],%255[^,],%255[^,],%255s", + raw_name, raw_mfact, raw_nmaster, raw_layout, raw_rr, + raw_scale, raw_x, raw_y, raw_width, raw_height, raw_refresh); + + if (parsed == 11) { + // 修剪每个字段的空格 + trim_whitespace(raw_name); + trim_whitespace(raw_mfact); + trim_whitespace(raw_nmaster); + trim_whitespace(raw_layout); + trim_whitespace(raw_rr); + trim_whitespace(raw_scale); + trim_whitespace(raw_x); + trim_whitespace(raw_y); + trim_whitespace(raw_width); + trim_whitespace(raw_height); + trim_whitespace(raw_refresh); + + // 转换修剪后的字符串为特定类型 + rule->name = strdup(raw_name); + rule->layout = strdup(raw_layout); + rule->mfact = atof(raw_mfact); + rule->nmaster = atoi(raw_nmaster); + rule->rr = atoi(raw_rr); + rule->scale = atof(raw_scale); + rule->x = atoi(raw_x); + rule->y = atoi(raw_y); + rule->width = atoi(raw_width); + rule->height = atoi(raw_height); + rule->refresh = atof(raw_refresh); + + if (!rule->name || !rule->layout) { + if (rule->name) + free((void *)rule->name); + if (rule->layout) + free((void *)rule->layout); + fprintf(stderr, + "Error: Failed to allocate memory for monitor rule\n"); + return; + } + + config->monitor_rules_count++; + } else { + fprintf(stderr, "Error: Invalid monitorrule format: %s\n", value); + } } else if (strncmp(key, "env", 3) == 0) { char env_type[256], env_value[256]; if (sscanf(value, "%255[^,],%255[^\n]", env_type, env_value) < 2) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid bind format: " - "\033[1m\033[31m%s\n", - value); - return false; + fprintf(stderr, "Error: Invalid bind format: %s\n", value); + return; } trim_whitespace(env_type); trim_whitespace(env_value); @@ -2164,9 +1954,8 @@ bool parse_option(Config *config, char *key, char *value) { free(env->type); free(env->value); free(env); - fprintf(stderr, "\033[1m\033[31m[ERROR]:\033[33m Failed to " - "allocate memory for env\n"); - return false; + fprintf(stderr, "Error: Failed to allocate memory for env\n"); + return; } config->env[config->env_count] = env; @@ -2176,18 +1965,15 @@ bool parse_option(Config *config, char *key, char *value) { char **new_exec = realloc(config->exec, (config->exec_count + 1) * sizeof(char *)); if (!new_exec) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to allocate " - "memory for exec\n"); - return false; + fprintf(stderr, "Error: Failed to allocate memory for exec\n"); + return; } config->exec = new_exec; config->exec[config->exec_count] = strdup(value); if (!config->exec[config->exec_count]) { - fprintf(stderr, "\033[1m\033[31m[ERROR]:\033[33m Failed to " - "duplicate exec string\n"); - return false; + fprintf(stderr, "Error: Failed to duplicate exec string\n"); + return; } config->exec_count++; @@ -2197,19 +1983,15 @@ bool parse_option(Config *config, char *key, char *value) { char **new_exec_once = realloc( config->exec_once, (config->exec_once_count + 1) * sizeof(char *)); if (!new_exec_once) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to allocate " - "memory for exec_once\n"); - return false; + fprintf(stderr, "Error: Failed to allocate memory for exec_once\n"); + return; } config->exec_once = new_exec_once; config->exec_once[config->exec_once_count] = strdup(value); if (!config->exec_once[config->exec_once_count]) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to duplicate " - "exec_once string\n"); - return false; + fprintf(stderr, "Error: Failed to duplicate exec_once string\n"); + return; } config->exec_once_count++; @@ -2220,9 +2002,8 @@ bool parse_option(Config *config, char *key, char *value) { (config->key_bindings_count + 1) * sizeof(KeyBinding)); if (!config->key_bindings) { fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to allocate " - "memory for key bindings\n"); - return false; + "Error: Failed to allocate memory for key bindings\n"); + return; } KeyBinding *binding = &config->key_bindings[config->key_bindings_count]; @@ -2233,16 +2014,12 @@ bool parse_option(Config *config, char *key, char *value) { arg_value3[256] = "0\0", arg_value4[256] = "0\0", arg_value5[256] = "0\0"; if (sscanf(value, - "%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255[^" - ",],%255[" + "%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255[" "^,],%255[^\n]", mod_str, keysym_str, func_name, arg_value, arg_value2, arg_value3, arg_value4, arg_value5) < 3) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid bind format: " - "\033[1m\033[31m%s\n", - value); - return false; + fprintf(stderr, "Error: Invalid bind format: %s\n", value); + return; } trim_whitespace(mod_str); trim_whitespace(keysym_str); @@ -2269,21 +2046,13 @@ bool parse_option(Config *config, char *key, char *value) { binding->keysymcode = parse_key(keysym_str, binding->keysymcode.type == KEY_TYPE_SYM); binding->mod = parse_mod(mod_str); - binding->arg.i = 0; - binding->arg.i2 = 0; - binding->arg.f = 0.0f; - binding->arg.f2 = 0.0f; - binding->arg.ui = 0; - binding->arg.ui2 = 0; binding->arg.v = NULL; binding->arg.v2 = NULL; binding->arg.v3 = NULL; binding->func = parse_func_name(func_name, &binding->arg, arg_value, arg_value2, arg_value3, arg_value4, arg_value5); - if (!binding->func || binding->mod == UINT32_MAX || - (binding->keysymcode.type == KEY_TYPE_SYM && - binding->keysymcode.keysym == XKB_KEY_NoSymbol)) { + if (!binding->func) { if (binding->arg.v) { free(binding->arg.v); binding->arg.v = NULL; @@ -2296,13 +2065,7 @@ bool parse_option(Config *config, char *key, char *value) { free(binding->arg.v3); binding->arg.v3 = NULL; } - if (!binding->func) - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Unknown " - "dispatch in bind: " - "\033[1m\033[31m%s\n", - func_name); - return false; + fprintf(stderr, "Error: Unknown function in bind: %s\n", func_name); } else { config->key_bindings_count++; } @@ -2313,9 +2076,8 @@ bool parse_option(Config *config, char *key, char *value) { (config->mouse_bindings_count + 1) * sizeof(MouseBinding)); if (!config->mouse_bindings) { fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to allocate " - "memory for mouse bindings\n"); - return false; + "Error: Failed to allocate memory for mouse bindings\n"); + return; } MouseBinding *binding = @@ -2327,17 +2089,12 @@ bool parse_option(Config *config, char *key, char *value) { arg_value3[256] = "0\0", arg_value4[256] = "0\0", arg_value5[256] = "0\0"; if (sscanf(value, - "%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255[^" - ",],%255[" + "%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255[" "^,],%255[^\n]", mod_str, button_str, func_name, arg_value, arg_value2, arg_value3, arg_value4, arg_value5) < 3) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid mousebind " - "format: " - "%s\n", - value); - return false; + fprintf(stderr, "Error: Invalid mousebind format: %s\n", value); + return; } trim_whitespace(mod_str); trim_whitespace(button_str); @@ -2350,20 +2107,13 @@ bool parse_option(Config *config, char *key, char *value) { binding->mod = parse_mod(mod_str); binding->button = parse_button(button_str); - binding->arg.i = 0; - binding->arg.i2 = 0; - binding->arg.f = 0.0f; - binding->arg.f2 = 0.0f; - binding->arg.ui = 0; - binding->arg.ui2 = 0; binding->arg.v = NULL; binding->arg.v2 = NULL; binding->arg.v3 = NULL; binding->func = parse_func_name(func_name, &binding->arg, arg_value, arg_value2, arg_value3, arg_value4, arg_value5); - if (!binding->func || binding->mod == UINT32_MAX || - binding->button == UINT32_MAX) { + if (!binding->func) { if (binding->arg.v) { free(binding->arg.v); binding->arg.v = NULL; @@ -2376,13 +2126,8 @@ bool parse_option(Config *config, char *key, char *value) { free(binding->arg.v3); binding->arg.v3 = NULL; } - if (!binding->func) - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Unknown " - "dispatch in " - "mousebind: \033[1m\033[31m%s\n", - func_name); - return false; + fprintf(stderr, "Error: Unknown function in mousebind: %s\n", + func_name); } else { config->mouse_bindings_count++; } @@ -2392,9 +2137,8 @@ bool parse_option(Config *config, char *key, char *value) { (config->axis_bindings_count + 1) * sizeof(AxisBinding)); if (!config->axis_bindings) { fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to allocate " - "memory for axis bindings\n"); - return false; + "Error: Failed to allocate memory for axis bindings\n"); + return; } AxisBinding *binding = @@ -2406,16 +2150,12 @@ bool parse_option(Config *config, char *key, char *value) { arg_value3[256] = "0\0", arg_value4[256] = "0\0", arg_value5[256] = "0\0"; if (sscanf(value, - "%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255[^" - ",],%255[" + "%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255[" "^,],%255[^\n]", mod_str, dir_str, func_name, arg_value, arg_value2, arg_value3, arg_value4, arg_value5) < 3) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid axisbind " - "format: %s\n", - value); - return false; + fprintf(stderr, "Error: Invalid axisbind format: %s\n", value); + return; } trim_whitespace(mod_str); @@ -2436,7 +2176,7 @@ bool parse_option(Config *config, char *key, char *value) { parse_func_name(func_name, &binding->arg, arg_value, arg_value2, arg_value3, arg_value4, arg_value5); - if (!binding->func || binding->mod == UINT32_MAX) { + if (!binding->func) { if (binding->arg.v) { free(binding->arg.v); binding->arg.v = NULL; @@ -2449,13 +2189,8 @@ bool parse_option(Config *config, char *key, char *value) { free(binding->arg.v3); binding->arg.v3 = NULL; } - if (!binding->func) - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Unknown " - "dispatch in " - "axisbind: \033[1m\033[31m%s\n", - func_name); - return false; + fprintf(stderr, "Error: Unknown function in axisbind: %s\n", + func_name); } else { config->axis_bindings_count++; } @@ -2466,9 +2201,8 @@ bool parse_option(Config *config, char *key, char *value) { sizeof(SwitchBinding)); if (!config->switch_bindings) { fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to allocate " - "memory for switch bindings\n"); - return false; + "Error: Failed to allocate memory for switch bindings\n"); + return; } SwitchBinding *binding = @@ -2480,16 +2214,12 @@ bool parse_option(Config *config, char *key, char *value) { arg_value3[256] = "0\0", arg_value4[256] = "0\0", arg_value5[256] = "0\0"; if (sscanf(value, - "%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255[^" - ",],%255[" + "%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255[" "^\n]", fold_str, func_name, arg_value, arg_value2, arg_value3, arg_value4, arg_value5) < 3) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid switchbind " - "format: %s\n", - value); - return false; + fprintf(stderr, "Error: Invalid switchbind format: %s\n", value); + return; } trim_whitespace(fold_str); trim_whitespace(func_name); @@ -2517,13 +2247,8 @@ bool parse_option(Config *config, char *key, char *value) { free(binding->arg.v3); binding->arg.v3 = NULL; } - - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Unknown dispatch in " - "switchbind: " - "\033[1m\033[31m%s\n", + fprintf(stderr, "Error: Unknown function in switchbind: %s\n", func_name); - return false; } else { config->switch_bindings_count++; } @@ -2534,9 +2259,8 @@ bool parse_option(Config *config, char *key, char *value) { (config->gesture_bindings_count + 1) * sizeof(GestureBinding)); if (!config->gesture_bindings) { fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Failed to allocate " - "memory for axis gesturebind\n"); - return false; + "Error: Failed to allocate memory for axis gesturebind\n"); + return; } GestureBinding *binding = @@ -2548,16 +2272,12 @@ bool parse_option(Config *config, char *key, char *value) { arg_value3[256] = "0\0", arg_value4[256] = "0\0", arg_value5[256] = "0\0"; if (sscanf(value, - "%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255[^" - ",],%255[" + "%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255[^,],%255[" "^,],%255[^,],%255[^\n]", mod_str, motion_str, fingers_count_str, func_name, arg_value, arg_value2, arg_value3, arg_value4, arg_value5) < 4) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid gesturebind " - "format: %s\n", - value); - return false; + fprintf(stderr, "Error: Invalid gesturebind format: %s\n", value); + return; } trim_whitespace(mod_str); @@ -2573,12 +2293,6 @@ bool parse_option(Config *config, char *key, char *value) { binding->mod = parse_mod(mod_str); binding->motion = parse_direction(motion_str); binding->fingers_count = atoi(fingers_count_str); - binding->arg.i = 0; - binding->arg.i2 = 0; - binding->arg.f = 0.0f; - binding->arg.f2 = 0.0f; - binding->arg.ui = 0; - binding->arg.ui2 = 0; binding->arg.v = NULL; binding->arg.v2 = NULL; binding->arg.v3 = NULL; @@ -2586,7 +2300,7 @@ bool parse_option(Config *config, char *key, char *value) { parse_func_name(func_name, &binding->arg, arg_value, arg_value2, arg_value3, arg_value4, arg_value5); - if (!binding->func || binding->mod == UINT32_MAX) { + if (!binding->func) { if (binding->arg.v) { free(binding->arg.v); binding->arg.v = NULL; @@ -2599,13 +2313,8 @@ bool parse_option(Config *config, char *key, char *value) { free(binding->arg.v3); binding->arg.v3 = NULL; } - if (!binding->func) - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Unknown " - "dispatch in " - "axisbind: \033[1m\033[31m%s\n", - func_name); - return false; + fprintf(stderr, "Error: Unknown function in axisbind: %s\n", + func_name); } else { config->gesture_bindings_count++; } @@ -2613,30 +2322,22 @@ bool parse_option(Config *config, char *key, char *value) { } else if (strncmp(key, "source", 6) == 0) { parse_config_file(config, value); } else { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Unknown keyword: " - "\033[1m\033[31m%s\n", - key); - return false; + fprintf(stderr, "Error: Unknown key: %s\n", key); } - - return true; } -bool parse_config_line(Config *config, const char *line) { +void parse_config_line(Config *config, const char *line) { char key[256], value[256]; if (sscanf(line, "%255[^=]=%255[^\n]", key, value) != 2) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m Invalid line format: %s", - line); - return false; + // fprintf(stderr, "Error: Invalid line format: %s\n", line); + return; } // Then trim each part separately trim_whitespace(key); trim_whitespace(value); - return parse_option(config, key, value); + parse_option(config, key, value); } void parse_config_file(Config *config, const char *file_path) { @@ -2655,9 +2356,7 @@ void parse_config_file(Config *config, const char *file_path) { } else { const char *home = getenv("HOME"); if (!home) { - fprintf(stderr, - "\033[1m\033[31m[ERROR]:\033[33m HOME environment " - "variable not set.\n"); + fprintf(stderr, "Error: HOME environment variable not set.\n"); return; } snprintf(full_path, sizeof(full_path), "%s/.config/mango/%s", home, @@ -2671,8 +2370,7 @@ void parse_config_file(Config *config, const char *file_path) { const char *home = getenv("HOME"); if (!home) { - fprintf(stderr, "\033[1m\033[31m[ERROR]:\033[33m HOME environment " - "variable not set.\n"); + fprintf(stderr, "Error: HOME environment variable not set.\n"); return; } snprintf(full_path, sizeof(full_path), "%s%s", home, file_path + 1); @@ -2684,29 +2382,16 @@ void parse_config_file(Config *config, const char *file_path) { } if (!file) { - fprintf(stderr, - "\033[1;31m\033[1;33m[ERROR]:\033[0m Failed to open " - "config file: %s\n", - file_path); + perror("Error opening file"); return; } char line[512]; - bool parse_correct = true; - uint32_t line_count = 0; while (fgets(line, sizeof(line), file)) { - line_count++; if (line[0] == '#' || line[0] == '\n') { continue; } - parse_correct = parse_config_line(config, line); - if (!parse_correct) { - fprintf(stderr, - "\033[1;31m╰─\033[1;33m[Index]\033[0m " - "\033[1;36m%s\033[0m:\033[1;35m%d\033[0m\n" - " \033[1;36m╰─\033[0;33m%s\033[0m\n\n", - file_path, line_count, line); - } + parse_config_line(config, line); } fclose(file); @@ -2792,6 +2477,18 @@ void free_config(void) { config.window_rules_count = 0; } + // 释放 monitor_rules + if (config.monitor_rules) { + for (int32_t i = 0; i < config.monitor_rules_count; i++) { + ConfigMonitorRule *rule = &config.monitor_rules[i]; + free((void *)rule->name); + free((void *)rule->layout); + } + free(config.monitor_rules); + config.monitor_rules = NULL; + config.monitor_rules_count = 0; + } + // 释放 key_bindings if (config.key_bindings) { for (i = 0; i < config.key_bindings_count; i++) { @@ -2910,17 +2607,6 @@ void free_config(void) { config.tag_rules_count = 0; } - // 释放 monitor_rules - if (config.monitor_rules) { - for (int32_t i = 0; i < config.monitor_rules_count; i++) { - if (config.monitor_rules[i].name) - free((void *)config.monitor_rules[i].name); - } - free(config.monitor_rules); - config.monitor_rules = NULL; - config.monitor_rules_count = 0; - } - // 释放 layer_rules if (config.layer_rules) { for (int32_t i = 0; i < config.layer_rules_count; i++) { @@ -3052,7 +2738,6 @@ void override_config(void) { // 概述模式设置 hotarea_size = CLAMP_INT(config.hotarea_size, 1, 1000); - hotarea_corner = CLAMP_INT(config.hotarea_corner, 0, 3); enable_hotarea = CLAMP_INT(config.enable_hotarea, 0, 1); ov_tab_mode = CLAMP_INT(config.ov_tab_mode, 0, 1); overviewgappi = CLAMP_INT(config.overviewgappi, 0, 1000); @@ -3061,6 +2746,7 @@ void override_config(void) { // 杂项设置 xwayland_persistence = CLAMP_INT(config.xwayland_persistence, 0, 1); syncobj_enable = CLAMP_INT(config.syncobj_enable, 0, 1); + adaptive_sync = CLAMP_INT(config.adaptive_sync, 0, 1); allow_tearing = CLAMP_INT(config.allow_tearing, 0, 2); allow_shortcuts_inhibit = CLAMP_INT(config.allow_shortcuts_inhibit, 0, 1); allow_lock_transparent = CLAMP_INT(config.allow_lock_transparent, 0, 1); @@ -3071,8 +2757,6 @@ void override_config(void) { CLAMP_INT(config.idleinhibit_ignore_visible, 0, 1); sloppyfocus = CLAMP_INT(config.sloppyfocus, 0, 1); warpcursor = CLAMP_INT(config.warpcursor, 0, 1); - drag_corner = CLAMP_INT(config.drag_corner, 0, 4); - drag_warp_cursor = CLAMP_INT(config.drag_warp_cursor, 0, 1); focus_cross_monitor = CLAMP_INT(config.focus_cross_monitor, 0, 1); exchange_cross_monitor = CLAMP_INT(config.exchange_cross_monitor, 0, 1); scratchpad_cross_monitor = CLAMP_INT(config.scratchpad_cross_monitor, 0, 1); @@ -3215,12 +2899,11 @@ void set_value_default() { config.numlockon = numlockon; // 是否打开右边小键盘 - config.ov_tab_mode = ov_tab_mode; // alt tab切换模式 - config.hotarea_size = hotarea_size; // 热区大小,10x10 - config.hotarea_corner = hotarea_corner; + config.ov_tab_mode = ov_tab_mode; // alt tab切换模式 + config.hotarea_size = hotarea_size; // 热区大小,10x10 config.enable_hotarea = enable_hotarea; // 是否启用鼠标热区 - config.smartgaps = smartgaps; /* 1 means no outer gap when there is - only one window */ + config.smartgaps = + smartgaps; /* 1 means no outer gap when there is only one window */ config.sloppyfocus = sloppyfocus; /* focus follows mouse */ config.gappih = gappih; /* horiz inner gap between windows */ config.gappiv = gappiv; /* vert inner gap between windows */ @@ -3248,6 +2931,7 @@ void set_value_default() { config.single_scratchpad = single_scratchpad; config.xwayland_persistence = xwayland_persistence; config.syncobj_enable = syncobj_enable; + config.adaptive_sync = adaptive_sync; config.allow_tearing = allow_tearing; config.allow_shortcuts_inhibit = allow_shortcuts_inhibit; config.allow_lock_transparent = allow_lock_transparent; @@ -3270,8 +2954,6 @@ void set_value_default() { config.cursor_hide_timeout = cursor_hide_timeout; config.warpcursor = warpcursor; /* Warp cursor to focused client */ - config.drag_corner = drag_corner; - config.drag_warp_cursor = drag_warp_cursor; config.repeat_rate = repeat_rate; config.repeat_delay = repeat_delay; @@ -3472,8 +3154,7 @@ void reset_blur_params(void) { void reapply_monitor_rules(void) { ConfigMonitorRule *mr; Monitor *m = NULL; - int32_t ji, vrr; - int32_t mx, my; + int32_t ji, jk; struct wlr_output_state state; struct wlr_output_mode *internal_mode = NULL; wlr_output_state_init(&state); @@ -3488,11 +3169,20 @@ void reapply_monitor_rules(void) { break; mr = &config.monitor_rules[ji]; - if (regex_match(mr->name, m->wlr_output->name)) { + if (!mr->name || regex_match(mr->name, m->wlr_output->name)) { - mx = mr->x == INT32_MAX ? m->m.x : mr->x; - my = mr->y == INT32_MAX ? m->m.y : mr->y; - vrr = mr->vrr >= 0 ? mr->vrr : 0; + m->mfact = mr->mfact; + m->nmaster = mr->nmaster; + m->m.x = mr->x; + m->m.y = mr->y; + + if (mr->layout) { + for (jk = 0; jk < LENGTH(layouts); jk++) { + if (strcmp(layouts[jk].name, mr->layout) == 0) { + m->lt = &layouts[jk]; + } + } + } if (mr->width > 0 && mr->height > 0 && mr->refresh > 0) { internal_mode = get_nearest_output_mode( @@ -3506,18 +3196,17 @@ void reapply_monitor_rules(void) { } } - if (vrr) { - enable_adaptive_sync(m, &state); - } else { - wlr_output_state_set_adaptive_sync_enabled(&state, false); - } - wlr_output_state_set_scale(&state, mr->scale); wlr_output_state_set_transform(&state, mr->rr); - wlr_output_layout_add(output_layout, m->wlr_output, mx, my); + wlr_output_layout_add(output_layout, m->wlr_output, mr->x, + mr->y); } } + if (adaptive_sync) { + enable_adaptive_sync(m, &state); + } + wlr_output_commit_state(m->wlr_output, &state); wlr_output_state_finish(&state); updatemons(NULL, NULL); @@ -3620,12 +3309,6 @@ void reapply_master(void) { void parse_tagrule(Monitor *m) { int32_t i, jk; ConfigTagRule tr; - Client *c = NULL; - - for (i = 0; i <= LENGTH(tags); i++) { - m->pertag->nmasters[i] = default_nmaster; - m->pertag->mfacts[i] = default_mfact; - } for (i = 0; i < config.tag_rules_count; i++) { @@ -3642,23 +3325,7 @@ void parse_tagrule(Monitor *m) { } } - if (tr.no_hide >= 0) - m->pertag->no_hide[tr.id] = tr.no_hide; - if (tr.nmaster >= 1) - m->pertag->nmasters[tr.id] = tr.nmaster; - if (tr.mfact > 0.0f) - m->pertag->mfacts[tr.id] = tr.mfact; - if (tr.no_render_border >= 0) - m->pertag->no_render_border[tr.id] = tr.no_render_border; - } - } - - for (i = 1; i <= LENGTH(tags); i++) { - wl_list_for_each(c, &clients, link) { - if ((c->tags & (1 << (i - 1)) & TAGMASK) && ISTILED(c)) { - if (m->pertag->mfacts[i] > 0.0f) - c->master_mfact_per = m->pertag->mfacts[i]; - } + m->pertag->no_hide[tr.id] = tr.no_hide; } } } diff --git a/src/config/preset.h b/src/config/preset.h index ae4424f..6f3cd89 100644 --- a/src/config/preset.h +++ b/src/config/preset.h @@ -47,9 +47,8 @@ int32_t log_level = WLR_ERROR; uint32_t numlockon = 0; // 是否打开右边小键盘 uint32_t capslock = 0; // 是否启用快捷键 -uint32_t ov_tab_mode = 0; // alt tab切换模式 -uint32_t hotarea_size = 10; // 热区大小,10x10 -uint32_t hotarea_corner = BOTTOM_LEFT; +uint32_t ov_tab_mode = 0; // alt tab切换模式 +uint32_t hotarea_size = 10; // 热区大小,10x10 uint32_t enable_hotarea = 1; // 是否启用鼠标热区 int32_t smartgaps = 0; /* 1 means no outer gap when there is only one window */ int32_t sloppyfocus = 1; /* focus follows mouse */ @@ -63,7 +62,7 @@ float scratchpad_height_ratio = 0.9; int32_t scroller_structs = 20; float scroller_default_proportion = 0.9; float scroller_default_proportion_single = 1.0; -int32_t scroller_ignore_proportion_single = 1; +int32_t scroller_ignore_proportion_single = 0; int32_t scroller_focus_center = 0; int32_t scroller_prefer_center = 0; int32_t focus_cross_monitor = 0; @@ -102,14 +101,12 @@ int32_t overviewgappo = 30; /* overview时 窗口与窗口 缝隙大小 */ * behavior */ float fullscreen_bg[] = {0.1, 0.1, 0.1, 1.0}; -int32_t warpcursor = 1; -int32_t drag_corner = 3; -int32_t drag_warp_cursor = 1; +int32_t warpcursor = 1; /* Warp cursor to focused client */ int32_t xwayland_persistence = 1; /* xwayland persistence */ int32_t syncobj_enable = 0; +int32_t adaptive_sync = 0; int32_t allow_lock_transparent = 0; -double drag_tile_refresh_interval = 16.0; -double drag_floating_refresh_interval = 8.0; +double drag_refresh_interval = 16.0; int32_t allow_tearing = TEARING_DISABLED; int32_t allow_shortcuts_inhibit = SHORTCUTS_INHIBIT_ENABLE; @@ -236,3 +233,4 @@ double shadows_blur = 15; int32_t shadows_position_x = 0; int32_t shadows_position_y = 0; float shadowscolor[] = COLOR(0x000000ff); +; diff --git a/src/dispatch/bind_define.h b/src/dispatch/bind_define.h index c0e51dc..95d365c 100644 --- a/src/dispatch/bind_define.h +++ b/src/dispatch/bind_define.h @@ -338,9 +338,6 @@ int32_t killclient(const Arg *arg) { } int32_t moveresize(const Arg *arg) { - const char *cursors[] = {"nw-resize", "ne-resize", "sw-resize", - "se-resize"}; - if (cursor_mode != CurNormal && cursor_mode != CurPressed) return 0; xytonode(cursor->x, cursor->y, NULL, &grabc, NULL, NULL, NULL); @@ -366,29 +363,10 @@ int32_t moveresize(const Arg *arg) { /* Doesn't work for X11 output - the next absolute motion event * returns the cursor to where it started */ if (grabc->isfloating) { - rzcorner = drag_corner; - grabcx = (int)round(cursor->x); - grabcy = (int)round(cursor->y); - if (rzcorner == 4) - /* identify the closest corner index */ - rzcorner = (grabcx - grabc->geom.x < - grabc->geom.x + grabc->geom.width - grabcx - ? 0 - : 1) + - (grabcy - grabc->geom.y < - grabc->geom.y + grabc->geom.height - grabcy - ? 0 - : 2); - - if (drag_warp_cursor) { - grabcx = rzcorner & 1 ? grabc->geom.x + grabc->geom.width - : grabc->geom.x; - grabcy = rzcorner & 2 ? grabc->geom.y + grabc->geom.height - : grabc->geom.y; - wlr_cursor_warp_closest(cursor, NULL, grabcx, grabcy); - } - - wlr_cursor_set_xcursor(cursor, cursor_mgr, cursors[rzcorner]); + wlr_cursor_warp_closest(cursor, NULL, + grabc->geom.x + grabc->geom.width, + grabc->geom.y + grabc->geom.height); + wlr_cursor_set_xcursor(cursor, cursor_mgr, "bottom_right_corner"); } else { wlr_cursor_set_xcursor(cursor, cursor_mgr, "grab"); } @@ -1444,14 +1422,9 @@ int32_t viewcrossmon(const Arg *arg) { } int32_t tagcrossmon(const Arg *arg) { - if (!selmon || !selmon->sel) + if (!selmon->sel) return 0; - if (regex_match(selmon->wlr_output->name, arg->v)) { - tag_client(arg, selmon->sel); - return 0; - } - tagmon(&(Arg){.ui = arg->ui, .i = UNDIR, .v = arg->v}); return 0; } diff --git a/src/fetch/client.h b/src/fetch/client.h index bf30e17..e843d69 100644 --- a/src/fetch/client.h +++ b/src/fetch/client.h @@ -12,9 +12,7 @@ bool check_hit_no_border(Client *c) { } } - if (no_border_when_single && c && c->mon && - ((ISSCROLLTILED(c) && c->mon->visible_scroll_tiling_clients == 1) || - c->mon->visible_clients == 1)) { + if (no_border_when_single && c && c->mon && c->mon->visible_clients == 1) { hit_no_border = true; } return hit_no_border; diff --git a/src/layout/arrange.h b/src/layout/arrange.h index 3721364..6ff1dd2 100644 --- a/src/layout/arrange.h +++ b/src/layout/arrange.h @@ -210,7 +210,7 @@ void resize_tile_master_horizontal(Client *grabc, bool isdrag, int32_t offsetx, } if (last_apply_drap_time == 0 || - time - last_apply_drap_time > drag_tile_refresh_interval) { + time - last_apply_drap_time > drag_refresh_interval) { arrange(grabc->mon, false, false); last_apply_drap_time = time; } @@ -367,7 +367,7 @@ void resize_tile_master_vertical(Client *grabc, bool isdrag, int32_t offsetx, } if (last_apply_drap_time == 0 || - time - last_apply_drap_time > drag_tile_refresh_interval) { + time - last_apply_drap_time > drag_refresh_interval) { arrange(grabc->mon, false, false); last_apply_drap_time = time; } @@ -548,7 +548,7 @@ void resize_tile_scroller(Client *grabc, bool isdrag, int32_t offsetx, } if (last_apply_drap_time == 0 || - time - last_apply_drap_time > drag_tile_refresh_interval) { + time - last_apply_drap_time > drag_refresh_interval) { arrange(grabc->mon, false, false); last_apply_drap_time = time; } diff --git a/src/layout/horizontal.h b/src/layout/horizontal.h index e1a335d..87b6033 100644 --- a/src/layout/horizontal.h +++ b/src/layout/horizontal.h @@ -117,7 +117,6 @@ void deck(Monitor *m) { Client *c = NULL; Client *fc = NULL; float mfact; - uint32_t nmasters = m->pertag->nmasters[m->pertag->curtag]; int32_t cur_gappih = enablegaps ? m->gappih : 0; int32_t cur_gappoh = enablegaps ? m->gappoh : 0; @@ -143,8 +142,8 @@ void deck(Monitor *m) { : m->pertag->mfacts[m->pertag->curtag]; // Calculate master width including outer gaps - if (n > nmasters) - mw = nmasters ? round((m->w.width - 2 * cur_gappoh) * mfact) : 0; + if (n > m->nmaster) + mw = m->nmaster ? round((m->w.width - 2 * cur_gappoh) * mfact) : 0; else mw = m->w.width - 2 * cur_gappoh; @@ -152,7 +151,7 @@ void deck(Monitor *m) { wl_list_for_each(c, &clients, link) { if (!VISIBLEON(c, m) || !ISTILED(c)) continue; - if (i < nmasters) { + if (i < m->nmaster) { c->master_mfact_per = mfact; // Master area clients resize( @@ -161,7 +160,7 @@ void deck(Monitor *m) { .y = m->w.y + cur_gappov + my, .width = mw, .height = (m->w.height - 2 * cur_gappov - my) / - (MIN(n, nmasters) - i)}, + (MIN(n, m->nmaster) - i)}, 0); my += c->geom.height; } else { diff --git a/src/layout/layout.h b/src/layout/layout.h index f896ac2..169ab11 100644 --- a/src/layout/layout.h +++ b/src/layout/layout.h @@ -17,8 +17,8 @@ static void tgmix(Monitor *m); Layout overviewlayout = {"󰃇", overview, "overview"}; enum { - TILE, SCROLLER, + TILE, GRID, MONOCLE, DECK, @@ -34,8 +34,8 @@ enum { Layout layouts[] = { // 最少两个,不能删除少于两个 /* symbol arrange function name */ - {"T", tile, "tile", TILE}, // 平铺布局 {"S", scroller, "scroller", SCROLLER}, // 滚动布局 + {"T", tile, "tile", TILE}, // 平铺布局 {"G", grid, "grid", GRID}, // 格子布局 {"M", monocle, "monocle", MONOCLE}, // 单屏布局 {"K", deck, "deck", DECK}, // 卡片布局 diff --git a/src/layout/vertical.h b/src/layout/vertical.h index f7bd442..2c2dc66 100644 --- a/src/layout/vertical.h +++ b/src/layout/vertical.h @@ -110,7 +110,6 @@ void vertical_deck(Monitor *m) { Client *c = NULL; Client *fc = NULL; float mfact; - uint32_t nmasters = m->pertag->nmasters[m->pertag->curtag]; int32_t cur_gappiv = enablegaps ? m->gappiv : 0; int32_t cur_gappoh = enablegaps ? m->gappoh : 0; @@ -135,8 +134,8 @@ void vertical_deck(Monitor *m) { mfact = fc->master_mfact_per > 0.0f ? fc->master_mfact_per : m->pertag->mfacts[m->pertag->curtag]; - if (n > nmasters) - mh = nmasters ? round((m->w.height - 2 * cur_gappov) * mfact) : 0; + if (n > m->nmaster) + mh = m->nmaster ? round((m->w.height - 2 * cur_gappov) * mfact) : 0; else mh = m->w.height - 2 * cur_gappov; @@ -144,13 +143,13 @@ void vertical_deck(Monitor *m) { wl_list_for_each(c, &clients, link) { if (!VISIBLEON(c, m) || !ISTILED(c)) continue; - if (i < nmasters) { + if (i < m->nmaster) { resize( c, (struct wlr_box){.x = m->w.x + cur_gappoh + mx, .y = m->w.y + cur_gappov, .width = (m->w.width - 2 * cur_gappoh - mx) / - (MIN(n, nmasters) - i), + (MIN(n, m->nmaster) - i), .height = mh}, 0); mx += c->geom.width; diff --git a/src/mango.c b/src/mango.c index 591d4f6..3a2331d 100644 --- a/src/mango.c +++ b/src/mango.c @@ -143,8 +143,6 @@ #define BAKED_POINTS_COUNT 256 /* enums */ -enum { TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT }; - enum { VERTICAL, HORIZONTAL }; enum { SWIPE_UP, SWIPE_DOWN, SWIPE_LEFT, SWIPE_RIGHT }; enum { CurNormal, CurPressed, CurMove, CurResize }; /* cursor */ @@ -480,7 +478,6 @@ typedef struct { char *animation_type_open; char *animation_type_close; bool need_output_flush; - bool being_unmapped; } LayerSurface; typedef struct { @@ -503,8 +500,11 @@ struct Monitor { struct wlr_box m; /* monitor area, layout-relative */ struct wlr_box w; /* window area, layout-relative */ struct wl_list layers[4]; /* LayerSurface::link */ + const Layout *lt; uint32_t seltags; uint32_t tagset[2]; + double mfact; + int32_t nmaster; struct wl_list dwl_ipc_outputs; int32_t gappih; /* horizontal gap between windows */ @@ -593,7 +593,7 @@ static void cursorwarptohint(void); static void destroydecoration(struct wl_listener *listener, void *data); static void destroydragicon(struct wl_listener *listener, void *data); static void destroyidleinhibitor(struct wl_listener *listener, void *data); -static void destroylayernodenotify(struct wl_listener *listener, void *data); +static void destroylayersurfacenotify(struct wl_listener *listener, void *data); static void destroylock(SessionLock *lock, int32_t unlocked); static void destroylocksurface(struct wl_listener *listener, void *data); static void destroynotify(struct wl_listener *listener, void *data); @@ -841,7 +841,6 @@ static struct wl_list inputdevices; static struct wl_list keyboard_shortcut_inhibitors; static uint32_t cursor_mode; static Client *grabc; -static int32_t rzcorner; static int32_t grabcx, grabcy; /* client-relative */ static int32_t drag_begin_cursorx, drag_begin_cursory; /* client-relative */ static bool start_drag_window = false; @@ -898,7 +897,6 @@ struct Pertag { int32_t nmasters[LENGTH(tags) + 1]; /* number of windows in master area */ float mfacts[LENGTH(tags) + 1]; /* mfacts per tag */ bool no_hide[LENGTH(tags) + 1]; /* no_hide per tag */ - bool no_render_border[LENGTH(tags) + 1]; /* no_render_border per tag */ const Layout *ltidxs[LENGTH(tags) + 1]; /* matrix of tags and layouts indexes */ }; @@ -969,6 +967,7 @@ static struct wlr_xwayland *xwayland; void client_change_mon(Client *c, Monitor *m) { setmon(c, m, c->tags, true); + reset_foreign_tolevel(c); if (c->isfloating) { c->float_geom = c->geom = setclient_coordinate_center(c, c->mon, c->geom, 0, 0); @@ -1070,9 +1069,6 @@ void swallow(Client *c, Client *w) { c->tags = w->tags; c->geom = w->geom; c->float_geom = w->float_geom; - c->stack_inner_per = w->stack_inner_per; - c->master_inner_per = w->master_inner_per; - c->master_mfact_per = w->master_mfact_per; c->scroller_proportion = w->scroller_proportion; c->next_in_stack = w->next_in_stack; c->prev_in_stack = w->prev_in_stack; @@ -1220,59 +1216,17 @@ void toggle_hotarea(int32_t x_root, int32_t y_root) { if (grabc) return; - // 根据热角位置计算不同的热区坐标 - unsigned hx, hy; + unsigned hx = selmon->m.x + hotarea_size; + unsigned hy = selmon->m.y + selmon->m.height - hotarea_size; - switch (hotarea_corner) { - case BOTTOM_RIGHT: // 右下角 - hx = selmon->m.x + selmon->m.width - hotarea_size; - hy = selmon->m.y + selmon->m.height - hotarea_size; - break; - case TOP_LEFT: // 左上角 - hx = selmon->m.x + hotarea_size; - hy = selmon->m.y + hotarea_size; - break; - case TOP_RIGHT: // 右上角 - hx = selmon->m.x + selmon->m.width - hotarea_size; - hy = selmon->m.y + hotarea_size; - break; - case BOTTOM_LEFT: // 左下角（默认） - default: - hx = selmon->m.x + hotarea_size; - hy = selmon->m.y + selmon->m.height - hotarea_size; - break; - } - - // 判断鼠标是否在热区内 - int in_hotarea = 0; - - switch (hotarea_corner) { - case BOTTOM_RIGHT: // 右下角 - in_hotarea = (y_root > hy && x_root > hx && - x_root <= (selmon->m.x + selmon->m.width) && - y_root <= (selmon->m.y + selmon->m.height)); - break; - case TOP_LEFT: // 左上角 - in_hotarea = (y_root < hy && x_root < hx && x_root >= selmon->m.x && - y_root >= selmon->m.y); - break; - case TOP_RIGHT: // 右上角 - in_hotarea = (y_root < hy && x_root > hx && - x_root <= (selmon->m.x + selmon->m.width) && - y_root >= selmon->m.y); - break; - case BOTTOM_LEFT: // 左下角（默认） - default: - in_hotarea = (y_root > hy && x_root < hx && x_root >= selmon->m.x && - y_root <= (selmon->m.y + selmon->m.height)); - break; - } - - if (enable_hotarea == 1 && selmon->is_in_hotarea == 0 && in_hotarea) { + if (enable_hotarea == 1 && selmon->is_in_hotarea == 0 && y_root > hy && + x_root < hx && x_root >= selmon->m.x && + y_root <= (selmon->m.y + selmon->m.height)) { toggleoverview(&arg); selmon->is_in_hotarea = 1; } else if (enable_hotarea == 1 && selmon->is_in_hotarea == 1 && - !in_hotarea) { + (y_root <= hy || x_root >= hx || x_root < selmon->m.x || + y_root > (selmon->m.y + selmon->m.height))) { selmon->is_in_hotarea = 0; } } @@ -1524,9 +1478,6 @@ void arrangelayer(Monitor *m, struct wl_list *list, struct wlr_box *usable_area, !layer_surface->initialized) continue; - if (l->being_unmapped) - continue; - wlr_scene_layer_surface_v1_configure(l->scene_layer, &full_area, usable_area); wlr_scene_node_set_position(&l->popups->node, l->scene->node.x, @@ -2025,6 +1976,7 @@ buttonpress(struct wl_listener *listener, void *data) { selmon = xytomon(cursor->x, cursor->y); client_update_oldmonname_record(grabc, selmon); setmon(grabc, selmon, 0, true); + reset_foreign_tolevel(grabc); selmon->prevsel = ISTILED(selmon->sel) ? selmon->sel : NULL; selmon->sel = grabc; tmpc = grabc; @@ -2342,15 +2294,6 @@ void commitlayersurfacenotify(struct wl_listener *listener, void *data) { return; } - // 检查surface是否有buffer - // 空buffer，只是隐藏，不改变mapped状态 - if (l->mapped && !layer_surface->surface->buffer) { - wlr_scene_node_set_enabled(&l->scene->node, false); - return; - } else { - wlr_scene_node_set_enabled(&l->scene->node, true); - } - get_layer_target_geometry(l, &box); if (animations && layer_animations && !l->noanim && l->mapped && @@ -2499,12 +2442,12 @@ void commitpopup(struct wl_listener *listener, void *data) { struct wlr_box box; int32_t type = -1; - if (!popup || !popup->base->initial_commit) - goto commitpopup_listen_free; + if (!popup->base->initial_commit) + return; type = toplevel_from_wlr_surface(popup->base->surface, &c, &l); - if (!popup->parent || !popup->parent->data || type < 0) - goto commitpopup_listen_free; + if (!popup->parent || type < 0) + return; wlr_scene_node_raise_to_top(popup->parent->data); @@ -2512,14 +2455,13 @@ void commitpopup(struct wl_listener *listener, void *data) { wlr_scene_xdg_surface_create(popup->parent->data, popup->base); if ((l && !l->mon) || (c && !c->mon)) { wlr_xdg_popup_destroy(popup); - goto commitpopup_listen_free; + return; } box = type == LayerShell ? l->mon->m : c->mon->w; box.x -= (type == LayerShell ? l->scene->node.x : c->geom.x); box.y -= (type == LayerShell ? l->scene->node.y : c->geom.y); wlr_xdg_popup_unconstrain_from_box(popup, &box); -commitpopup_listen_free: wl_list_remove(&listener->link); free(listener); } @@ -2647,6 +2589,8 @@ void createlayersurface(struct wl_listener *listener, void *data) { LISTEN(&surface->events.commit, &l->surface_commit, commitlayersurfacenotify); LISTEN(&surface->events.unmap, &l->unmap, unmaplayersurfacenotify); + LISTEN(&layer_surface->events.destroy, &l->destroy, + destroylayersurfacenotify); l->layer_surface = layer_surface; l->mon = layer_surface->output->data; @@ -2659,8 +2603,6 @@ void createlayersurface(struct wl_listener *listener, void *data) { : scene_layer); l->scene->node.data = l->popups->node.data = l; - LISTEN(&l->scene->node.events.destroy, &l->destroy, destroylayernodenotify); - wl_list_insert(&l->mon->layers[layer_surface->pending.layer], &l->link); wlr_surface_send_enter(surface, layer_surface->output); } @@ -2723,7 +2665,7 @@ void createmon(struct wl_listener *listener, void *data) { struct wlr_output *wlr_output = data; const ConfigMonitorRule *r; uint32_t i; - int32_t ji, vrr; + int32_t ji, jk; struct wlr_output_state state; Monitor *m = NULL; struct wlr_output_mode *internal_mode = NULL; @@ -2759,19 +2701,30 @@ void createmon(struct wl_listener *listener, void *data) { m->sel = NULL; m->is_in_hotarea = 0; float scale = 1; + m->mfact = default_mfact; + m->nmaster = default_nmaster; enum wl_output_transform rr = WL_OUTPUT_TRANSFORM_NORMAL; wlr_output_state_set_scale(&state, scale); wlr_output_state_set_transform(&state, rr); + m->lt = &layouts[0]; for (ji = 0; ji < config.monitor_rules_count; ji++) { if (config.monitor_rules_count < 1) break; r = &config.monitor_rules[ji]; - if (regex_match(r->name, wlr_output->name)) { - m->m.x = r->x == INT32_MAX ? INT32_MAX : r->x; - m->m.y = r->y == INT32_MAX ? INT32_MAX : r->y; - vrr = r->vrr >= 0 ? r->vrr : 0; + if (!r->name || regex_match(r->name, wlr_output->name)) { + m->mfact = r->mfact; + m->nmaster = r->nmaster; + m->m.x = r->x; + m->m.y = r->y; + if (r->layout) { + for (jk = 0; jk < LENGTH(layouts); jk++) { + if (strcmp(layouts[jk].name, r->layout) == 0) { + m->lt = &layouts[jk]; + } + } + } scale = r->scale; rr = r->rr; @@ -2788,13 +2741,6 @@ void createmon(struct wl_listener *listener, void *data) { (int32_t)roundf(r->refresh * 1000)); } } - - if (vrr) { - enable_adaptive_sync(m, &state); - } else { - wlr_output_state_set_adaptive_sync_enabled(&state, false); - } - wlr_output_state_set_scale(&state, r->scale); wlr_output_state_set_transform(&state, r->rr); break; @@ -2809,6 +2755,10 @@ void createmon(struct wl_listener *listener, void *data) { wlr_output_state_set_mode(&state, wlr_output_preferred_mode(wlr_output)); + if (adaptive_sync) { + enable_adaptive_sync(m, &state); + } + /* Set up event listeners */ LISTEN(&wlr_output->events.frame, &m->frame, rendermon); LISTEN(&wlr_output->events.destroy, &m->destroy, cleanupmon); @@ -2833,9 +2783,9 @@ void createmon(struct wl_listener *listener, void *data) { } for (i = 0; i <= LENGTH(tags); i++) { - m->pertag->nmasters[i] = default_nmaster; - m->pertag->mfacts[i] = default_mfact; - m->pertag->ltidxs[i] = &layouts[0]; + m->pertag->nmasters[i] = m->nmaster; + m->pertag->mfacts[i] = m->mfact; + m->pertag->ltidxs[i] = m->lt; } // apply tag rule @@ -2857,7 +2807,7 @@ void createmon(struct wl_listener *listener, void *data) { * output (such as DPI, scale factor, manufacturer, etc). */ m->scene_output = wlr_scene_output_create(scene, wlr_output); - if (m->m.x == INT32_MAX || m->m.y == INT32_MAX) + if (m->m.x == -1 && m->m.y == -1) wlr_output_layout_add_auto(output_layout, wlr_output); else wlr_output_layout_add(output_layout, wlr_output, m->m.x, m->m.y); @@ -2974,14 +2924,9 @@ void configure_pointer(struct libinput_device *device) { if (libinput_device_config_send_events_get_modes(device)) libinput_device_config_send_events_set_mode(device, send_events_mode); - if (accel_profile && libinput_device_config_accel_is_available(device)) { + if (libinput_device_config_accel_is_available(device)) { libinput_device_config_accel_set_profile(device, accel_profile); libinput_device_config_accel_set_speed(device, accel_speed); - } else { - // profile cannot be directly applied to 0, need to set to 1 first - libinput_device_config_accel_set_profile(device, 1); - libinput_device_config_accel_set_profile(device, 0); - libinput_device_config_accel_set_speed(device, 0); } } @@ -3126,7 +3071,7 @@ void destroyidleinhibitor(struct wl_listener *listener, void *data) { free(listener); } -void destroylayernodenotify(struct wl_listener *listener, void *data) { +void destroylayersurfacenotify(struct wl_listener *listener, void *data) { LayerSurface *l = wl_container_of(listener, l, destroy); wl_list_remove(&l->link); @@ -3134,6 +3079,7 @@ void destroylayernodenotify(struct wl_listener *listener, void *data) { wl_list_remove(&l->map.link); wl_list_remove(&l->unmap.link); wl_list_remove(&l->surface_commit.link); + wlr_scene_node_destroy(&l->scene->node); wlr_scene_node_destroy(&l->popups->node); free(l); } @@ -3826,12 +3772,6 @@ void init_client_properties(Client *c) { c->stack_proportion = 0.0f; c->next_in_stack = NULL; c->prev_in_stack = NULL; - memcpy(c->opacity_animation.initial_border_color, bordercolor, - sizeof(c->opacity_animation.initial_border_color)); - memcpy(c->opacity_animation.current_border_color, bordercolor, - sizeof(c->opacity_animation.current_border_color)); - c->opacity_animation.initial_opacity = c->unfocused_opacity; - c->opacity_animation.current_opacity = c->unfocused_opacity; } void // old fix to 0.5 @@ -4048,30 +3988,6 @@ void motionabsolute(struct wl_listener *listener, void *data) { motionnotify(event->time_msec, &event->pointer->base, dx, dy, dx, dy); } -void resize_floating_window(Client *grabc) { - int cdx = (int)round(cursor->x) - grabcx; - int cdy = (int)round(cursor->y) - grabcy; - - cdx = !(rzcorner & 1) && grabc->geom.width - 2 * (int)grabc->bw - cdx < 1 - ? 0 - : cdx; - cdy = !(rzcorner & 2) && grabc->geom.height - 2 * (int)grabc->bw - cdy < 1 - ? 0 - : cdy; - - const struct wlr_box box = { - .x = grabc->geom.x + (rzcorner & 1 ? 0 : cdx), - .y = grabc->geom.y + (rzcorner & 2 ? 0 : cdy), - .width = grabc->geom.width + (rzcorner & 1 ? cdx : -cdx), - .height = grabc->geom.height + (rzcorner & 2 ? cdy : -cdy)}; - - grabc->float_geom = box; - - resize(grabc, box, 1); - grabcx += cdx; - grabcy += cdy; -} - void motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double dy, double dx_unaccel, double dy_unaccel) { double sx = 0, sy = 0, sx_confined, sy_confined; @@ -4149,9 +4065,14 @@ void motionnotify(uint32_t time, struct wlr_input_device *device, double dx, } else if (cursor_mode == CurResize) { if (grabc->isfloating) { grabc->iscustomsize = 1; + grabc->float_geom = (struct wlr_box){ + .x = grabc->geom.x, + .y = grabc->geom.y, + .width = (int32_t)round(cursor->x) - grabc->geom.x, + .height = (int32_t)round(cursor->y) - grabc->geom.y}; if (last_apply_drap_time == 0 || - time - last_apply_drap_time > drag_floating_refresh_interval) { - resize_floating_window(grabc); + time - last_apply_drap_time > drag_refresh_interval) { + resize(grabc, grabc->float_geom, 1); last_apply_drap_time = time; } return; @@ -4679,7 +4600,6 @@ setfloating(Client *c, int32_t floating) { Client *fc = NULL; struct wlr_box target_box; - int32_t old_floating_state = c->isfloating; c->isfloating = floating; bool window_size_outofrange = false; @@ -4749,7 +4669,7 @@ setfloating(Client *c, int32_t floating) { layers[c->isfloating ? LyrTop : LyrTile]); } - if (!c->isfloating && old_floating_state) { + if (!c->isfloating) { set_size_per(c->mon, c); } @@ -4798,7 +4718,6 @@ void setmaximizescreen(Client *c, int32_t maximizescreen) { if (c->mon->isoverview) return; - int32_t old_maximizescreen_state = c->ismaximizescreen; c->ismaximizescreen = maximizescreen; if (maximizescreen) { @@ -4828,7 +4747,7 @@ void setmaximizescreen(Client *c, int32_t maximizescreen) { wlr_scene_node_reparent(&c->scene->node, layers[c->isfloating ? LyrTop : LyrTile]); - if (!c->ismaximizescreen && old_maximizescreen_state) { + if (!c->ismaximizescreen) { set_size_per(c->mon, c); } @@ -4861,7 +4780,6 @@ void setfullscreen(Client *c, int32_t fullscreen) // 用自定义全屏代理自 if (c->mon->isoverview) return; - int32_t old_fullscreen_state = c->isfullscreen; c->isfullscreen = fullscreen; client_set_fullscreen(c, fullscreen); @@ -4899,7 +4817,7 @@ void setfullscreen(Client *c, int32_t fullscreen) // 用自定义全屏代理自 layers[fullscreen || c->isfloating ? LyrTop : LyrTile]); } - if (!c->isfullscreen && old_fullscreen_state) { + if (!c->isfullscreen) { set_size_per(c->mon, c); } @@ -5028,7 +4946,6 @@ void setmon(Client *c, Monitor *m, uint32_t newtags, bool focus) { arrange(oldmon, false, false); if (m) { /* Make sure window actually overlaps with the monitor */ - reset_foreign_tolevel(c); resize(c, c->geom, 0); c->tags = newtags ? newtags @@ -5040,6 +4957,21 @@ void setmon(Client *c, Monitor *m, uint32_t newtags, bool focus) { if (focus && !client_is_x11_popup(c)) { focusclient(focustop(selmon), 1); } + + if (m) { + + if (c->foreign_toplevel) { + remove_foreign_topleve(c); + } + + add_foreign_toplevel(c); + if (m->sel && m->sel->foreign_toplevel) + wlr_foreign_toplevel_handle_v1_set_activated( + m->sel->foreign_toplevel, false); + if (c->foreign_toplevel) + wlr_foreign_toplevel_handle_v1_set_activated(c->foreign_toplevel, + true); + } } void setpsel(struct wl_listener *listener, void *data) { @@ -5562,7 +5494,6 @@ void unmaplayersurfacenotify(struct wl_listener *listener, void *data) { LayerSurface *l = wl_container_of(listener, l, unmap); l->mapped = 0; - l->being_unmapped = true; init_fadeout_layers(l); @@ -5574,9 +5505,6 @@ void unmaplayersurfacenotify(struct wl_listener *listener, void *data) { if (l->layer_surface->surface == seat->keyboard_state.focused_surface) focusclient(focustop(selmon), 1); motionnotify(0, NULL, 0, 0, 0, 0); - l->being_unmapped = false; - wlr_scene_node_destroy(&l->shadow->node); - l->shadow = NULL; } void unmapnotify(struct wl_listener *listener, void *data) { @@ -5794,8 +5722,7 @@ void updatemons(struct wl_listener *listener, void *data) { if (selmon && selmon->wlr_output->enabled) { wl_list_for_each(c, &clients, link) { if (!c->mon && client_surface(c)->mapped) { - c->mon = selmon; - reset_foreign_tolevel(c); + client_change_mon(c, selmon); } } focusclient(focustop(selmon), 1); @@ -6157,22 +6084,17 @@ int32_t main(int32_t argc, char *argv[]) { char *startup_cmd = NULL; int32_t c; - while ((c = getopt(argc, argv, "s:c:hdvp")) != -1) { - if (c == 's') { + while ((c = getopt(argc, argv, "s:c:hdv")) != -1) { + if (c == 's') startup_cmd = optarg; - } else if (c == 'd') { + else if (c == 'd') log_level = WLR_DEBUG; - } else if (c == 'v') { - printf("mango " VERSION "\n"); - return EXIT_SUCCESS; - } else if (c == 'c') { + else if (c == 'v') + die("mango " VERSION); + else if (c == 'c') cli_config_path = optarg; - } else if (c == 'p') { - parse_config(); - return EXIT_SUCCESS; - } else { + else goto usage; - } } if (optind < argc) goto usage; @@ -6186,14 +6108,7 @@ int32_t main(int32_t argc, char *argv[]) { run(startup_cmd); cleanup(); return EXIT_SUCCESS; + usage: - printf("Usage: mango [OPTIONS]\n" - "\n" - "Options:\n" - " -v Show mango version\n" - " -d Enable debug log\n" - " -c Use custom configuration file\n" - " -s Execute startup command\n" - " -p Check configuration file error\n"); - return EXIT_SUCCESS; + die("Usage: %s [-v] [-d] [-c config file] [-s startup command]", argv[0]); }