Add color for cursor in backgrounded view

Closes #1374

Author: koutcher

NEWS.adoc

@@ -8,6 +8,13 @@ Bug fixes:
 
  - Initialise %(head) from command line arguments. (#1366)
  - Make `$GIT_EDITOR` value interpreted by the shell. (#1367)
+ - Use correct line from recursively blamed commit. (#1369, #1370)
+ - Use correct line when using `:parent` in blame view. (#1372)
+ - Fix the incorrect line shift after stage file. (#1371)
+
+Improvements:
+
+ - Add color for cursor in backgrounded view. (#1374)
 
 tig-2.5.12
 ----------

doc/tigrc.5.adoc

@@ -1060,7 +1060,8 @@ setting the *default* color option.
 [frame="none",grid="none",cols="25<m,75<"]
 |=============================================================================
 |default		|Override default terminal colors (see above).
-|cursor			|The cursor line.
+|cursor			|The cursor line for the current view.
+|cursor-blur		|The cursor line of any backgrounded view.
 |status			|The status window showing info messages.
 |title-focus		|The title window for the current view.
 |title-blur		|The title window of any backgrounded view.
@@ -1097,8 +1098,12 @@ setting the *default* color option.
 |main-tracked		|Label of the remote tracked by the current branch.
 |main-tag		|Label of a signed tag.
 |main-local-tag		|Label of a local tag.
-|main-ref		|Label of any other reference.
+|main-ref		|Label of a branch.
 |main-replace		|Label of replaced reference.
+|main-stash		|Label of the stash.
+|main-note		|Label of notes.
+|main-prefetch		|Label of reference prefetched by `git maintenance`.
+|main-other		|Label of any other reference.
 |=============================================================================
 
 .Status view

include/tig/line.h

@@ -50,6 +50,7 @@ struct ref;
 	_(COMMITTER,		"committer "), \
 	_(DEFAULT,		""), \
 	_(CURSOR,		""), \
+	_(CURSOR_BLUR,		""), \
 	_(STATUS,		""), \
 	_(DELIMITER,		""), \
 	_(DATE,			""), \

src/draw.c

@@ -15,6 +15,7 @@
 #include "tig/graph.h"
 #include "tig/draw.h"
 #include "tig/options.h"
+#include "tig/display.h"
 #include "compat/hashtab.h"
 
 static const enum line_type palette_colors[] = {
@@ -667,7 +668,7 @@ draw_view_line(struct view *view, unsigned int lineno)
 	line->dirty = line->cleareol = 0;
 
 	if (selected) {
-		set_view_attr(view, LINE_CURSOR);
+		set_view_attr(view, view == display[current_view] ? LINE_CURSOR : LINE_CURSOR_BLUR);
 		line->selected = true;
 		view->ops->select(view, line);
 	}

src/tig.c

@@ -244,16 +244,22 @@ view_driver(struct view *view, enum request request)
 	{
 		int nviews = displayed_views();
 		int next_view = nviews ? (current_view + 1) % nviews : current_view;
+		struct view *next = display[next_view];
 
 		if (next_view == current_view) {
 			report("Only one view is displayed");
 			break;
 		}
 
 		current_view = next_view;
-		/* Blur out the title of the previous view. */
+		/* Blur out the title and cursor of the previous view. */
 		update_view_title(view);
+		draw_view_line(view, view->pos.lineno - view->pos.offset);
+		wnoutrefresh(view->win);
+		/* Brighten the title and cursor of the next view. */
 		report_clear();
+		draw_view_line(next, next->pos.lineno - next->pos.offset);
+		wnoutrefresh(next->win);
 		break;
 	}
 	case REQ_REFRESH:
@@ -613,9 +619,6 @@ find_clicked_view(MEVENT *event)
 
 		if (beg_y <= event->y && event->y < beg_y + view->height
 		    && beg_x <= event->x && event->x < beg_x + view->width) {
-			if (i != current_view) {
-				current_view = i;
-			}
 			return view;
 		}
 	}
@@ -636,6 +639,9 @@ handle_mouse_event(void)
 	if (!view)
 		return REQ_NONE;
 
+	if (view != display[current_view])
+		return REQ_VIEW_NEXT;
+
 #ifdef BUTTON5_PRESSED
 	if (event.bstate & (BUTTON2_PRESSED | BUTTON5_PRESSED))
 #else

src/view.c

@@ -766,6 +766,8 @@ split_view(struct view *prev, struct view *view)
 	if (view != prev && view_is_displayed(prev)) {
 		/* "Blur" the previous view. */
 		update_view_title(prev);
+		draw_view_line(prev, prev->pos.lineno - prev->pos.offset);
+		wnoutrefresh(prev->win);
 	}
 
 	if (view_has_flags(prev, VIEW_FLEX_WIDTH) && vsplit && nviews == 1)

tigrc

@@ -413,6 +413,7 @@ color "    Original-patch-by:"	yellow	default
 color "    Inspired-by:"	yellow	default
 color default			default	default	normal
 color cursor			white	green	bold
+color cursor-blur		white	green
 color status			green	default
 color delimiter			magenta	default
 color date			blue	default