Commit 084063cd60e09ca30740edba164d319222e9327c
2018-07-12T15:45:59
tweak tog blame current line display and fix page-down scrolling
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
diff --git a/tog/tog.c b/tog/tog.c
index 1c84a1f..203a87b 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -1124,8 +1124,8 @@ draw_blame(WINDOW *window, struct got_object_id *id, FILE *f, const char *path,
if (width < COLS)
waddch(window, '\n');
- if (asprintf(&line, "[%d-%d/%d] %s%s",
- *first_displayed_line, *last_displayed_line, nlines,
+ if (asprintf(&line, "[%d/%d] %s%s",
+ *first_displayed_line - 1 + selected_line, nlines,
path, blame_complete ? "" : " annotating...") == -1) {
free(id_str);
return got_error_from_errno();
@@ -1457,14 +1457,14 @@ show_blame_view(const char *path, struct got_object_id *commit_id,
selected_line = 1;
break;
}
- if (first_displayed_line > LINES - 1)
- first_displayed_line -= (LINES - 1);
+ if (first_displayed_line > LINES - 2)
+ first_displayed_line -= (LINES - 2);
else
first_displayed_line = 1;
break;
case 'j':
case KEY_DOWN:
- if (selected_line < LINES - 1)
+ if (selected_line < LINES - 2)
selected_line++;
else if (last_displayed_line < nlines)
first_displayed_line++;
@@ -1492,15 +1492,15 @@ show_blame_view(const char *path, struct got_object_id *commit_id,
case KEY_NPAGE:
case ' ':
if (last_displayed_line >= nlines &&
- selected_line < LINES - 1) {
- selected_line = LINES - 1;
+ selected_line < LINES - 2) {
+ selected_line = LINES - 2;
break;
}
- if (last_displayed_line + LINES - 1 <= nlines)
- first_displayed_line += LINES - 1;
+ if (last_displayed_line + LINES - 2 <= nlines)
+ first_displayed_line += LINES - 2;
else
first_displayed_line =
- nlines - (LINES - 2);
+ nlines - (LINES - 3);
break;
default:
break;