X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/4887d44e87f6ab759e32d30511d78e3f99d0fbcc..f7ffec0647ba2b0cfd171dd81f0d620038f690f0:/tig.c

diff --git a/tig.c b/tig.c
index b0ce18f..de85ca1 100644
--- a/tig.c
+++ b/tig.c
@@ -1315,20 +1315,11 @@ redraw_view(struct view *view)
 static void
 update_view_title(struct view *view)
 {
-	assert(view_is_displayed(view));
-
-	if (view == display[current_view])
-		wbkgdset(view->title, get_line_attr(LINE_TITLE_FOCUS));
-	else
-		wbkgdset(view->title, get_line_attr(LINE_TITLE_BLUR));
-
-	werase(view->title);
-	wmove(view->title, 0, 0);
+	char buf[SIZEOF_STR];
+	char state[SIZEOF_STR];
+	size_t bufpos = 0, statelen = 0;
 
-	if (*view->ref)
-		wprintw(view->title, "[%s] %s", view->name, view->ref);
-	else
-		wprintw(view->title, "[%s]", view->name);
+	assert(view_is_displayed(view));
 
 	if (view->lines || view->pipe) {
 		unsigned int view_lines = view->offset + view->height;
@@ -1336,21 +1327,42 @@ update_view_title(struct view *view)
 				   ? MIN(view_lines, view->lines) * 100 / view->lines
 				   : 0;
 
-		wprintw(view->title, " - %s %d of %d (%d%%)",
-			view->ops->type,
-			view->lineno + 1,
-			view->lines,
-			lines);
+		string_format_from(state, &statelen, "- %s %d of %d (%d%%)",
+				   view->ops->type,
+				   view->lineno + 1,
+				   view->lines,
+				   lines);
+
+		if (view->pipe) {
+			time_t secs = time(NULL) - view->start_time;
+
+			/* Three git seconds are a long time ... */
+			if (secs > 2)
+				string_format_from(state, &statelen, " %lds", secs);
+		}
 	}
 
-	if (view->pipe) {
-		time_t secs = time(NULL) - view->start_time;
+	string_format_from(buf, &bufpos, "[%s]", view->name);
+	if (*view->ref && bufpos < view->width) {
+		size_t refsize = strlen(view->ref);
+		size_t minsize = bufpos + 1 + /* abbrev= */ 7 + 1 + statelen;
 
-		/* Three git seconds are a long time ... */
-		if (secs > 2)
-			wprintw(view->title, " %lds", secs);
+		if (minsize < view->width)
+			refsize = view->width - minsize + 7;
+		string_format_from(buf, &bufpos, " %.*s", refsize, view->ref);
 	}
 
+	if (statelen && bufpos < view->width) {
+		string_format_from(buf, &bufpos, " %s", state);
+	}
+
+	if (view == display[current_view])
+		wbkgdset(view->title, get_line_attr(LINE_TITLE_FOCUS));
+	else
+		wbkgdset(view->title, get_line_attr(LINE_TITLE_BLUR));
+
+	werase(view->title);
+	mvwaddnstr(view->title, 0, 0, buf, bufpos);
 	wmove(view->title, 0, view->width - 1);
 	wrefresh(view->title);
 }