diff --git a/docs/ipc.md b/docs/ipc.md index 0bdcc0b1..32b81b02 100644 --- a/docs/ipc.md +++ b/docs/ipc.md @@ -67,6 +67,17 @@ mmsg watch all-monitors mmsg watch all-tags ``` +### RENAME +| Command | Description | +| :--- | :--- | +| `rename tag ` | Renames a tag at runtime. Updates the in-memory config, the ext-workspace-v1 protocol name, and notifies all IPC watchers. The name may contain spaces. | + +*Example:* +```bash +mmsg rename tag 1 web +mmsg rename tag 2 my projects +``` + ### DISPATCH Allows sending commands to the compositor to alter its state. * `dispatch ,[args...] [client,]` diff --git a/mmsg/mmsg.1 b/mmsg/mmsg.1 index 2449e6e0..f4a3f16a 100644 --- a/mmsg/mmsg.1 +++ b/mmsg/mmsg.1 @@ -74,6 +74,24 @@ Examples: .IP \(bu 2 \fBmmsg dispatch movewin,10,100 client,4\fR .RE +.SS "Rename commands" +.TP +\fBrename tag\fR +Rename a tag at runtime. +\fIindex\fR is the 1-based tag number. +\fIname\fR may contain spaces. +The change is reflected immediately in the ext-workspace-v1 protocol and in all +active IPC watch streams. +Survives \fBreload_config\fR only if also set via \fBtagrule=id:,name:\fR +in the config file. +.br +Example: +.RS +.IP \(bu 2 +\fBmmsg rename tag 1 web\fR +.IP \(bu 2 +\fBmmsg rename tag 2 my projects\fR +.RE .SS "Persistent streams (watch)" \fBWatch\fR commands keep the connection open and continuously output JSON updates. The initial state is sent immediately, followed by updates whenever diff --git a/src/ext-protocol/ext-workspace.h b/src/ext-protocol/ext-workspace.h index 0c53cb11..c2230781 100644 --- a/src/ext-protocol/ext-workspace.h +++ b/src/ext-protocol/ext-workspace.h @@ -155,6 +155,8 @@ void dwl_ext_workspace_printstatus(Monitor *m) { wl_list_for_each(w, &workspaces, link) { if (w && w->m == m) { + wlr_ext_workspace_handle_v1_set_name(w->ext_workspace, + get_name_from_tag(w->tag)); tag_status = get_tag_status(w->tag, m); if (tag_status == 2) { wlr_ext_workspace_handle_v1_set_hidden(w->ext_workspace, false); diff --git a/src/ipc/ipc.h b/src/ipc/ipc.h index e66b2842..7f4eb09a 100644 --- a/src/ipc/ipc.h +++ b/src/ipc/ipc.h @@ -352,6 +352,41 @@ static void handle_command(int client_fd, const char *cmd_raw) { return; } resp = build_monitor_tags_response(m); + } else if (strncmp(cmd, "rename tag ", 11) == 0) { + char *rest = (char *)(cmd + 11); + char *endptr; + long tag_index = strtol(rest, &endptr, 10); + if (endptr == rest || *endptr != ' ' || + tag_index < 1 || tag_index > (int)LENGTH(tags)) { + send_static_json(client_fd, "{\"error\":\"usage: rename tag \"}\n"); + return; + } + const char *new_name = endptr + 1; + if (*new_name == '\0') { + send_static_json(client_fd, "{\"error\":\"usage: rename tag \"}\n"); + return; + } + bool found = false; + for (int i = 0; i < config.tag_rules_count; i++) { + if (config.tag_rules[i].id == (int)tag_index) { + free(config.tag_rules[i].name); + config.tag_rules[i].name = strdup(new_name); + found = true; + break; + } + } + if (!found) { + config.tag_rules = realloc(config.tag_rules, + (config.tag_rules_count + 1) * sizeof(ConfigTagRule)); + ConfigTagRule *rule = &config.tag_rules[config.tag_rules_count]; + memset(rule, 0, sizeof(ConfigTagRule)); + rule->id = (int)tag_index; + rule->name = strdup(new_name); + config.tag_rules_count++; + } + printstatus(IPC_WATCH_ARRANGGE); + resp = cJSON_CreateObject(); + cJSON_AddBoolToObject(resp, "success", true); } else if (strncmp(cmd, "dispatch ", 9) == 0) { char *dispatch_copy = strdup(cmd_raw + 9); char *out = dispatch_copy, *ptr = dispatch_copy; @@ -1060,4 +1095,4 @@ void ipc_cleanup(void) { struct ipc_watch_client *wc, *tmp; wl_list_for_each_safe(wc, tmp, &watch_clients, link) ipc_remove_watch_client(wc); -} \ No newline at end of file +}