X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/5dcf8064ca55dfc77c3fcd18cdf6432ed0f51a94..73c76ef5c12ef914484e1ee71e55126d74020c8d:/tig.c

diff --git a/tig.c b/tig.c
index fb7a9a6..6236bf3 100644
--- a/tig.c
+++ b/tig.c
@@ -565,6 +565,7 @@ LINE(TREE,	   "tree ",		COLOR_BLUE,	COLOR_DEFAULT,	0), \
 LINE(AUTHOR,	   "author ",		COLOR_CYAN,	COLOR_DEFAULT,	0), \
 LINE(COMMITTER,	   "committer ",	COLOR_MAGENTA,	COLOR_DEFAULT,	0), \
 LINE(SIGNOFF,	   "    Signed-off-by", COLOR_YELLOW,	COLOR_DEFAULT,	0), \
+LINE(ACKED,	   "    Acked-by",	COLOR_YELLOW,	COLOR_DEFAULT,	0), \
 LINE(DEFAULT,	   "",			COLOR_DEFAULT,	COLOR_DEFAULT,	A_NORMAL), \
 LINE(CURSOR,	   "",			COLOR_WHITE,	COLOR_GREEN,	A_BOLD), \
 LINE(STATUS,	   "",			COLOR_GREEN,	COLOR_DEFAULT,	0), \
@@ -661,6 +662,10 @@ init_colors(void)
 
 struct line {
 	enum line_type type;
+
+	/* State flags */
+	unsigned int selected:1;
+
 	void *data;		/* User data */
 };
 
@@ -1267,8 +1272,14 @@ draw_view_line(struct view *view, unsigned int lineno)
 
 	line = &view->line[view->offset + lineno];
 
-	if (selected)
+	if (selected) {
+		line->selected = TRUE;
 		view->ops->select(view, line);
+	} else if (line->selected) {
+		line->selected = FALSE;
+		wmove(view->win, lineno, 0);
+		wclrtoeol(view->win);
+	}
 
 	return view->ops->draw(view, line, lineno, selected);
 }
@@ -1422,9 +1433,9 @@ update_display_cursor(void)
 
 /* Scrolling backend */
 static void
-do_scroll_view(struct view *view, int lines, bool redraw)
+do_scroll_view(struct view *view, int lines)
 {
-	assert(view_is_displayed(view));
+	bool redraw_current_line = FALSE;
 
 	/* The rendering expects the new offset. */
 	view->offset += lines;
@@ -1432,6 +1443,17 @@ do_scroll_view(struct view *view, int lines, bool redraw)
 	assert(0 <= view->offset && view->offset < view->lines);
 	assert(lines);
 
+	/* Move current line into the view. */
+	if (view->lineno < view->offset) {
+		view->lineno = view->offset;
+		redraw_current_line = TRUE;
+	} else if (view->lineno >= view->offset + view->height) {
+		view->lineno = view->offset + view->height - 1;
+		redraw_current_line = TRUE;
+	}
+
+	assert(view->offset <= view->lineno && view->lineno < view->lines);
+
 	/* Redraw the whole screen if scrolling is pointless. */
 	if (view->height < ABS(lines)) {
 		redraw_view(view);
@@ -1446,29 +1468,11 @@ do_scroll_view(struct view *view, int lines, bool redraw)
 			if (!draw_view_line(view, line))
 				break;
 		}
-	}
 
-	/* Move current line into the view. */
-	if (view->lineno < view->offset) {
-		view->lineno = view->offset;
-		draw_view_line(view, 0);
-
-	} else if (view->lineno >= view->offset + view->height) {
-		if (view->lineno == view->offset + view->height) {
-			/* Clear the hidden line so it doesn't show if the view
-			 * is scrolled up. */
-			wmove(view->win, view->height, 0);
-			wclrtoeol(view->win);
-		}
-		view->lineno = view->offset + view->height - 1;
-		draw_view_line(view, view->lineno - view->offset);
+		if (redraw_current_line)
+			draw_view_line(view, view->lineno - view->offset);
 	}
 
-	assert(view->offset <= view->lineno && view->lineno < view->lines);
-
-	if (!redraw)
-		return;
-
 	redrawwin(view->win);
 	wrefresh(view->win);
 	report("");
@@ -1480,6 +1484,8 @@ scroll_view(struct view *view, enum request request)
 {
 	int lines = 1;
 
+	assert(view_is_displayed(view));
+
 	switch (request) {
 	case REQ_SCROLL_PAGE_DOWN:
 		lines = view->height;
@@ -1511,13 +1517,14 @@ scroll_view(struct view *view, enum request request)
 		die("request %d not handled in switch", request);
 	}
 
-	do_scroll_view(view, lines, TRUE);
+	do_scroll_view(view, lines);
 }
 
 /* Cursor moving */
 static void
-move_view(struct view *view, enum request request, bool redraw)
+move_view(struct view *view, enum request request)
 {
+	int scroll_steps = 0;
 	int steps;
 
 	switch (request) {
@@ -1564,39 +1571,40 @@ move_view(struct view *view, enum request request, bool redraw)
 	view->lineno += steps;
 	assert(0 <= view->lineno && view->lineno < view->lines);
 
-	/* Repaint the old "current" line if we be scrolling */
-	if (ABS(steps) < view->height) {
-		int prev_lineno = view->lineno - steps - view->offset;
-
-		wmove(view->win, prev_lineno, 0);
-		wclrtoeol(view->win);
-		draw_view_line(view,  prev_lineno);
-	}
-
 	/* Check whether the view needs to be scrolled */
 	if (view->lineno < view->offset ||
 	    view->lineno >= view->offset + view->height) {
+		scroll_steps = steps;
 		if (steps < 0 && -steps > view->offset) {
-			steps = -view->offset;
+			scroll_steps = -view->offset;
 
 		} else if (steps > 0) {
 			if (view->lineno == view->lines - 1 &&
 			    view->lines > view->height) {
-				steps = view->lines - view->offset - 1;
-				if (steps >= view->height)
-					steps -= view->height - 1;
+				scroll_steps = view->lines - view->offset - 1;
+				if (scroll_steps >= view->height)
+					scroll_steps -= view->height - 1;
 			}
 		}
+	}
 
-		do_scroll_view(view, steps, redraw);
+	if (!view_is_displayed(view)) {
+		view->offset += steps;
+		view->ops->select(view, &view->line[view->lineno]);
 		return;
 	}
 
-	/* Draw the current line */
-	draw_view_line(view, view->lineno - view->offset);
+	/* Repaint the old "current" line if we be scrolling */
+	if (ABS(steps) < view->height)
+		draw_view_line(view, view->lineno - steps - view->offset);
 
-	if (!redraw)
+	if (scroll_steps) {
+		do_scroll_view(view, scroll_steps);
 		return;
+	}
+
+	/* Draw the current line */
+	draw_view_line(view, view->lineno - view->offset);
 
 	redrawwin(view->win);
 	wrefresh(view->win);
@@ -1608,7 +1616,7 @@ move_view(struct view *view, enum request request, bool redraw)
  * Searching
  */
 
-static void search_view(struct view *view, enum request request, const char *search);
+static void search_view(struct view *view, enum request request);
 
 static bool
 find_next_line(struct view *view, unsigned long lineno, struct line *line)
@@ -1627,9 +1635,6 @@ find_next_line(struct view *view, unsigned long lineno, struct line *line)
 		unsigned long old_lineno = view->lineno - view->offset;
 
 		view->lineno = lineno;
-
-		wmove(view->win, old_lineno, 0);
-		wclrtoeol(view->win);
 		draw_view_line(view, old_lineno);
 
 		draw_view_line(view, view->lineno - view->offset);
@@ -1651,7 +1656,7 @@ find_next(struct view *view, enum request request)
 		if (!*opt_search)
 			report("No previous search");
 		else
-			search_view(view, request, opt_search);
+			search_view(view, request);
 		return;
 	}
 
@@ -1686,7 +1691,7 @@ find_next(struct view *view, enum request request)
 }
 
 static void
-search_view(struct view *view, enum request request, const char *search)
+search_view(struct view *view, enum request request)
 {
 	int regex_err;
 
@@ -1699,7 +1704,7 @@ search_view(struct view *view, enum request request, const char *search)
 			return;
 	}
 
-	regex_err = regcomp(view->regex, search, REG_EXTENDED);
+	regex_err = regcomp(view->regex, opt_search, REG_EXTENDED);
 	if (regex_err != 0) {
 		char buf[SIZEOF_STR] = "unknown error";
 
@@ -1708,7 +1713,7 @@ search_view(struct view *view, enum request request, const char *search)
 		return;
 	}
 
-	string_copy(view->grep, search);
+	string_copy(view->grep, opt_search);
 
 	find_next(view, request);
 }
@@ -2014,7 +2019,7 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
 
 		/* Scroll the view that was split if the current line is
 		 * outside the new limited view. */
-		do_scroll_view(prev, lines, TRUE);
+		do_scroll_view(prev, lines);
 	}
 
 	if (prev && view != prev) {
@@ -2059,7 +2064,7 @@ view_driver(struct view *view, enum request request)
 	case REQ_MOVE_PAGE_DOWN:
 	case REQ_MOVE_FIRST_LINE:
 	case REQ_MOVE_LAST_LINE:
-		move_view(view, request, TRUE);
+		move_view(view, request);
 		break;
 
 	case REQ_SCROLL_LINE_DOWN:
@@ -2092,14 +2097,12 @@ view_driver(struct view *view, enum request request)
 		     view->parent == VIEW(REQ_VIEW_MAIN)) ||
 		   (view == VIEW(REQ_VIEW_BLOB) &&
 		     view->parent == VIEW(REQ_VIEW_TREE))) {
-			bool redraw = display[1] == view;
-
 			view = view->parent;
-			move_view(view, request, redraw);
-			if (redraw)
+			move_view(view, request);
+			if (view_is_displayed(view))
 				update_view_title(view);
 		} else {
-			move_view(view, request, TRUE);
+			move_view(view, request);
 			break;
 		}
 		/* Fall-through */
@@ -2144,7 +2147,7 @@ view_driver(struct view *view, enum request request)
 
 	case REQ_SEARCH:
 	case REQ_SEARCH_BACK:
-		search_view(view, request, opt_search);
+		search_view(view, request);
 		break;
 
 	case REQ_FIND_NEXT:
@@ -2554,7 +2557,7 @@ tree_read(struct view *view, char *text)
 static bool
 tree_enter(struct view *view, struct line *line)
 {
-	enum open_flags flags = OPEN_DEFAULT;
+	enum open_flags flags = display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT;
 	char *data = line->data;
 	enum request request;
 
@@ -2589,10 +2592,6 @@ tree_enter(struct view *view, struct line *line)
 		break;
 
 	case LINE_TREE_FILE:
-		/* This causes the blob view to become split, and not having it
-		 * in the tree dir case will make the blob view automatically
-		 * disappear when moving to a different directory. */
-		flags |= OPEN_SPLIT;
 		request = REQ_VIEW_BLOB;
 		break;
 
@@ -2602,28 +2601,24 @@ tree_enter(struct view *view, struct line *line)
 
 	open_view(view, request, flags);
 
-	if (!VIEW(request)->pipe)
-		return TRUE;
-
-	/* For tree views insert the path to the parent as the first line. */
-	if (request == REQ_VIEW_BLOB) {
-		/* Mirror what is showed in the title bar. */
-		string_ncopy(ref_blob, data + STRING_SIZE("100644 blob "), 40);
-		string_copy(VIEW(REQ_VIEW_BLOB)->ref, ref_blob);
-		return TRUE;
-	}
-
 	return TRUE;
 }
 
 static void
 tree_select(struct view *view, struct line *line)
 {
-	if (line->type == LINE_TREE_DIR || line->type == LINE_TREE_FILE) {
-		char *text = line->data;
+	char *text = line->data;
+
+	text += STRING_SIZE("100644 blob ");
+
+	if (line->type == LINE_TREE_FILE) {
+		string_ncopy(ref_blob, text, 40);
+		/* Also update the blob view's ref, since all there must always
+		 * be in sync. */
+		string_copy(VIEW(REQ_VIEW_BLOB)->ref, ref_blob);
 
-		string_ncopy(view->ref, text + STRING_SIZE("100644 blob "), 40);
-		string_copy(ref_blob, view->ref);
+	} else if (line->type == LINE_TREE_DIR) {
+		string_ncopy(view->ref, text, 40);
 	}
 }