From b405a80c05ba9f355886c18c099543621efc68a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 5 Feb 2014 14:44:04 -0800 Subject: [PATCH] terminal: Only reset title if we put the window size there When resizing the terminal, it shows the grid size in the titlebar. We reset the title next time we get an enter event. This patch makes sure we only reset the title the first time we enter after a resize. --- clients/terminal.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/clients/terminal.c b/clients/terminal.c index f3646fe3..61ea9ae6 100644 --- a/clients/terminal.c +++ b/clients/terminal.c @@ -465,6 +465,7 @@ struct terminal { double average_width; cairo_scaled_font_t *font_normal, *font_bold; uint32_t hide_cursor_serial; + int size_in_title; struct wl_data_source *selection; uint32_t click_time; @@ -850,6 +851,7 @@ resize_handler(struct widget *widget, widget_set_size(terminal->widget, width, height); if (asprintf(&p, "%s — [%dx%d]", terminal->title, columns, rows) > 0) { window_set_title(terminal->window, p); + terminal->size_in_title = 1; free(p); } } @@ -2740,7 +2742,10 @@ enter_handler(struct widget *widget, struct terminal *terminal = data; /* Reset title to get rid of resizing '[WxH]' in titlebar */ - window_set_title(terminal->window, terminal->title); + if (terminal->size_in_title) { + window_set_title(terminal->window, terminal->title); + terminal->size_in_title = 0; + } return CURSOR_IBEAM; }