koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move title_format from window to container.

Browse Source 
This patch moves the title_format information from windows to containers.
Furthermore, it allows correctly setting it on window-less containers and
displays the title accordingly for split containers.

We now also dump and read title_format in GET_TREE / during restarts.

fixes #2120
This commit is contained in:
Ingo Bürk
2015-12-29 12:01:51 -05:00
parent cd172da6ae
commit 1f660a4cc4
15 changed files with 188 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/commands.c
View File

@ -1926,27 +1926,33 @@ void cmd_title_format(I3_CMD, const char *format) {
owindow *current;
TAILQ_FOREACH(current, &owindows, owindows) {
if (current->con->window == NULL)
continue;
DLOG("setting title_format for %p / %s\n", current->con, current->con->name);
FREE(current->con->window->title_format);
FREE(current->con->title_format);
/* If we only display the title without anything else, we can skip the parsing step,
* so we remove the title format altogether. */
if (strcasecmp(format, "%title") != 0) {
current->con->window->title_format = sstrdup(format);
current->con->title_format = sstrdup(format);
i3String *formatted_title = window_parse_title_format(current->con->window);
ewmh_update_visible_name(current->con->window->id, i3string_as_utf8(formatted_title));
I3STRING_FREE(formatted_title);
if (current->con->window != NULL) {
i3String *formatted_title = con_parse_title_format(current->con);
ewmh_update_visible_name(current->con->window->id, i3string_as_utf8(formatted_title));
I3STRING_FREE(formatted_title);
}
} else {
/* We can remove _NET_WM_VISIBLE_NAME since we don't display a custom title. */
ewmh_update_visible_name(current->con->window->id, NULL);
if (current->con->window != NULL) {
/* We can remove _NET_WM_VISIBLE_NAME since we don't display a custom title. */
ewmh_update_visible_name(current->con->window->id, NULL);
}
}
/* Make sure the window title is redrawn immediately. */
current->con->window->name_x_changed = true;
if (current->con->window != NULL) {
/* Make sure the window title is redrawn immediately. */
current->con->window->name_x_changed = true;
} else {
/* For windowless containers we also need to force the redrawing. */
FREE(current->con->deco_render_params);
}
}
cmd_output->needs_tree_render = true;