Commit 5813d178aff670a67346e23851a985a8530a8d33
2019-03-09T13:46:39
dynamically adjust length of author column in tog log view
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129
diff --git a/tog/tog.c b/tog/tog.c
index c1a08e9..421f8fe 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -921,20 +921,33 @@ build_refs_str(char **refs_str, struct got_reflist_head *refs,
}
static const struct got_error *
+format_author(wchar_t **wauthor, int *author_width, char *author, int limit)
+{
+ char *smallerthan, *at;
+
+ smallerthan = strchr(author, '<');
+ if (smallerthan && smallerthan[1] != '\0')
+ author = smallerthan + 1;
+ at = strchr(author, '@');
+ if (at)
+ *at = '\0';
+ return format_line(wauthor, author_width, author, limit);
+}
+
+static const struct got_error *
draw_commit(struct tog_view *view, struct got_commit_object *commit,
- struct got_object_id *id, struct got_reflist_head *refs)
+ struct got_object_id *id, struct got_reflist_head *refs,
+ int author_display_cols)
{
const struct got_error *err = NULL;
char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
char *logmsg0 = NULL, *logmsg = NULL;
- char *author0 = NULL, *author = NULL;
+ char *author = NULL;
wchar_t *wlogmsg = NULL, *wauthor = NULL;
int author_width, logmsg_width;
- char *newline, *smallerthan, *at;
- char *line = NULL;
+ char *newline, *line = NULL;
int col, limit;
static const size_t date_display_cols = 9;
- static const size_t author_display_cols = 10;
const int avail = view->ncols;
struct tm tm;
time_t committer_time;
@@ -955,25 +968,17 @@ draw_commit(struct tog_view *view, struct got_commit_object *commit,
if (col > avail)
goto done;
- author0 = strdup(got_object_commit_get_author(commit));
- if (author0 == NULL) {
+ author = strdup(got_object_commit_get_author(commit));
+ if (author == NULL) {
err = got_error_from_errno();
goto done;
}
- author = author0;
- smallerthan = strchr(author, '<');
- if (smallerthan && smallerthan[1] != '\0')
- author = smallerthan + 1;
- at = strchr(author, '@');
- if (at)
- *at = '\0';
- limit = avail - col;
- err = format_line(&wauthor, &author_width, author, limit);
+ err = format_author(&wauthor, &author_width, author, avail - col);
if (err)
goto done;
waddwstr(view->window, wauthor);
col += author_width;
- while (col <= avail && author_width < author_display_cols + 1) {
+ while (col <= avail && author_width < author_display_cols + 2) {
waddch(view->window, ' ');
col++;
author_width++;
@@ -1005,7 +1010,7 @@ draw_commit(struct tog_view *view, struct got_commit_object *commit,
done:
free(logmsg0);
free(wlogmsg);
- free(author0);
+ free(author);
free(wauthor);
free(line);
return err;
@@ -1137,6 +1142,7 @@ draw_commits(struct tog_view *view, struct commit_queue_entry **last,
const struct got_error *err = NULL;
struct commit_queue_entry *entry;
int ncommits, width;
+ int author_cols = 10;
char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
char *refs_str = NULL;
wchar_t *wline;
@@ -1208,6 +1214,28 @@ draw_commits(struct tog_view *view, struct commit_queue_entry **last,
if (limit <= 1)
goto done;
+ /* Grow author column size if necessary. */
+ entry = first;
+ ncommits = 0;
+ while (entry) {
+ char *author;
+ wchar_t *wauthor;
+ int width;
+ if (ncommits >= limit - 1)
+ break;
+ author = strdup(got_object_commit_get_author(entry->commit));
+ if (author == NULL) {
+ err = got_error_from_errno();
+ goto done;
+ }
+ err = format_author(&wauthor, &width, author, COLS);
+ if (author_cols < width)
+ author_cols = width;
+ free(wauthor);
+ free(author);
+ entry = TAILQ_NEXT(entry, entry);
+ }
+
entry = first;
*last = first;
ncommits = 0;
@@ -1216,7 +1244,8 @@ draw_commits(struct tog_view *view, struct commit_queue_entry **last,
break;
if (ncommits == selected_idx)
wstandout(view->window);
- err = draw_commit(view, entry->commit, entry->id, refs);
+ err = draw_commit(view, entry->commit, entry->id, refs,
+ author_cols);
if (ncommits == selected_idx)
wstandend(view->window);
if (err)