Commit df711b9cfd8deccd1a307613c1d2ffaefab2f438

Date: Tue Apr 22 10:50:18 +0000 2008
Committer: Jonas Fonseca (fonseca@diku.dk)
Author: Jonas Fonseca (fonseca@diku.dk)
Commit SHA1: df711b9cfd8deccd1a307613c1d2ffaefab2f438
Tree SHA1: c84fee97cc306bdb32b4665ee48a383d2984199b

Simplify line attribute handling

- Add set_view_attr() that wraps calls to wattrset() and does the right
thing for the selected line. For successive calls without a change of
the attribute nothing will be done.

- Make draw_text() take a line attribute since all callers were already
calling set_view_attr().

Note: all attribute updates will now also call wchgat() in addition to
wattrset().

Commit diff
Comments (0)

tig.c 169 -----------------------------------------------------------------------------------------------++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Commit diff

Diff rendering mode:
inline
side by side

tig.c


612	612	enum line_type {
613	613	#define LINE(type, line, fg, bg, attr) \
614	614	LINE_##type
615		~~LINE_INFO~~
	615	LINE_INFO,
	616	LINE_NONE
616	617	#undef LINE
617	618	};
618	619
…	…
1398	1398	size_t line_size; /* Total number of used lines */
1399	1399	unsigned int digits; /* Number of digits in the lines member. */
1400	1400
	1401	/* Drawing */
	1402	struct line curline; / Line currently being drawn. */
	1403	enum line_type curtype; /* Attribute currently used for drawing. */
	1404
1401	1405	/* Loading */
1402	1406	FILE *pipe;
1403	1407	time_t start_time;
…	…
1415	1415	/* Read one line; updates view->line. */
1416	1416	bool (read)(struct view view, char *data);
1417	1417	/* Draw one line; @lineno must be < view->height. */
1418		~~bool (draw)(struct view view, struct line *line, unsigned int lineno, bool selected);~~
	1418	bool (draw)(struct view view, struct line *line, unsigned int lineno);
1419	1419	/* Depending on view handle a special requests. */
1420	1420	enum request (request)(struct view view, enum request request, struct line *line);
1421	1421	/* Search for regex in a line. */
…	…
1471	1471	/* LINE_GRAPHIC_VLINE: */ '\|'
1472	1472	};
1473	1473
	1474	static inline void
	1475	set_view_attr(struct view *view, enum line_type type)
	1476	{
	1477	if (!view->curline->selected && view->curtype != type) {
	1478	wattrset(view->win, get_line_attr(type));
	1479	wchgat(view->win, -1, 0, type, NULL);
	1480	view->curtype = type;
	1481	}
	1482	}
	1483
1474	1484	static int
1475		~~draw_text(struct view view, const char string, int max_len,~~
1476		~~bool use_tilde, bool selected)~~
	1485	draw_text(struct view view, enum line_type type, const char string,
	1486	int max_len, bool use_tilde)
1477	1487	{
1478	1488	int len = 0;
1479	1489	int trimmed = FALSE;
…	…
1504	1504	}
1505	1505	}
1506	1506
	1507	set_view_attr(view, type);
1507	1508	waddnstr(view->win, string, len);
1508	1509	if (trimmed && use_tilde) {
1509		~~if (!selected)~~
1510		~~wattrset(view->win, get_line_attr(LINE_DELIMITER));~~
	1510	set_view_attr(view, LINE_DELIMITER);
1511	1511	waddch(view->win, '~');
1512	1512	len++;
1513	1513	}
…	…
1516	1516	}
1517	1517
1518	1518	static int
1519		~~draw_lineno(struct view *view, unsigned int lineno, int max, bool selected)~~
	1519	draw_lineno(struct view *view, unsigned int lineno, int max)
1520	1520	{
1521	1521	static char fmt[] = "%1ld";
1522	1522	char number[10] = " ";
…	…
1538	1538	if (max < max_number)
1539	1539	max_number = max;
1540	1540
1541		~~if (!selected)~~
1542		~~wattrset(view->win, get_line_attr(LINE_LINE_NUMBER));~~
1543		~~col = draw_text(view, number, max_number, showtrimmed, selected);~~
	1541	col = draw_text(view, LINE_LINE_NUMBER, number, max_number, showtrimmed);
1544	1542	if (col < max) {
1545		~~if (!selected)~~
1546		~~wattrset(view->win, A_NORMAL);~~
	1543	set_view_attr(view, LINE_DEFAULT);
1547	1544	waddch(view->win, line_graphics[LINE_GRAPHIC_VLINE]);
1548	1545	col++;
1549	1546	}
…	…
1553	1553	}
1554	1554
1555	1555	static int
1556		~~draw_date(struct view view, struct tm time, int max, bool selected)~~
	1556	draw_date(struct view view, struct tm time, int max)
1557	1557	{
1558	1558	char buf[DATE_COLS];
1559	1559	int col;
…	…
1568	1568	buf[sizeof(buf) - 1] = 0;
1569	1569	}
1570	1570
1571		~~if (!selected)~~
1572		~~wattrset(view->win, get_line_attr(LINE_DATE));~~
1573		~~col = draw_text(view, buf, max, FALSE, selected);~~
	1571	col = draw_text(view, LINE_DATE, buf, max, FALSE);
1574	1572	if (col < max) {
1575		~~if (!selected)~~
1576		~~wattrset(view->win, get_line_attr(LINE_DEFAULT));~~
	1573	set_view_attr(view, LINE_DEFAULT);
1577	1574	waddch(view->win, ' ');
1578	1575	col++;
1579	1576	}
…	…
1593	1593	line = &view->line[view->offset + lineno];
1594	1594
1595	1595	wmove(view->win, lineno, 0);
	1596	view->curline = line;
	1597	view->curtype = LINE_NONE;
	1598	line->selected = FALSE;
1596	1599
1597	1600	if (selected) {
	1601	set_view_attr(view, LINE_CURSOR);
1598	1602	line->selected = TRUE;
1599	1603	view->ops->select(view, line);
1600		~~wchgat(view->win, -1, 0, LINE_CURSOR, NULL);~~
1601		~~wattrset(view->win, get_line_attr(LINE_CURSOR));~~
1602	1604	} else if (line->selected) {
1603		~~line->selected = FALSE;~~
1604	1605	wclrtoeol(view->win);
1605	1606	}
1606	1607
1607	1608	scrollok(view->win, FALSE);
1608		~~draw_ok = view->ops->draw(view, line, lineno, selected);~~
	1609	draw_ok = view->ops->draw(view, line, lineno);
1609	1610	scrollok(view->win, TRUE);
1610	1611
1611	1612	return draw_ok;
…	…
2805	2805	*/
2806	2806
2807	2807	static bool
2808		~~pager_draw(struct view view, struct line line, unsigned int lineno, bool selected)~~
	2808	pager_draw(struct view view, struct line line, unsigned int lineno)
2809	2809	{
2810	2810	char *text = line->data;
2811	2811	int col = 0;
2812	2812
2813	2813	if (opt_line_number) {
2814		~~col += draw_lineno(view, lineno, view->width, selected);~~
	2814	col += draw_lineno(view, lineno, view->width);
2815	2815	if (col >= view->width)
2816	2816	return TRUE;
2817	2817	}
2818	2818
2819		~~if (!selected)~~
2820		~~wattrset(view->win, get_line_attr(line->type));~~
2821
2822		~~draw_text(view, text, view->width - col, TRUE, selected);~~
	2819	draw_text(view, line->type, text, view->width - col, TRUE);
2823	2820	return TRUE;
2824	2821	}
2825	2822
…	…
3600	3600	}
3601	3601
3602	3602	static bool
3603		~~blame_draw(struct view view, struct line line, unsigned int lineno, bool selected)~~
	3603	blame_draw(struct view view, struct line line, unsigned int lineno)
3604	3604	{
3605	3605	struct blame *blame = line->data;
3606	3606	int col = 0;
…	…
3609	3609	struct tm time = blame->commit && blame->commit->filename
3610	3610	? &blame->commit->time : NULL;
3611	3611
3612		~~col += draw_date(view, time, view->width, selected);~~
	3612	col += draw_date(view, time, view->width);
3613	3613	if (col >= view->width)
3614	3614	return TRUE;
3615	3615	}
…	…
3617	3617	if (opt_author) {
3618	3618	int max = MIN(AUTHOR_COLS - 1, view->width - col);
3619	3619
3620		~~if (!selected)~~
3621		~~wattrset(view->win, get_line_attr(LINE_MAIN_AUTHOR));~~
	3620	set_view_attr(view, LINE_MAIN_AUTHOR);
3622	3621	if (blame->commit)
3623		~~draw_text(view, blame->commit->author, max, TRUE, selected);~~
	3622	draw_text(view, LINE_MAIN_AUTHOR, blame->commit->author, max, TRUE);
3624	3623	col += AUTHOR_COLS;
3625	3624	if (col >= view->width)
3626	3625	return TRUE;
…	…
3629	3629	{
3630	3630	int max = MIN(ID_COLS - 1, view->width - col);
3631	3631
3632		~~if (!selected)~~
3633		~~wattrset(view->win, get_line_attr(LINE_BLAME_ID));~~
	3632	set_view_attr(view, LINE_BLAME_ID);
3634	3633	if (blame->commit)
3635		~~draw_text(view, blame->commit->id, max, FALSE, -1);~~
	3634	draw_text(view, LINE_BLAME_ID, blame->commit->id, max, FALSE);
3636	3635	col += ID_COLS;
3637	3636	if (col >= view->width)
3638	3637	return TRUE;
3639	3638	wmove(view->win, lineno, col);
3640	3639	}
3641	3640
3642		~~col += draw_lineno(view, lineno, view->width - col, selected);~~
	3641	col += draw_lineno(view, lineno, view->width - col);
3643	3642	if (col >= view->width)
3644	3643	return TRUE;
3645	3644
3646		~~col += draw_text(view, blame->text, view->width - col, TRUE, selected);~~
	3645	col += draw_text(view, LINE_DEFAULT, blame->text, view->width - col, TRUE);
3647	3646	return TRUE;
3648	3647	}
3649	3648
…	…
4001	4001	}
4002	4002
4003	4003	static bool
4004		~~status_draw(struct view view, struct line line, unsigned int lineno, bool selected)~~
	4004	status_draw(struct view view, struct line line, unsigned int lineno)
4005	4005	{
4006	4006	struct status *status = line->data;
	4007	enum line_type type;
4007	4008	char *text;
4008	4009	int col = 0;
4009	4010
4010		~~if (selected) {~~
4011		~~/* No attributes. */~~
4012
4013		~~} else if (line->type == LINE_STAT_HEAD) {~~
4014		~~wattrset(view->win, get_line_attr(LINE_STAT_HEAD));~~
4015		~~wchgat(view->win, -1, 0, LINE_STAT_HEAD, NULL);~~
4016
4017		~~} else if (!status && line->type != LINE_STAT_NONE) {~~
4018		~~wattrset(view->win, get_line_attr(LINE_STAT_SECTION));~~
4019		~~wchgat(view->win, -1, 0, LINE_STAT_SECTION, NULL);~~
4020
4021		~~} else {~~
4022		~~wattrset(view->win, get_line_attr(line->type));~~
4023		}
4024
4025	4011	if (!status) {
4026	4012	switch (line->type) {
4027	4013	case LINE_STAT_STAGED:
	4014	type = LINE_STAT_SECTION;
4028	4015	text = "Changes to be committed:";
4029	4016	break;
4030	4017
4031	4018	case LINE_STAT_UNSTAGED:
	4019	type = LINE_STAT_SECTION;
4032	4020	text = "Changed but not updated:";
4033	4021	break;
4034	4022
4035	4023	case LINE_STAT_UNTRACKED:
	4024	type = LINE_STAT_SECTION;
4036	4025	text = "Untracked files:";
4037	4026	break;
4038	4027
4039	4028	case LINE_STAT_NONE:
	4029	type = LINE_DEFAULT;
4040	4030	text = " (no files)";
4041	4031	break;
4042	4032
4043	4033	case LINE_STAT_HEAD:
	4034	type = LINE_STAT_HEAD;
4044	4035	text = status_onbranch;
4045	4036	break;
4046	4037
…	…
4041	4041	} else {
4042	4042	char buf[] = { status->status, ' ', ' ', ' ', 0 };
4043	4043
4044		~~col += draw_text(view, buf, view->width, TRUE, selected);~~
4045		~~if (!selected)~~
4046		~~wattrset(view->win, A_NORMAL);~~
	4044	col += draw_text(view, line->type, buf, view->width, TRUE);
	4045	type = LINE_DEFAULT;
4047	4046	text = status->new.name;
4048	4047	}
4049	4048
4050		~~draw_text(view, text, view->width - col, TRUE, selected);~~
	4049	draw_text(view, type, text, view->width - col, TRUE);
4051	4050	return TRUE;
4052	4051	}
4053	4052
…	…
4825	4825	*/
4826	4826
4827	4827	static bool
4828		~~main_draw(struct view view, struct line line, unsigned int lineno, bool selected)~~
	4828	main_draw(struct view view, struct line line, unsigned int lineno)
4829	4829	{
4830	4830	struct commit *commit = line->data;
4831		~~enum line_type type;~~
4832	4831	int col = 0;
4833	4832
4834	4833	if (!*commit->author)
4835	4834	return FALSE;
4836	4835
4837		~~if (selected) {~~
4838		~~type = LINE_CURSOR;~~
4839		~~} else {~~
4840		~~type = LINE_MAIN_COMMIT;~~
4841		}
4842
4843	4836	if (opt_date) {
4844		~~col += draw_date(view, &commit->time, view->width, selected);~~
	4837	col += draw_date(view, &commit->time, view->width);
4845	4838	if (col >= view->width)
4846	4839	return TRUE;
4847	4840	}
4848		~~if (type != LINE_CURSOR)~~
4849		~~wattrset(view->win, get_line_attr(LINE_MAIN_AUTHOR));~~
4850	4841
4851	4842	if (opt_author) {
4852	4843	int max_len;
…	…
4845	4845	max_len = view->width - col;
4846	4846	if (max_len > AUTHOR_COLS - 1)
4847	4847	max_len = AUTHOR_COLS - 1;
4848		~~draw_text(view, commit->author, max_len, TRUE, selected);~~
	4848	draw_text(view, LINE_MAIN_AUTHOR, commit->author, max_len, TRUE);
4849	4849	col += AUTHOR_COLS;
4850	4850	if (col >= view->width)
4851	4851	return TRUE;
…	…
4855	4855	size_t graph_size = view->width - col;
4856	4856	size_t i;
4857	4857
4858		~~if (type != LINE_CURSOR)~~
4859		~~wattrset(view->win, get_line_attr(LINE_MAIN_REVGRAPH));~~
	4858	set_view_attr(view, LINE_MAIN_REVGRAPH);
4860	4859	wmove(view->win, lineno, col);
4861	4860	if (graph_size > commit->graph_size)
4862	4861	graph_size = commit->graph_size;
…	…
4869	4869	return TRUE;
4870	4870	waddch(view->win, ' ');
4871	4871	}
4872		~~if (type != LINE_CURSOR)~~
4873		~~wattrset(view->win, A_NORMAL);~~
4874	4872
	4873	set_view_attr(view, LINE_DEFAULT);
4875	4874	wmove(view->win, lineno, col);
4876	4875
4877	4876	if (opt_show_refs && commit->refs) {
4878	4877	size_t i = 0;
4879	4878
4880	4879	do {
4881		~~if (type == LINE_CURSOR)~~
4882		;
4883		~~else if (commit->refs[i]->head)~~
4884		~~wattrset(view->win, get_line_attr(LINE_MAIN_HEAD));~~
	4880	enum line_type type;
	4881
	4882	if (commit->refs[i]->head)
	4883	type = LINE_MAIN_HEAD;
4885	4884	else if (commit->refs[i]->ltag)
4886		~~wattrset(view->win, get_line_attr(LINE_MAIN_LOCAL_TAG));~~
	4885	type = LINE_MAIN_LOCAL_TAG;
4887	4886	else if (commit->refs[i]->tag)
4888		~~wattrset(view->win, get_line_attr(LINE_MAIN_TAG));~~
	4887	type = LINE_MAIN_TAG;
4889	4888	else if (commit->refs[i]->tracked)
4890		~~wattrset(view->win, get_line_attr(LINE_MAIN_TRACKED));~~
	4889	type = LINE_MAIN_TRACKED;
4891	4890	else if (commit->refs[i]->remote)
4892		~~wattrset(view->win, get_line_attr(LINE_MAIN_REMOTE));~~
	4891	type = LINE_MAIN_REMOTE;
4893	4892	else
4894		~~wattrset(view->win, get_line_attr(LINE_MAIN_REF));~~
4895
4896		~~col += draw_text(view, "[", view->width - col, TRUE, selected);~~
4897		~~col += draw_text(view, commit->refs[i]->name, view->width - col,~~
4898		~~TRUE, selected);~~
4899		~~col += draw_text(view, "]", view->width - col, TRUE, selected);~~
4900		~~if (type != LINE_CURSOR)~~
4901		~~wattrset(view->win, A_NORMAL);~~
4902		~~col += draw_text(view, " ", view->width - col, TRUE, selected);~~
	4893	type = LINE_MAIN_REF;
	4894
	4895	col += draw_text(view, type, "[", view->width - col, TRUE);
	4896	col += draw_text(view, type, commit->refs[i]->name, view->width - col, TRUE);
	4897	col += draw_text(view, type, "]", view->width - col, TRUE);
	4898
	4899	col += draw_text(view, LINE_DEFAULT, " ", view->width - col, TRUE);
4903	4900	if (col >= view->width)
4904	4901	return TRUE;
4905	4902	} while (commit->refs[i++]->next);
4906	4903	}
4907	4904
4908		~~if (type != LINE_CURSOR)~~
4909		~~wattrset(view->win, get_line_attr(type));~~
4910
4911		~~draw_text(view, commit->title, view->width - col, TRUE, selected);~~
	4905	draw_text(view, LINE_DEFAULT, commit->title, view->width - col, TRUE);
4912	4906	return TRUE;
4913	4907	}
4914	4908
toggle raw diff
--- a/tig.c +++ b/tig.c @@ -612,7 +612,8 @@ LINE(BLAME_ID, "", COLOR_MAGENTA, COLOR_DEFAULT, 0) enum line_type { #define LINE(type, line, fg, bg, attr) \ LINE_##type - LINE_INFO + LINE_INFO, + LINE_NONE #undef LINE }; @@ -1397,6 +1398,10 @@ struct view { size_t line_size; /* Total number of used lines / unsigned int digits; / Number of digits in the lines member. / + / Drawing / + struct line curline; /* Line currently being drawn. / + enum line_type curtype; / Attribute currently used for drawing. / + / Loading / FILE pipe; time_t start_time; @@ -1410,7 +1415,7 @@ struct view_ops { /* Read one line; updates view->line. / bool (read)(struct view view, char data); /* Draw one line; @lineno must be < view->height. / - bool (draw)(struct view view, struct line line, unsigned int lineno, bool selected); + bool (draw)(struct view view, struct line line, unsigned int lineno); / Depending on view handle a special requests. / enum request (request)(struct view view, enum request request, struct line line); /* Search for regex in a line. / @@ -1466,9 +1471,19 @@ static int line_graphics[] = { / LINE_GRAPHIC_VLINE: / '\|' }; +static inline void +set_view_attr(struct view view, enum line_type type) +{ + if (!view->curline->selected && view->curtype != type) { + wattrset(view->win, get_line_attr(type)); + wchgat(view->win, -1, 0, type, NULL); + view->curtype = type; + } +} + static int -draw_text(struct view view, const char string, int max_len, - bool use_tilde, bool selected) +draw_text(struct view view, enum line_type type, const char string, + int max_len, bool use_tilde) { int len = 0; int trimmed = FALSE; @@ -1489,10 +1504,10 @@ draw_text(struct view view, const char string, int max_len, } } + set_view_attr(view, type); waddnstr(view->win, string, len); if (trimmed && use_tilde) { - if (!selected) - wattrset(view->win, get_line_attr(LINE_DELIMITER)); + set_view_attr(view, LINE_DELIMITER); waddch(view->win, '~'); len++; } @@ -1501,7 +1516,7 @@ draw_text(struct view view, const char string, int max_len, } static int -draw_lineno(struct view view, unsigned int lineno, int max, bool selected) +draw_lineno(struct view view, unsigned int lineno, int max) { static char fmt[] = "%1ld"; char number[10] = " "; @@ -1523,12 +1538,9 @@ draw_lineno(struct view view, unsigned int lineno, int max, bool selected) if (max < max_number) max_number = max; - if (!selected) - wattrset(view->win, get_line_attr(LINE_LINE_NUMBER)); - col = draw_text(view, number, max_number, showtrimmed, selected); + col = draw_text(view, LINE_LINE_NUMBER, number, max_number, showtrimmed); if (col < max) { - if (!selected) - wattrset(view->win, A_NORMAL); + set_view_attr(view, LINE_DEFAULT); waddch(view->win, line_graphics[LINE_GRAPHIC_VLINE]); col++; } @@ -1541,7 +1553,7 @@ draw_lineno(struct view view, unsigned int lineno, int max, bool selected) } static int -draw_date(struct view view, struct tm time, int max, bool selected) +draw_date(struct view view, struct tm time, int max) { char buf[DATE_COLS]; int col; @@ -1556,12 +1568,9 @@ draw_date(struct view view, struct tm time, int max, bool selected) buf[sizeof(buf) - 1] = 0; } - if (!selected) - wattrset(view->win, get_line_attr(LINE_DATE)); - col = draw_text(view, buf, max, FALSE, selected); + col = draw_text(view, LINE_DATE, buf, max, FALSE); if (col < max) { - if (!selected) - wattrset(view->win, get_line_attr(LINE_DEFAULT)); + set_view_attr(view, LINE_DEFAULT); waddch(view->win, ' '); col++; } @@ -1584,19 +1593,20 @@ draw_view_line(struct view view, unsigned int lineno) line = &view->line[view->offset + lineno]; wmove(view->win, lineno, 0); + view->curline = line; + view->curtype = LINE_NONE; + line->selected = FALSE; if (selected) { + set_view_attr(view, LINE_CURSOR); line->selected = TRUE; view->ops->select(view, line); - wchgat(view->win, -1, 0, LINE_CURSOR, NULL); - wattrset(view->win, get_line_attr(LINE_CURSOR)); } else if (line->selected) { - line->selected = FALSE; wclrtoeol(view->win); } scrollok(view->win, FALSE); - draw_ok = view->ops->draw(view, line, lineno, selected); + draw_ok = view->ops->draw(view, line, lineno); scrollok(view->win, TRUE); return draw_ok; @@ -2795,21 +2805,18 @@ view_driver(struct view view, enum request request) / static bool -pager_draw(struct view view, struct line line, unsigned int lineno, bool selected) +pager_draw(struct view view, struct line line, unsigned int lineno) { char text = line->data; int col = 0; if (opt_line_number) { - col += draw_lineno(view, lineno, view->width, selected); + col += draw_lineno(view, lineno, view->width); if (col >= view->width) return TRUE; } - if (!selected) - wattrset(view->win, get_line_attr(line->type)); - - draw_text(view, text, view->width - col, TRUE, selected); + draw_text(view, line->type, text, view->width - col, TRUE); return TRUE; } @@ -3593,7 +3600,7 @@ blame_read(struct view view, char line) } static bool -blame_draw(struct view view, struct line line, unsigned int lineno, bool selected) +blame_draw(struct view view, struct line line, unsigned int lineno) { struct blame blame = line->data; int col = 0; @@ -3602,7 +3609,7 @@ blame_draw(struct view view, struct line line, unsigned int lineno, bool selec struct tm time = blame->commit && blame->commit->filename ? &blame->commit->time : NULL; - col += draw_date(view, time, view->width, selected); + col += draw_date(view, time, view->width); if (col >= view->width) return TRUE; } @@ -3610,10 +3617,9 @@ blame_draw(struct view view, struct line line, unsigned int lineno, bool selec if (opt_author) { int max = MIN(AUTHOR_COLS - 1, view->width - col); - if (!selected) - wattrset(view->win, get_line_attr(LINE_MAIN_AUTHOR)); + set_view_attr(view, LINE_MAIN_AUTHOR); if (blame->commit) - draw_text(view, blame->commit->author, max, TRUE, selected); + draw_text(view, LINE_MAIN_AUTHOR, blame->commit->author, max, TRUE); col += AUTHOR_COLS; if (col >= view->width) return TRUE; @@ -3623,21 +3629,20 @@ blame_draw(struct view view, struct line line, unsigned int lineno, bool selec { int max = MIN(ID_COLS - 1, view->width - col); - if (!selected) - wattrset(view->win, get_line_attr(LINE_BLAME_ID)); + set_view_attr(view, LINE_BLAME_ID); if (blame->commit) - draw_text(view, blame->commit->id, max, FALSE, -1); + draw_text(view, LINE_BLAME_ID, blame->commit->id, max, FALSE); col += ID_COLS; if (col >= view->width) return TRUE; wmove(view->win, lineno, col); } - col += draw_lineno(view, lineno, view->width - col, selected); + col += draw_lineno(view, lineno, view->width - col); if (col >= view->width) return TRUE; - col += draw_text(view, blame->text, view->width - col, TRUE, selected); + col += draw_text(view, LINE_DEFAULT, blame->text, view->width - col, TRUE); return TRUE; } @@ -3996,46 +4001,37 @@ status_open(struct view view) } static bool -status_draw(struct view view, struct line line, unsigned int lineno, bool selected) +status_draw(struct view view, struct line line, unsigned int lineno) { struct status status = line->data; + enum line_type type; char text; int col = 0; - if (selected) { - /* No attributes. / - - } else if (line->type == LINE_STAT_HEAD) { - wattrset(view->win, get_line_attr(LINE_STAT_HEAD)); - wchgat(view->win, -1, 0, LINE_STAT_HEAD, NULL); - - } else if (!status && line->type != LINE_STAT_NONE) { - wattrset(view->win, get_line_attr(LINE_STAT_SECTION)); - wchgat(view->win, -1, 0, LINE_STAT_SECTION, NULL); - - } else { - wattrset(view->win, get_line_attr(line->type)); - } - if (!status) { switch (line->type) { case LINE_STAT_STAGED: + type = LINE_STAT_SECTION; text = "Changes to be committed:"; break; case LINE_STAT_UNSTAGED: + type = LINE_STAT_SECTION; text = "Changed but not updated:"; break; case LINE_STAT_UNTRACKED: + type = LINE_STAT_SECTION; text = "Untracked files:"; break; case LINE_STAT_NONE: + type = LINE_DEFAULT; text = " (no files)"; break; case LINE_STAT_HEAD: + type = LINE_STAT_HEAD; text = status_onbranch; break; @@ -4045,13 +4041,12 @@ status_draw(struct view view, struct line line, unsigned int lineno, bool sele } else { char buf[] = { status->status, ' ', ' ', ' ', 0 }; - col += draw_text(view, buf, view->width, TRUE, selected); - if (!selected) - wattrset(view->win, A_NORMAL); + col += draw_text(view, line->type, buf, view->width, TRUE); + type = LINE_DEFAULT; text = status->new.name; } - draw_text(view, text, view->width - col, TRUE, selected); + draw_text(view, type, text, view->width - col, TRUE); return TRUE; } @@ -4830,28 +4825,19 @@ update_rev_graph(struct rev_graph graph) / static bool -main_draw(struct view view, struct line line, unsigned int lineno, bool selected) +main_draw(struct view view, struct line line, unsigned int lineno) { struct commit commit = line->data; - enum line_type type; int col = 0; if (!commit->author) return FALSE; - if (selected) { - type = LINE_CURSOR; - } else { - type = LINE_MAIN_COMMIT; - } - if (opt_date) { - col += draw_date(view, &commit->time, view->width, selected); + col += draw_date(view, &commit->time, view->width); if (col >= view->width) return TRUE; } - if (type != LINE_CURSOR) - wattrset(view->win, get_line_attr(LINE_MAIN_AUTHOR)); if (opt_author) { int max_len; @@ -4859,7 +4845,7 @@ main_draw(struct view view, struct line line, unsigned int lineno, bool select max_len = view->width - col; if (max_len > AUTHOR_COLS - 1) max_len = AUTHOR_COLS - 1; - draw_text(view, commit->author, max_len, TRUE, selected); + draw_text(view, LINE_MAIN_AUTHOR, commit->author, max_len, TRUE); col += AUTHOR_COLS; if (col >= view->width) return TRUE; @@ -4869,8 +4855,7 @@ main_draw(struct view view, struct line line, unsigned int lineno, bool select size_t graph_size = view->width - col; size_t i; - if (type != LINE_CURSOR) - wattrset(view->win, get_line_attr(LINE_MAIN_REVGRAPH)); + set_view_attr(view, LINE_MAIN_REVGRAPH); wmove(view->win, lineno, col); if (graph_size > commit->graph_size) graph_size = commit->graph_size; @@ -4884,46 +4869,40 @@ main_draw(struct view view, struct line *line, unsigned int lineno, bool select return TRUE; waddch(view->win, ' '); } - if (type != LINE_CURSOR) - wattrset(view->win, A_NORMAL); + set_view_attr(view, LINE_DEFAULT); wmove(view->win, lineno, col); if (opt_show_refs && commit->refs) { size_t i = 0; do { - if (type == LINE_CURSOR) - ; - else if (commit->refs[i]->head) - wattrset(view->win, get_line_attr(LINE_MAIN_HEAD)); + enum line_type type; + + if (commit->refs[i]->head) + type = LINE_MAIN_HEAD; else if (commit->refs[i]->ltag) - wattrset(view->win, get_line_attr(LINE_MAIN_LOCAL_TAG)); + type = LINE_MAIN_LOCAL_TAG; else if (commit->refs[i]->tag) - wattrset(view->win, get_line_attr(LINE_MAIN_TAG)); + type = LINE_MAIN_TAG; else if (commit->refs[i]->tracked) - wattrset(view->win, get_line_attr(LINE_MAIN_TRACKED)); + type = LINE_MAIN_TRACKED; else if (commit->refs[i]->remote) - wattrset(view->win, get_line_attr(LINE_MAIN_REMOTE)); + type = LINE_MAIN_REMOTE; else - wattrset(view->win, get_line_attr(LINE_MAIN_REF)); - - col += draw_text(view, "[", view->width - col, TRUE, selected); - col += draw_text(view, commit->refs[i]->name, view->width - col, - TRUE, selected); - col += draw_text(view, "]", view->width - col, TRUE, selected); - if (type != LINE_CURSOR) - wattrset(view->win, A_NORMAL); - col += draw_text(view, " ", view->width - col, TRUE, selected); + type = LINE_MAIN_REF; + + col += draw_text(view, type, "[", view->width - col, TRUE); + col += draw_text(view, type, commit->refs[i]->name, view->width - col, TRUE); + col += draw_text(view, type, "]", view->width - col, TRUE); + + col += draw_text(view, LINE_DEFAULT, " ", view->width - col, TRUE); if (col >= view->width) return TRUE; } while (commit->refs[i++]->next); } - if (type != LINE_CURSOR) - wattrset(view->win, get_line_attr(type)); - - draw_text(view, commit->title, view->width - col, TRUE, selected); + draw_text(view, LINE_DEFAULT, commit->title, view->width - col, TRUE); return TRUE; }

Tig: text-mode interface for git

Commit df711b9cfd8deccd1a307613c1d2ffaefab2f438

Commit diff

tig.c