From ced800910d99de8f956a6f2d5ad84e5432a19bdc Mon Sep 17 00:00:00 2001 From: Emilia Miki Date: Wed, 24 Jun 2026 03:41:13 +0300 Subject: [PATCH] feat: add tag names this feature adds optional tag names in mango config, specified using the name key. if name is not specified, the default arabic numerals are used. --- src/config/parse_config.h | 16 ++++++++++++++++ src/ext-protocol/ext-workspace.h | 6 +++--- src/ipc/ipc.h | 1 + 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/config/parse_config.h b/src/config/parse_config.h index 61af421b..1f3e2d97 100644 --- a/src/config/parse_config.h +++ b/src/config/parse_config.h @@ -160,6 +160,7 @@ typedef struct { typedef struct { int32_t id; + char *name; char *layout_name; char *monitor_name; char *monitor_make; @@ -2183,6 +2184,7 @@ bool parse_option(Config *config, char *key, char *value) { // 设置默认值 rule->id = 0; + rule->name = NULL; rule->layout_name = NULL; rule->monitor_name = NULL; rule->monitor_make = NULL; @@ -2211,6 +2213,8 @@ bool parse_option(Config *config, char *key, char *value) { if (strcmp(key, "id") == 0) { rule->id = CLAMP_INT(atoi(val), 0, LENGTH(tags)); + } else if (strcmp(key, "name") == 0) { + rule->name = strdup(val); } else if (strcmp(key, "layout_name") == 0) { rule->layout_name = strdup(val); } else if (strcmp(key, "monitor_name") == 0) { @@ -3300,6 +3304,8 @@ void free_config(void) { // 释放 tag_rules if (config.tag_rules) { for (int32_t i = 0; i < config.tag_rules_count; i++) { + if (config.tag_rules[i].name) + free((void *)config.tag_rules[i].name); if (config.tag_rules[i].layout_name) free((void *)config.tag_rules[i].layout_name); if (config.tag_rules[i].monitor_name) @@ -4302,3 +4308,13 @@ int32_t reload_config(const Arg *arg) { printstatus(IPC_WATCH_ARRANGGE); return 1; } + +static const char *get_tag_name(int tag_index) { + for (int i = 0; i < config.tag_rules_count; i++) { + if (config.tag_rules[i].id == tag_index && config.tag_rules[i].name) + return config.tag_rules[i].name; + } + if (tag_index >= 1 && tag_index <= (int)LENGTH(tags)) + return tags[tag_index - 1]; + return NULL; +} diff --git a/src/ext-protocol/ext-workspace.h b/src/ext-protocol/ext-workspace.h index eea0f455..0c53cb11 100644 --- a/src/ext-protocol/ext-workspace.h +++ b/src/ext-protocol/ext-workspace.h @@ -100,9 +100,9 @@ static void handle_ext_commit(struct wl_listener *listener, void *data) { } static const char *get_name_from_tag(uint32_t tag) { - static const char *names[] = {"overview", "1", "2", "3", "4", - "5", "6", "7", "8", "9"}; - return (tag < sizeof(names) / sizeof(names[0])) ? names[tag] : NULL; + if (tag == 0) + return "overview"; + return get_tag_name((int)tag); } void destroy_workspace(struct workspace *workspace) { diff --git a/src/ipc/ipc.h b/src/ipc/ipc.h index 03e0746e..e66b2842 100644 --- a/src/ipc/ipc.h +++ b/src/ipc/ipc.h @@ -99,6 +99,7 @@ static cJSON *build_tags_json(Monitor *m) { } cJSON *tag_obj = cJSON_CreateObject(); cJSON_AddNumberToObject(tag_obj, "index", tag); + cJSON_AddStringToObject(tag_obj, "name", get_tag_name(tag)); cJSON_AddBoolToObject(tag_obj, "is_active", is_active); cJSON_AddBoolToObject(tag_obj, "is_urgent", is_urgent); cJSON_AddStringToObject(tag_obj, "layout",