X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/6dbf6c1970e2a1b31244ff0426aa87321aba9b6e..HEAD:/tig.c

diff --git a/tig.c b/tig.c
index 44b6a04..ebd7abe 100644
--- a/tig.c
+++ b/tig.c
@@ -12,7 +12,7 @@
  */
 
 #ifndef	VERSION
-#define VERSION	"tig-0.3"
+#define VERSION	"tig-0.5.git"
 #endif
 
 #ifndef DEBUG
@@ -30,14 +30,26 @@
 #include <unistd.h>
 #include <time.h>
 
+#include <sys/types.h>
+#include <regex.h>
+
+#include <locale.h>
+#include <langinfo.h>
+#include <iconv.h>
+
 #include <curses.h>
 
-static void die(const char *err, ...);
+#if __GNUC__ >= 3
+#define __NORETURN __attribute__((__noreturn__))
+#else
+#define __NORETURN
+#endif
+
+static void __NORETURN die(const char *err, ...);
 static void report(const char *msg, ...);
 static int read_properties(FILE *pipe, const char *separators, int (*read)(char *, int, char *, int));
 static void set_nonblocking_input(bool loading);
 static size_t utf8_length(const char *string, size_t max_width, int *coloffset, int *trimmed);
-static void load_help_page(void);
 
 #define ABS(x)		((x) >= 0  ? (x) : -(x))
 #define MIN(x, y)	((x) < (y) ? (x) :  (y))
@@ -45,12 +57,16 @@ static void load_help_page(void);
 #define ARRAY_SIZE(x)	(sizeof(x) / sizeof(x[0]))
 #define STRING_SIZE(x)	(sizeof(x) - 1)
 
+#define SIZEOF_STR	1024	/* Default string size. */
 #define SIZEOF_REF	256	/* Size of symbolic or SHA1 ID. */
-#define SIZEOF_CMD	1024	/* Size of command buffer. */
+#define SIZEOF_REV	41	/* Holds a SHA-1 and an ending NUL */
+#define SIZEOF_REVGRAPH	19	/* Size of revision ancestry graphics. */
 
 /* This color name can be used to refer to the default term colors. */
 #define COLOR_DEFAULT	(-1)
 
+#define ICONV_NONE	((iconv_t) -1)
+
 /* The format and size of the date column in the main view. */
 #define DATE_FORMAT	"%Y-%m-%d %H:%M"
 #define DATE_COLS	STRING_SIZE("2006-04-29 14:21 ")
@@ -65,16 +81,22 @@ static void load_help_page(void);
 #define	SCALE_SPLIT_VIEW(height)	((height) * 2 / 3)
 
 #define TIG_LS_REMOTE \
-	"git ls-remote . 2>/dev/null"
+	"git ls-remote $(git rev-parse --git-dir) 2>/dev/null"
 
 #define TIG_DIFF_CMD \
-	"git show --patch-with-stat --find-copies-harder -B -C %s"
+	"git show --root --patch-with-stat --find-copies-harder -B -C %s 2>/dev/null"
 
 #define TIG_LOG_CMD	\
-	"git log --cc --stat -n100 %s"
+	"git log --cc --stat -n100 %s 2>/dev/null"
 
 #define TIG_MAIN_CMD \
-	"git log --topo-order --stat --pretty=raw %s"
+	"git log --topo-order --pretty=raw %s 2>/dev/null"
+
+#define TIG_TREE_CMD	\
+	"git ls-tree %s %s"
+
+#define TIG_BLOB_CMD	\
+	"git cat-file blob %s"
 
 /* XXX: Needs to be defined to the empty string. */
 #define TIG_HELP_CMD	""
@@ -88,7 +110,7 @@ static void load_help_page(void);
 
 struct ref {
 	char *name;		/* Ref name; tag or head names are shortened. */
-	char id[41];		/* Commit SHA1 ID */
+	char id[SIZEOF_REV];	/* Commit SHA1 ID */
 	unsigned int tag:1;	/* Is it a tag? */
 	unsigned int next:1;	/* For ref lists: are there more refs? */
 };
@@ -124,16 +146,22 @@ set_from_int_map(struct int_map *map, size_t map_size,
  */
 
 static inline void
-string_ncopy(char *dst, const char *src, int dstlen)
+string_ncopy_do(char *dst, size_t dstlen, const char *src, size_t srclen)
 {
-	strncpy(dst, src, dstlen - 1);
-	dst[dstlen - 1] = 0;
+	if (srclen > dstlen - 1)
+		srclen = dstlen - 1;
 
+	strncpy(dst, src, srclen);
+	dst[srclen] = 0;
 }
 
-/* Shorthand for safely copying into a fixed buffer. */
+/* Shorthands for safely copying into a fixed buffer. */
+
 #define string_copy(dst, src) \
-	string_ncopy(dst, src, sizeof(dst))
+	string_ncopy_do(dst, sizeof(dst), src, sizeof(dst))
+
+#define string_ncopy(dst, src, srclen) \
+	string_ncopy_do(dst, sizeof(dst), src, srclen)
 
 static char *
 chomp_string(char *name)
@@ -151,10 +179,10 @@ chomp_string(char *name)
 }
 
 static bool
-string_nformat(char *buf, size_t bufsize, int *bufpos, const char *fmt, ...)
+string_nformat(char *buf, size_t bufsize, size_t *bufpos, const char *fmt, ...)
 {
 	va_list args;
-	int pos = bufpos ? *bufpos : 0;
+	size_t pos = bufpos ? *bufpos : 0;
 
 	va_start(args, fmt);
 	pos += vsnprintf(buf + pos, bufsize - pos, fmt, args);
@@ -172,6 +200,28 @@ string_nformat(char *buf, size_t bufsize, int *bufpos, const char *fmt, ...)
 #define string_format_from(buf, from, fmt, args...) \
 	string_nformat(buf, sizeof(buf), from, fmt, args)
 
+static int
+string_enum_compare(const char *str1, const char *str2, int len)
+{
+	size_t i;
+
+#define string_enum_sep(x) ((x) == '-' || (x) == '_' || (x) == '.')
+
+	/* Diff-Header == DIFF_HEADER */
+	for (i = 0; i < len; i++) {
+		if (toupper(str1[i]) == toupper(str2[i]))
+			continue;
+
+		if (string_enum_sep(str1[i]) &&
+		    string_enum_sep(str2[i]))
+			continue;
+
+		return str1[i] - str2[i];
+	}
+
+	return 0;
+}
+
 /* Shell quoting
  *
  * NOTE: The following is a slightly modified copy of the git project's shell
@@ -190,11 +240,11 @@ string_nformat(char *buf, size_t bufsize, int *bufpos, const char *fmt, ...)
  */
 
 static size_t
-sq_quote(char buf[SIZEOF_CMD], size_t bufsize, const char *src)
+sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src)
 {
 	char c;
 
-#define BUFPUT(x) do { if (bufsize < SIZEOF_CMD) buf[bufsize++] = (x); } while (0)
+#define BUFPUT(x) do { if (bufsize < SIZEOF_STR) buf[bufsize++] = (x); } while (0)
 
 	BUFPUT('\'');
 	while ((c = *src++)) {
@@ -223,6 +273,8 @@ sq_quote(char buf[SIZEOF_CMD], size_t bufsize, const char *src)
 	REQ_(VIEW_MAIN,		"Show main view"), \
 	REQ_(VIEW_DIFF,		"Show diff view"), \
 	REQ_(VIEW_LOG,		"Show log view"), \
+	REQ_(VIEW_TREE,		"Show tree view"), \
+	REQ_(VIEW_BLOB,		"Show blob view"), \
 	REQ_(VIEW_HELP,		"Show help page"), \
 	REQ_(VIEW_PAGER,	"Show pager view"), \
 	\
@@ -248,14 +300,21 @@ sq_quote(char buf[SIZEOF_CMD], size_t bufsize, const char *src)
 	REQ_(SCROLL_PAGE_UP,	"Scroll one page up"), \
 	REQ_(SCROLL_PAGE_DOWN,	"Scroll one page down"), \
 	\
+	REQ_GROUP("Searching") \
+	REQ_(SEARCH,		"Search the view"), \
+	REQ_(SEARCH_BACK,	"Search backwards in the view"), \
+	REQ_(FIND_NEXT,		"Find next search match"), \
+	REQ_(FIND_PREV,		"Find previous search match"), \
+	\
 	REQ_GROUP("Misc") \
+	REQ_(NONE,		"Do nothing"), \
 	REQ_(PROMPT,		"Bring up the prompt"), \
-	REQ_(SCREEN_UPDATE,	"Update the screen"), \
 	REQ_(SCREEN_REDRAW,	"Redraw the screen"), \
 	REQ_(SCREEN_RESIZE,	"Resize the screen"), \
 	REQ_(SHOW_VERSION,	"Show version information"), \
 	REQ_(STOP_LOADING,	"Stop all loading views"), \
-	REQ_(TOGGLE_LINENO,	"Toggle line numbers"),
+	REQ_(TOGGLE_LINENO,	"Toggle line numbers"), \
+	REQ_(TOGGLE_REV_GRAPH,	"Toggle revision graph visualization")
 
 
 /* User action requests. */
@@ -265,7 +324,8 @@ enum request {
 
 	/* Offset all requests to avoid conflicts with ncurses getch values. */
 	REQ_OFFSET = KEY_MAX + 1,
-	REQ_INFO
+	REQ_INFO,
+	REQ_UNKNOWN,
 
 #undef	REQ_GROUP
 #undef	REQ_
@@ -273,17 +333,34 @@ enum request {
 
 struct request_info {
 	enum request request;
+	char *name;
+	int namelen;
 	char *help;
 };
 
 static struct request_info req_info[] = {
-#define REQ_GROUP(help)	{ 0, (help) },
-#define REQ_(req, help)	{ REQ_##req, (help) }
+#define REQ_GROUP(help)	{ 0, NULL, 0, (help) },
+#define REQ_(req, help)	{ REQ_##req, (#req), STRING_SIZE(#req), (help) }
 	REQ_INFO
 #undef	REQ_GROUP
 #undef	REQ_
 };
 
+static enum request
+get_request(const char *name)
+{
+	int namelen = strlen(name);
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(req_info); i++)
+		if (req_info[i].namelen == namelen &&
+		    !string_enum_compare(req_info[i].name, name, namelen))
+			return req_info[i].request;
+
+	return REQ_UNKNOWN;
+}
+
+
 /*
  * Options
  */
@@ -308,14 +385,19 @@ VERSION " (" __DATE__ ")\n"
 "  -h, --help                  Show help message and exit\n";
 
 /* Option and state variables. */
-static bool opt_line_number	= FALSE;
-static int opt_num_interval	= NUMBER_INTERVAL;
-static int opt_tab_size		= TABSIZE;
-static enum request opt_request = REQ_VIEW_MAIN;
-static char opt_cmd[SIZEOF_CMD]	= "";
-static char opt_encoding[20]	= "";
-static bool opt_utf8		= TRUE;
-static FILE *opt_pipe		= NULL;
+static bool opt_line_number		= FALSE;
+static bool opt_rev_graph		= TRUE;
+static int opt_num_interval		= NUMBER_INTERVAL;
+static int opt_tab_size			= TABSIZE;
+static enum request opt_request		= REQ_VIEW_MAIN;
+static char opt_cmd[SIZEOF_STR]		= "";
+static char opt_path[SIZEOF_STR]	= "";
+static FILE *opt_pipe			= NULL;
+static char opt_encoding[20]		= "UTF-8";
+static bool opt_utf8			= TRUE;
+static char opt_codeset[20]		= "UTF-8";
+static iconv_t opt_iconv		= ICONV_NONE;
+static char opt_search[SIZEOF_STR]	= "";
 
 enum option_type {
 	OPT_NONE,
@@ -369,6 +451,17 @@ parse_options(int argc, char *argv[])
 	for (i = 1; i < argc; i++) {
 		char *opt = argv[i];
 
+		if (!strcmp(opt, "log") ||
+		    !strcmp(opt, "diff") ||
+		    !strcmp(opt, "show")) {
+			opt_request = opt[0] == 'l'
+				    ? REQ_VIEW_LOG : REQ_VIEW_DIFF;
+			break;
+		}
+
+		if (opt[0] && opt[0] != '-')
+			break;
+
 		if (!strcmp(opt, "-l")) {
 			opt_request = REQ_VIEW_LOG;
 			continue;
@@ -404,18 +497,7 @@ parse_options(int argc, char *argv[])
 			break;
 		}
 
-		if (!strcmp(opt, "log") ||
-		    !strcmp(opt, "diff") ||
-		    !strcmp(opt, "show")) {
-			opt_request = opt[0] == 'l'
-				    ? REQ_VIEW_LOG : REQ_VIEW_DIFF;
-			break;
-		}
-
-		if (opt[0] && opt[0] != '-')
-			break;
-
-		die("unknown command '%s'", opt);
+		die("unknown option '%s'\n\n%s", opt, usage);
 	}
 
 	if (!isatty(STDIN_FILENO)) {
@@ -428,7 +510,7 @@ parse_options(int argc, char *argv[])
 		if (opt_request == REQ_VIEW_MAIN)
 			/* XXX: This is vulnerable to the user overriding
 			 * options required for the main view parser. */
-			string_copy(opt_cmd, "git log --stat --pretty=raw");
+			string_copy(opt_cmd, "git log --pretty=raw");
 		else
 			string_copy(opt_cmd, "git");
 		buf_size = strlen(opt_cmd);
@@ -442,7 +524,6 @@ parse_options(int argc, char *argv[])
 			die("command too long");
 
 		opt_cmd[buf_size] = 0;
-
 	}
 
 	if (*opt_encoding && strcasecmp(opt_encoding, "UTF-8"))
@@ -452,29 +533,9 @@ parse_options(int argc, char *argv[])
 }
 
 
-static struct int_map color_map[] = {
-#define COLOR_MAP(name) { #name, STRING_SIZE(#name), COLOR_##name }
-	COLOR_MAP(DEFAULT),
-	COLOR_MAP(BLACK),
-	COLOR_MAP(BLUE),
-	COLOR_MAP(CYAN),
-	COLOR_MAP(GREEN),
-	COLOR_MAP(MAGENTA),
-	COLOR_MAP(RED),
-	COLOR_MAP(WHITE),
-	COLOR_MAP(YELLOW),
-};
-
-static struct int_map attr_map[] = {
-#define ATTR_MAP(name) { #name, STRING_SIZE(#name), A_##name }
-	ATTR_MAP(NORMAL),
-	ATTR_MAP(BLINK),
-	ATTR_MAP(BOLD),
-	ATTR_MAP(DIM),
-	ATTR_MAP(REVERSE),
-	ATTR_MAP(STANDOUT),
-	ATTR_MAP(UNDERLINE),
-};
+/*
+ * Line-oriented content detection.
+ */
 
 #define LINE_INFO \
 LINE(DIFF_HEADER,  "diff --git ",	COLOR_YELLOW,	COLOR_DEFAULT,	0), \
@@ -504,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), \
@@ -515,11 +577,8 @@ LINE(MAIN_COMMIT,  "",			COLOR_DEFAULT,	COLOR_DEFAULT,	0), \
 LINE(MAIN_DELIM,   "",			COLOR_MAGENTA,	COLOR_DEFAULT,	0), \
 LINE(MAIN_TAG,     "",			COLOR_MAGENTA,	COLOR_DEFAULT,	A_BOLD), \
 LINE(MAIN_REF,     "",			COLOR_CYAN,	COLOR_DEFAULT,	A_BOLD), \
-
-
-/*
- * Line-oriented content detection.
- */
+LINE(TREE_DIR,     "",			COLOR_DEFAULT,	COLOR_DEFAULT,	A_NORMAL), \
+LINE(TREE_FILE,    "",			COLOR_DEFAULT,	COLOR_DEFAULT,	A_NORMAL)
 
 enum line_type {
 #define LINE(type, line, fg, bg, attr) \
@@ -569,19 +628,10 @@ static struct line_info *
 get_line_info(char *name, int namelen)
 {
 	enum line_type type;
-	int i;
-
-	/* Diff-Header -> DIFF_HEADER */
-	for (i = 0; i < namelen; i++) {
-		if (name[i] == '-')
-			name[i] = '_';
-		else if (name[i] == '.')
-			name[i] = '_';
-	}
 
 	for (type = 0; type < ARRAY_SIZE(line_info); type++)
 		if (namelen == line_info[type].namelen &&
-		    !strncasecmp(line_info[type].name, name, namelen))
+		    !string_enum_compare(line_info[type].name, name, namelen))
 			return &line_info[type];
 
 	return NULL;
@@ -612,155 +662,530 @@ init_colors(void)
 
 struct line {
 	enum line_type type;
+
+	/* State flags */
+	unsigned int selected:1;
+
 	void *data;		/* User data */
 };
 
 
 /*
- * User config file handling.
+ * Keys
  */
 
-#define set_color(color, name, namelen) \
-	set_from_int_map(color_map, ARRAY_SIZE(color_map), color, name, namelen)
+struct keybinding {
+	int alias;
+	enum request request;
+	struct keybinding *next;
+};
 
-#define set_attribute(attr, name, namelen) \
-	set_from_int_map(attr_map, ARRAY_SIZE(attr_map), attr, name, namelen)
+static struct keybinding default_keybindings[] = {
+	/* View switching */
+	{ 'm',		REQ_VIEW_MAIN },
+	{ 'd',		REQ_VIEW_DIFF },
+	{ 'l',		REQ_VIEW_LOG },
+	{ 't',		REQ_VIEW_TREE },
+	{ 'f',		REQ_VIEW_BLOB },
+	{ 'p',		REQ_VIEW_PAGER },
+	{ 'h',		REQ_VIEW_HELP },
 
-static int   config_lineno;
-static bool  config_errors;
-static char *config_msg;
+	/* View manipulation */
+	{ 'q',		REQ_VIEW_CLOSE },
+	{ KEY_TAB,	REQ_VIEW_NEXT },
+	{ KEY_RETURN,	REQ_ENTER },
+	{ KEY_UP,	REQ_PREVIOUS },
+	{ KEY_DOWN,	REQ_NEXT },
 
-static int
-set_option(char *opt, int optlen, char *value, int valuelen)
-{
-	/* Reads: "color" object fgcolor bgcolor [attr] */
-	if (!strcmp(opt, "color")) {
-		struct line_info *info;
-
-		value = chomp_string(value);
-		valuelen = strcspn(value, " \t");
-		info = get_line_info(value, valuelen);
-		if (!info) {
-			config_msg = "Unknown color name";
-			return ERR;
-		}
+	/* Cursor navigation */
+	{ 'k',		REQ_MOVE_UP },
+	{ 'j',		REQ_MOVE_DOWN },
+	{ KEY_HOME,	REQ_MOVE_FIRST_LINE },
+	{ KEY_END,	REQ_MOVE_LAST_LINE },
+	{ KEY_NPAGE,	REQ_MOVE_PAGE_DOWN },
+	{ ' ',		REQ_MOVE_PAGE_DOWN },
+	{ KEY_PPAGE,	REQ_MOVE_PAGE_UP },
+	{ 'b',		REQ_MOVE_PAGE_UP },
+	{ '-',		REQ_MOVE_PAGE_UP },
 
-		value = chomp_string(value + valuelen);
-		valuelen = strcspn(value, " \t");
-		if (set_color(&info->fg, value, valuelen) == ERR) {
-			config_msg = "Unknown color";
-			return ERR;
-		}
+	/* Scrolling */
+	{ KEY_IC,	REQ_SCROLL_LINE_UP },
+	{ KEY_DC,	REQ_SCROLL_LINE_DOWN },
+	{ 'w',		REQ_SCROLL_PAGE_UP },
+	{ 's',		REQ_SCROLL_PAGE_DOWN },
 
-		value = chomp_string(value + valuelen);
-		valuelen = strcspn(value, " \t");
-		if (set_color(&info->bg, value, valuelen) == ERR) {
-			config_msg = "Unknown color";
-			return ERR;
-		}
+	/* Searching */
+	{ '/',		REQ_SEARCH },
+	{ '?',		REQ_SEARCH_BACK },
+	{ 'n',		REQ_FIND_NEXT },
+	{ 'N',		REQ_FIND_PREV },
 
-		value = chomp_string(value + valuelen);
-		if (*value &&
-		    set_attribute(&info->attr, value, strlen(value)) == ERR) {
-			config_msg = "Unknown attribute";
-			return ERR;
-		}
+	/* Misc */
+	{ 'Q',		REQ_QUIT },
+	{ 'z',		REQ_STOP_LOADING },
+	{ 'v',		REQ_SHOW_VERSION },
+	{ 'r',		REQ_SCREEN_REDRAW },
+	{ '.',		REQ_TOGGLE_LINENO },
+	{ 'g',		REQ_TOGGLE_REV_GRAPH },
+	{ ':',		REQ_PROMPT },
 
-		return OK;
-	}
+	/* Using the ncurses SIGWINCH handler. */
+	{ KEY_RESIZE,	REQ_SCREEN_RESIZE },
+};
 
-	return ERR;
-}
+#define KEYMAP_INFO \
+	KEYMAP_(GENERIC), \
+	KEYMAP_(MAIN), \
+	KEYMAP_(DIFF), \
+	KEYMAP_(LOG), \
+	KEYMAP_(TREE), \
+	KEYMAP_(BLOB), \
+	KEYMAP_(PAGER), \
+	KEYMAP_(HELP) \
+
+enum keymap {
+#define KEYMAP_(name) KEYMAP_##name
+	KEYMAP_INFO
+#undef	KEYMAP_
+};
 
-static int
-read_option(char *opt, int optlen, char *value, int valuelen)
-{
-	config_lineno++;
-	config_msg = "Internal error";
+static struct int_map keymap_table[] = {
+#define KEYMAP_(name) { #name, STRING_SIZE(#name), KEYMAP_##name }
+	KEYMAP_INFO
+#undef	KEYMAP_
+};
 
-	optlen = strcspn(opt, "#;");
-	if (optlen == 0) {
-		/* The whole line is a commend or empty. */
-		return OK;
+#define set_keymap(map, name) \
+	set_from_int_map(keymap_table, ARRAY_SIZE(keymap_table), map, name, strlen(name))
 
-	} else if (opt[optlen] != 0) {
-		/* Part of the option name is a comment, so the value part
-		 * should be ignored. */
-		valuelen = 0;
-		opt[optlen] = value[valuelen] = 0;
-	} else {
-		/* Else look for comment endings in the value. */
-		valuelen = strcspn(value, "#;");
-		value[valuelen] = 0;
-	}
+static struct keybinding *keybindings[ARRAY_SIZE(keymap_table)];
 
-	if (set_option(opt, optlen, value, valuelen) == ERR) {
-		fprintf(stderr, "Error on line %d, near '%.*s' option: %s\n",
-			config_lineno, optlen, opt, config_msg);
-		config_errors = TRUE;
-	}
+static void
+add_keybinding(enum keymap keymap, enum request request, int key)
+{
+	struct keybinding *keybinding;
 
-	/* Always keep going if errors are encountered. */
-	return OK;
+	keybinding = calloc(1, sizeof(*keybinding));
+	if (!keybinding)
+		die("Failed to allocate keybinding");
+
+	keybinding->alias = key;
+	keybinding->request = request;
+	keybinding->next = keybindings[keymap];
+	keybindings[keymap] = keybinding;
 }
 
-static int
-load_options(void)
+/* Looks for a key binding first in the given map, then in the generic map, and
+ * lastly in the default keybindings. */
+static enum request
+get_keybinding(enum keymap keymap, int key)
 {
-	char *home = getenv("HOME");
-	char buf[1024];
-	FILE *file;
-
-	config_lineno = 0;
-	config_errors = FALSE;
+	struct keybinding *kbd;
+	int i;
 
-	if (!home || !string_format(buf, "%s/.tigrc", home))
-		return ERR;
+	for (kbd = keybindings[keymap]; kbd; kbd = kbd->next)
+		if (kbd->alias == key)
+			return kbd->request;
 
-	/* It's ok that the file doesn't exist. */
-	file = fopen(buf, "r");
-	if (!file)
-		return OK;
+	for (kbd = keybindings[KEYMAP_GENERIC]; kbd; kbd = kbd->next)
+		if (kbd->alias == key)
+			return kbd->request;
 
-	if (read_properties(file, " \t", read_option) == ERR ||
-	    config_errors == TRUE)
-		fprintf(stderr, "Errors while loading %s.\n", buf);
+	for (i = 0; i < ARRAY_SIZE(default_keybindings); i++)
+		if (default_keybindings[i].alias == key)
+			return default_keybindings[i].request;
 
-	return OK;
+	return (enum request) key;
 }
 
 
-/*
- * The viewer
- */
+struct key {
+	char *name;
+	int value;
+};
 
-struct view;
-struct view_ops;
+static struct key key_table[] = {
+	{ "Enter",	KEY_RETURN },
+	{ "Space",	' ' },
+	{ "Backspace",	KEY_BACKSPACE },
+	{ "Tab",	KEY_TAB },
+	{ "Escape",	KEY_ESC },
+	{ "Left",	KEY_LEFT },
+	{ "Right",	KEY_RIGHT },
+	{ "Up",		KEY_UP },
+	{ "Down",	KEY_DOWN },
+	{ "Insert",	KEY_IC },
+	{ "Delete",	KEY_DC },
+	{ "Hash",	'#' },
+	{ "Home",	KEY_HOME },
+	{ "End",	KEY_END },
+	{ "PageUp",	KEY_PPAGE },
+	{ "PageDown",	KEY_NPAGE },
+	{ "F1",		KEY_F(1) },
+	{ "F2",		KEY_F(2) },
+	{ "F3",		KEY_F(3) },
+	{ "F4",		KEY_F(4) },
+	{ "F5",		KEY_F(5) },
+	{ "F6",		KEY_F(6) },
+	{ "F7",		KEY_F(7) },
+	{ "F8",		KEY_F(8) },
+	{ "F9",		KEY_F(9) },
+	{ "F10",	KEY_F(10) },
+	{ "F11",	KEY_F(11) },
+	{ "F12",	KEY_F(12) },
+};
 
-/* The display array of active views and the index of the current view. */
-static struct view *display[2];
-static unsigned int current_view;
+static int
+get_key_value(const char *name)
+{
+	int i;
 
-#define foreach_view(view, i) \
-	for (i = 0; i < ARRAY_SIZE(display) && (view = display[i]); i++)
+	for (i = 0; i < ARRAY_SIZE(key_table); i++)
+		if (!strcasecmp(key_table[i].name, name))
+			return key_table[i].value;
 
-#define displayed_views()	(display[1] != NULL ? 2 : 1)
+	if (strlen(name) == 1 && isprint(*name))
+		return (int) *name;
 
-/* Current head and commit ID */
-static char ref_commit[SIZEOF_REF]	= "HEAD";
-static char ref_head[SIZEOF_REF]	= "HEAD";
+	return ERR;
+}
 
-struct view {
-	const char *name;	/* View name */
-	const char *cmd_fmt;	/* Default command line format */
-	const char *cmd_env;	/* Command line set via environment */
-	const char *id;		/* Points to either of ref_{head,commit} */
+static char *
+get_key(enum request request)
+{
+	static char buf[BUFSIZ];
+	static char key_char[] = "'X'";
+	size_t pos = 0;
+	char *sep = "    ";
+	int i;
 
-	struct view_ops *ops;	/* View operations */
+	buf[pos] = 0;
 
-	char cmd[SIZEOF_CMD];	/* Command buffer */
-	char ref[SIZEOF_REF];	/* Hovered commit reference */
-	char vid[SIZEOF_REF];	/* View ID. Set to id member when updating. */
+	for (i = 0; i < ARRAY_SIZE(default_keybindings); i++) {
+		struct keybinding *keybinding = &default_keybindings[i];
+		char *seq = NULL;
+		int key;
+
+		if (keybinding->request != request)
+			continue;
+
+		for (key = 0; key < ARRAY_SIZE(key_table); key++)
+			if (key_table[key].value == keybinding->alias)
+				seq = key_table[key].name;
+
+		if (seq == NULL &&
+		    keybinding->alias < 127 &&
+		    isprint(keybinding->alias)) {
+			key_char[1] = (char) keybinding->alias;
+			seq = key_char;
+		}
+
+		if (!seq)
+			seq = "'?'";
+
+		if (!string_format_from(buf, &pos, "%s%s", sep, seq))
+			return "Too many keybindings!";
+		sep = ", ";
+	}
+
+	return buf;
+}
+
+
+/*
+ * User config file handling.
+ */
+
+static struct int_map color_map[] = {
+#define COLOR_MAP(name) { #name, STRING_SIZE(#name), COLOR_##name }
+	COLOR_MAP(DEFAULT),
+	COLOR_MAP(BLACK),
+	COLOR_MAP(BLUE),
+	COLOR_MAP(CYAN),
+	COLOR_MAP(GREEN),
+	COLOR_MAP(MAGENTA),
+	COLOR_MAP(RED),
+	COLOR_MAP(WHITE),
+	COLOR_MAP(YELLOW),
+};
+
+#define set_color(color, name) \
+	set_from_int_map(color_map, ARRAY_SIZE(color_map), color, name, strlen(name))
+
+static struct int_map attr_map[] = {
+#define ATTR_MAP(name) { #name, STRING_SIZE(#name), A_##name }
+	ATTR_MAP(NORMAL),
+	ATTR_MAP(BLINK),
+	ATTR_MAP(BOLD),
+	ATTR_MAP(DIM),
+	ATTR_MAP(REVERSE),
+	ATTR_MAP(STANDOUT),
+	ATTR_MAP(UNDERLINE),
+};
+
+#define set_attribute(attr, name) \
+	set_from_int_map(attr_map, ARRAY_SIZE(attr_map), attr, name, strlen(name))
+
+static int   config_lineno;
+static bool  config_errors;
+static char *config_msg;
+
+/* Wants: object fgcolor bgcolor [attr] */
+static int
+option_color_command(int argc, char *argv[])
+{
+	struct line_info *info;
+
+	if (argc != 3 && argc != 4) {
+		config_msg = "Wrong number of arguments given to color command";
+		return ERR;
+	}
+
+	info = get_line_info(argv[0], strlen(argv[0]));
+	if (!info) {
+		config_msg = "Unknown color name";
+		return ERR;
+	}
+
+	if (set_color(&info->fg, argv[1]) == ERR ||
+	    set_color(&info->bg, argv[2]) == ERR) {
+		config_msg = "Unknown color";
+		return ERR;
+	}
+
+	if (argc == 4 && set_attribute(&info->attr, argv[3]) == ERR) {
+		config_msg = "Unknown attribute";
+		return ERR;
+	}
+
+	return OK;
+}
+
+/* Wants: name = value */
+static int
+option_set_command(int argc, char *argv[])
+{
+	if (argc != 3) {
+		config_msg = "Wrong number of arguments given to set command";
+		return ERR;
+	}
+
+	if (strcmp(argv[1], "=")) {
+		config_msg = "No value assigned";
+		return ERR;
+	}
+
+	if (!strcmp(argv[0], "show-rev-graph")) {
+		opt_rev_graph = (!strcmp(argv[2], "1") ||
+				 !strcmp(argv[2], "true") ||
+				 !strcmp(argv[2], "yes"));
+		return OK;
+	}
+
+	if (!strcmp(argv[0], "line-number-interval")) {
+		opt_num_interval = atoi(argv[2]);
+		return OK;
+	}
+
+	if (!strcmp(argv[0], "tab-size")) {
+		opt_tab_size = atoi(argv[2]);
+		return OK;
+	}
+
+	if (!strcmp(argv[0], "commit-encoding")) {
+		char *arg = argv[2];
+		int delimiter = *arg;
+		int i;
+
+		switch (delimiter) {
+		case '"':
+		case '\'':
+			for (arg++, i = 0; arg[i]; i++)
+				if (arg[i] == delimiter) {
+					arg[i] = 0;
+					break;
+				}
+		default:
+			string_copy(opt_encoding, arg);
+			return OK;
+		}
+	}
+
+	config_msg = "Unknown variable name";
+	return ERR;
+}
+
+/* Wants: mode request key */
+static int
+option_bind_command(int argc, char *argv[])
+{
+	enum request request;
+	int keymap;
+	int key;
+
+	if (argc != 3) {
+		config_msg = "Wrong number of arguments given to bind command";
+		return ERR;
+	}
+
+	if (set_keymap(&keymap, argv[0]) == ERR) {
+		config_msg = "Unknown key map";
+		return ERR;
+	}
+
+	key = get_key_value(argv[1]);
+	if (key == ERR) {
+		config_msg = "Unknown key";
+		return ERR;
+	}
+
+	request = get_request(argv[2]);
+	if (request == REQ_UNKNOWN) {
+		config_msg = "Unknown request name";
+		return ERR;
+	}
+
+	add_keybinding(keymap, request, key);
+
+	return OK;
+}
+
+static int
+set_option(char *opt, char *value)
+{
+	char *argv[16];
+	int valuelen;
+	int argc = 0;
+
+	/* Tokenize */
+	while (argc < ARRAY_SIZE(argv) && (valuelen = strcspn(value, " \t"))) {
+		argv[argc++] = value;
+
+		value += valuelen;
+		if (!*value)
+			break;
+
+		*value++ = 0;
+		while (isspace(*value))
+			value++;
+	}
+
+	if (!strcmp(opt, "color"))
+		return option_color_command(argc, argv);
+
+	if (!strcmp(opt, "set"))
+		return option_set_command(argc, argv);
+
+	if (!strcmp(opt, "bind"))
+		return option_bind_command(argc, argv);
+
+	config_msg = "Unknown option command";
+	return ERR;
+}
+
+static int
+read_option(char *opt, int optlen, char *value, int valuelen)
+{
+	int status = OK;
+
+	config_lineno++;
+	config_msg = "Internal error";
+
+	/* Check for comment markers, since read_properties() will
+	 * only ensure opt and value are split at first " \t". */
+	optlen = strcspn(opt, "#");
+	if (optlen == 0)
+		return OK;
+
+	if (opt[optlen] != 0) {
+		config_msg = "No option value";
+		status = ERR;
+
+	}  else {
+		/* Look for comment endings in the value. */
+		int len = strcspn(value, "#");
+
+		if (len < valuelen) {
+			valuelen = len;
+			value[valuelen] = 0;
+		}
+
+		status = set_option(opt, value);
+	}
+
+	if (status == ERR) {
+		fprintf(stderr, "Error on line %d, near '%.*s': %s\n",
+			config_lineno, optlen, opt, config_msg);
+		config_errors = TRUE;
+	}
+
+	/* Always keep going if errors are encountered. */
+	return OK;
+}
+
+static int
+load_options(void)
+{
+	char *home = getenv("HOME");
+	char buf[SIZEOF_STR];
+	FILE *file;
+
+	config_lineno = 0;
+	config_errors = FALSE;
+
+	if (!home || !string_format(buf, "%s/.tigrc", home))
+		return ERR;
+
+	/* It's ok that the file doesn't exist. */
+	file = fopen(buf, "r");
+	if (!file)
+		return OK;
+
+	if (read_properties(file, " \t", read_option) == ERR ||
+	    config_errors == TRUE)
+		fprintf(stderr, "Errors while loading %s.\n", buf);
+
+	return OK;
+}
+
+
+/*
+ * The viewer
+ */
+
+struct view;
+struct view_ops;
+
+/* The display array of active views and the index of the current view. */
+static struct view *display[2];
+static unsigned int current_view;
+
+/* Reading from the prompt? */
+static bool input_mode = FALSE;
+
+#define foreach_displayed_view(view, i) \
+	for (i = 0; i < ARRAY_SIZE(display) && (view = display[i]); i++)
+
+#define displayed_views()	(display[1] != NULL ? 2 : 1)
+
+/* Current head and commit ID */
+static char ref_blob[SIZEOF_REF]	= "";
+static char ref_commit[SIZEOF_REF]	= "HEAD";
+static char ref_head[SIZEOF_REF]	= "HEAD";
+
+struct view {
+	const char *name;	/* View name */
+	const char *cmd_fmt;	/* Default command line format */
+	const char *cmd_env;	/* Command line set via environment */
+	const char *id;		/* Points to either of ref_{head,commit,blob} */
+
+	struct view_ops *ops;	/* View operations */
+
+	enum keymap keymap;	/* What keymap does this view have */
+
+	char cmd[SIZEOF_STR];	/* Command buffer */
+	char ref[SIZEOF_REF];	/* Hovered commit reference */
+	char vid[SIZEOF_REF];	/* View ID. Set to id member when updating. */
 
 	int height, width;	/* The width and height of the main window */
 	WINDOW *win;		/* The main window */
@@ -770,6 +1195,10 @@ struct view {
 	unsigned long offset;	/* Offset of the window top */
 	unsigned long lineno;	/* Current line number */
 
+	/* Searching */
+	char grep[SIZEOF_STR];	/* Search string */
+	regex_t *regex;		/* Pre-compiled regex */
+
 	/* If non-NULL, points to the view that opened this view. If this view
 	 * is closed tig will switch back to the parent view. */
 	struct view *parent;
@@ -789,41 +1218,75 @@ struct view_ops {
 	/* What type of content being displayed. Used in the title bar. */
 	const char *type;
 	/* Draw one line; @lineno must be < view->height. */
-	bool (*draw)(struct view *view, struct line *line, unsigned int lineno);
+	bool (*draw)(struct view *view, struct line *line, unsigned int lineno, bool selected);
 	/* Read one line; updates view->line. */
 	bool (*read)(struct view *view, char *data);
 	/* Depending on view, change display based on current line. */
 	bool (*enter)(struct view *view, struct line *line);
+	/* Search for regex in a line. */
+	bool (*grep)(struct view *view, struct line *line);
+	/* Select line */
+	void (*select)(struct view *view, struct line *line);
 };
 
 static struct view_ops pager_ops;
 static struct view_ops main_ops;
+static struct view_ops tree_ops;
+static struct view_ops blob_ops;
 
-#define VIEW_STR(name, cmd, env, ref, ops) \
-	{ name, cmd, #env, ref, ops }
+#define VIEW_STR(name, cmd, env, ref, ops, map) \
+	{ name, cmd, #env, ref, ops, map}
 
 #define VIEW_(id, name, ops, ref) \
-	VIEW_STR(name, TIG_##id##_CMD,  TIG_##id##_CMD, ref, ops)
+	VIEW_STR(name, TIG_##id##_CMD,  TIG_##id##_CMD, ref, ops, KEYMAP_##id)
 
 
 static struct view views[] = {
 	VIEW_(MAIN,  "main",  &main_ops,  ref_head),
 	VIEW_(DIFF,  "diff",  &pager_ops, ref_commit),
 	VIEW_(LOG,   "log",   &pager_ops, ref_head),
+	VIEW_(TREE,  "tree",  &tree_ops,  ref_commit),
+	VIEW_(BLOB,  "blob",  &blob_ops,  ref_blob),
 	VIEW_(HELP,  "help",  &pager_ops, "static"),
 	VIEW_(PAGER, "pager", &pager_ops, "static"),
 };
 
 #define VIEW(req) (&views[(req) - REQ_OFFSET - 1])
 
+#define foreach_view(view, i) \
+	for (i = 0; i < ARRAY_SIZE(views) && (view = &views[i]); i++)
+
+#define view_is_displayed(view) \
+	(view == display[0] || view == display[1])
 
 static bool
 draw_view_line(struct view *view, unsigned int lineno)
 {
+	struct line *line;
+	bool selected = (view->offset + lineno == view->lineno);
+	bool draw_ok;
+
+	assert(view_is_displayed(view));
+
 	if (view->offset + lineno >= view->lines)
 		return FALSE;
 
-	return view->ops->draw(view, &view->line[view->offset + lineno], lineno);
+	line = &view->line[view->offset + lineno];
+
+	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);
+	}
+
+	scrollok(view->win, FALSE);
+	draw_ok = view->ops->draw(view, line, lineno, selected);
+	scrollok(view->win, TRUE);
+
+	return draw_ok;
 }
 
 static void
@@ -837,7 +1300,10 @@ redraw_view_from(struct view *view, int lineno)
 	}
 
 	redrawwin(view->win);
-	wrefresh(view->win);
+	if (input_mode)
+		wnoutrefresh(view->win);
+	else
+		wrefresh(view->win);
 }
 
 static void
@@ -851,41 +1317,60 @@ redraw_view(struct view *view)
 static void
 update_view_title(struct view *view)
 {
-	if (view == display[current_view])
-		wbkgdset(view->title, get_line_attr(LINE_TITLE_FOCUS));
-	else
-		wbkgdset(view->title, get_line_attr(LINE_TITLE_BLUR));
+	char buf[SIZEOF_STR];
+	char state[SIZEOF_STR];
+	size_t bufpos = 0, statelen = 0;
 
-	werase(view->title);
-	wmove(view->title, 0, 0);
-
-	if (*view->ref)
-		wprintw(view->title, "[%s] %s", view->name, view->ref);
-	else
-		wprintw(view->title, "[%s]", view->name);
+	assert(view_is_displayed(view));
 
 	if (view->lines || view->pipe) {
+		unsigned int view_lines = view->offset + view->height;
 		unsigned int lines = view->lines
-				   ? (view->lineno + 1) * 100 / view->lines
+				   ? MIN(view_lines, view->lines) * 100 / view->lines
 				   : 0;
 
-		wprintw(view->title, " - %s %d of %d (%d%%)",
-			view->ops->type,
-			view->lineno + 1,
-			view->lines,
-			lines);
+		string_format_from(state, &statelen, "- %s %d of %d (%d%%)",
+				   view->ops->type,
+				   view->lineno + 1,
+				   view->lines,
+				   lines);
+
+		if (view->pipe) {
+			time_t secs = time(NULL) - view->start_time;
+
+			/* Three git seconds are a long time ... */
+			if (secs > 2)
+				string_format_from(state, &statelen, " %lds", secs);
+		}
 	}
 
-	if (view->pipe) {
-		time_t secs = time(NULL) - view->start_time;
+	string_format_from(buf, &bufpos, "[%s]", view->name);
+	if (*view->ref && bufpos < view->width) {
+		size_t refsize = strlen(view->ref);
+		size_t minsize = bufpos + 1 + /* abbrev= */ 7 + 1 + statelen;
 
-		/* Three git seconds are a long time ... */
-		if (secs > 2)
-			wprintw(view->title, " %lds", secs);
+		if (minsize < view->width)
+			refsize = view->width - minsize + 7;
+		string_format_from(buf, &bufpos, " %.*s", refsize, view->ref);
 	}
 
+	if (statelen && bufpos < view->width) {
+		string_format_from(buf, &bufpos, " %s", state);
+	}
+
+	if (view == display[current_view])
+		wbkgdset(view->title, get_line_attr(LINE_TITLE_FOCUS));
+	else
+		wbkgdset(view->title, get_line_attr(LINE_TITLE_BLUR));
+
+	mvwaddnstr(view->title, 0, 0, buf, bufpos);
+	wclrtoeol(view->title);
 	wmove(view->title, 0, view->width - 1);
-	wrefresh(view->title);
+
+	if (input_mode)
+		wnoutrefresh(view->title);
+	else
+		wrefresh(view->title);
 }
 
 static void
@@ -917,7 +1402,7 @@ resize_display(void)
 
 	offset = 0;
 
-	foreach_view (view, i) {
+	foreach_displayed_view (view, i) {
 		if (!view->win) {
 			view->win = newwin(view->height, 0, offset, 0);
 			if (!view->win)
@@ -945,17 +1430,15 @@ redraw_display(void)
 	struct view *view;
 	int i;
 
-	foreach_view (view, i) {
+	foreach_displayed_view (view, i) {
 		redraw_view(view);
 		update_view_title(view);
 	}
 }
 
 static void
-update_display_cursor(void)
+update_display_cursor(struct view *view)
 {
-	struct view *view = display[current_view];
-
 	/* Move the cursor to the right-most column of the cursor line.
 	 *
 	 * XXX: This could turn out to be a bit expensive, but it ensures that
@@ -972,14 +1455,27 @@ 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)
 {
+	bool redraw_current_line = FALSE;
+
 	/* The rendering expects the new offset. */
 	view->offset += lines;
 
 	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);
@@ -994,29 +1490,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("");
@@ -1028,6 +1506,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;
@@ -1059,13 +1539,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) {
@@ -1087,70 +1568,177 @@ move_view(struct view *view, enum request request, bool redraw)
 		      ? view->lines - view->lineno - 1 : view->height;
 		break;
 
-	case REQ_MOVE_UP:
-		steps = -1;
+	case REQ_MOVE_UP:
+		steps = -1;
+		break;
+
+	case REQ_MOVE_DOWN:
+		steps = 1;
+		break;
+
+	default:
+		die("request %d not handled in switch", request);
+	}
+
+	if (steps <= 0 && view->lineno == 0) {
+		report("Cannot move beyond the first line");
+		return;
+
+	} else if (steps >= 0 && view->lineno + 1 >= view->lines) {
+		report("Cannot move beyond the last line");
+		return;
+	}
+
+	/* Move the current line */
+	view->lineno += steps;
+	assert(0 <= view->lineno && view->lineno < view->lines);
+
+	/* 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) {
+			scroll_steps = -view->offset;
+
+		} else if (steps > 0) {
+			if (view->lineno == view->lines - 1 &&
+			    view->lines > view->height) {
+				scroll_steps = view->lines - view->offset - 1;
+				if (scroll_steps >= view->height)
+					scroll_steps -= view->height - 1;
+			}
+		}
+	}
+
+	if (!view_is_displayed(view)) {
+		view->offset += steps;
+		view->ops->select(view, &view->line[view->lineno]);
+		return;
+	}
+
+	/* Repaint the old "current" line if we be scrolling */
+	if (ABS(steps) < view->height)
+		draw_view_line(view, view->lineno - steps - view->offset);
+
+	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);
+	report("");
+}
+
+
+/*
+ * Searching
+ */
+
+static void search_view(struct view *view, enum request request);
+
+static bool
+find_next_line(struct view *view, unsigned long lineno, struct line *line)
+{
+	assert(view_is_displayed(view));
+
+	if (!view->ops->grep(view, line))
+		return FALSE;
+
+	if (lineno - view->offset >= view->height) {
+		view->offset = lineno;
+		view->lineno = lineno;
+		redraw_view(view);
+
+	} else {
+		unsigned long old_lineno = view->lineno - view->offset;
+
+		view->lineno = lineno;
+		draw_view_line(view, old_lineno);
+
+		draw_view_line(view, view->lineno - view->offset);
+		redrawwin(view->win);
+		wrefresh(view->win);
+	}
+
+	report("Line %ld matches '%s'", lineno + 1, view->grep);
+	return TRUE;
+}
+
+static void
+find_next(struct view *view, enum request request)
+{
+	unsigned long lineno = view->lineno;
+	int direction;
+
+	if (!*view->grep) {
+		if (!*opt_search)
+			report("No previous search");
+		else
+			search_view(view, request);
+		return;
+	}
+
+	switch (request) {
+	case REQ_SEARCH:
+	case REQ_FIND_NEXT:
+		direction = 1;
 		break;
 
-	case REQ_MOVE_DOWN:
-		steps = 1;
+	case REQ_SEARCH_BACK:
+	case REQ_FIND_PREV:
+		direction = -1;
 		break;
 
 	default:
-		die("request %d not handled in switch", request);
-	}
-
-	if (steps <= 0 && view->lineno == 0) {
-		report("Cannot move beyond the first line");
-		return;
-
-	} else if (steps >= 0 && view->lineno + 1 >= view->lines) {
-		report("Cannot move beyond the last line");
 		return;
 	}
 
-	/* Move the current line */
-	view->lineno += steps;
-	assert(0 <= view->lineno && view->lineno < view->lines);
+	if (request == REQ_FIND_NEXT || request == REQ_FIND_PREV)
+		lineno += direction;
 
-	/* Repaint the old "current" line if we be scrolling */
-	if (ABS(steps) < view->height) {
-		int prev_lineno = view->lineno - steps - view->offset;
+	/* Note, lineno is unsigned long so will wrap around in which case it
+	 * will become bigger than view->lines. */
+	for (; lineno < view->lines; lineno += direction) {
+		struct line *line = &view->line[lineno];
 
-		wmove(view->win, prev_lineno, 0);
-		wclrtoeol(view->win);
-		draw_view_line(view,  prev_lineno);
+		if (find_next_line(view, lineno, line))
+			return;
 	}
 
-	/* Check whether the view needs to be scrolled */
-	if (view->lineno < view->offset ||
-	    view->lineno >= view->offset + view->height) {
-		if (steps < 0 && -steps > view->offset) {
-			steps = -view->offset;
+	report("No match found for '%s'", view->grep);
+}
 
-		} 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;
-			}
-		}
+static void
+search_view(struct view *view, enum request request)
+{
+	int regex_err;
 
-		do_scroll_view(view, steps, redraw);
-		return;
+	if (view->regex) {
+		regfree(view->regex);
+		*view->grep = 0;
+	} else {
+		view->regex = calloc(1, sizeof(*view->regex));
+		if (!view->regex)
+			return;
 	}
 
-	/* Draw the current line */
-	draw_view_line(view, view->lineno - view->offset);
+	regex_err = regcomp(view->regex, opt_search, REG_EXTENDED);
+	if (regex_err != 0) {
+		char buf[SIZEOF_STR] = "unknown error";
 
-	if (!redraw)
+		regerror(regex_err, view->regex, buf, sizeof(buf));
+		report("Search failed: %s", buf);
 		return;
+	}
 
-	redrawwin(view->win);
-	wrefresh(view->win);
-	report("");
-}
+	string_copy(view->grep, opt_search);
 
+	find_next(view, request);
+}
 
 /*
  * Incremental updating
@@ -1183,6 +1771,16 @@ begin_update(struct view *view)
 		/* When running random commands, the view ref could have become
 		 * invalid so clear it. */
 		view->ref[0] = 0;
+
+	} else if (view == VIEW(REQ_VIEW_TREE)) {
+		const char *format = view->cmd_env ? view->cmd_env : view->cmd_fmt;
+
+		if (strcmp(view->vid, view->id))
+			opt_path[0] = 0;
+
+		if (!string_format(view->cmd, format, id, opt_path))
+			return FALSE;
+
 	} else {
 		const char *format = view->cmd_env ? view->cmd_env : view->cmd_fmt;
 
@@ -1240,7 +1838,8 @@ realloc_lines(struct view *view, size_t line_size)
 static bool
 update_view(struct view *view)
 {
-	char buffer[BUFSIZ];
+	char in_buffer[BUFSIZ];
+	char out_buffer[BUFSIZ * 2];
 	char *line;
 	/* The number of lines to read. If too low it will cause too much
 	 * redrawing (and possible flickering), if too high responsiveness
@@ -1255,15 +1854,32 @@ update_view(struct view *view)
 	if (view->offset + view->height >= view->lines)
 		redraw_from = view->lines - view->offset;
 
+	/* FIXME: This is probably not perfect for backgrounded views. */
 	if (!realloc_lines(view, view->lines + lines))
 		goto alloc_error;
 
-	while ((line = fgets(buffer, sizeof(buffer), view->pipe))) {
-		int linelen = strlen(line);
+	while ((line = fgets(in_buffer, sizeof(in_buffer), view->pipe))) {
+		size_t linelen = strlen(line);
 
 		if (linelen)
 			line[linelen - 1] = 0;
 
+		if (opt_iconv != ICONV_NONE) {
+			char *inbuf = line;
+			size_t inlen = linelen;
+
+			char *outbuf = out_buffer;
+			size_t outlen = sizeof(out_buffer);
+
+			size_t ret;
+
+			ret = iconv(opt_iconv, &inbuf, &inlen, &outbuf, &outlen);
+			if (ret != (size_t) -1) {
+				line = out_buffer;
+				linelen = strlen(out_buffer);
+			}
+		}
+
 		if (!view->ops->read(view, line))
 			goto alloc_error;
 
@@ -1285,7 +1901,15 @@ update_view(struct view *view)
 		}
 	}
 
-	if (redraw_from >= 0) {
+	if (!view_is_displayed(view))
+		goto check_pipe;
+
+	if (view == VIEW(REQ_VIEW_TREE)) {
+		/* Clear the view and redraw everything since the tree sorting
+		 * might have rearranged things. */
+		redraw_view(view);
+
+	} else if (redraw_from >= 0) {
 		/* If this is an incremental update, redraw the previous line
 		 * since for commits some members could have changed when
 		 * loading the main view. */
@@ -1300,6 +1924,7 @@ update_view(struct view *view)
 	 * commit reference in view->ref it'll be available here. */
 	update_view_title(view);
 
+check_pipe:
 	if (ferror(view->pipe)) {
 		report("Failed to read: %s", strerror(errno));
 		goto end;
@@ -1319,6 +1944,49 @@ end:
 	return FALSE;
 }
 
+
+/*
+ * View opening
+ */
+
+static void open_help_view(struct view *view)
+{
+	char buf[BUFSIZ];
+	int lines = ARRAY_SIZE(req_info) + 2;
+	int i;
+
+	if (view->lines > 0)
+		return;
+
+	for (i = 0; i < ARRAY_SIZE(req_info); i++)
+		if (!req_info[i].request)
+			lines++;
+
+	view->line = calloc(lines, sizeof(*view->line));
+	if (!view->line) {
+		report("Allocation failure");
+		return;
+	}
+
+	view->ops->read(view, "Quick reference for tig keybindings:");
+
+	for (i = 0; i < ARRAY_SIZE(req_info); i++) {
+		char *key;
+
+		if (!req_info[i].request) {
+			view->ops->read(view, "");
+			view->ops->read(view, req_info[i].help);
+			continue;
+		}
+
+		key = get_key(req_info[i].request);
+		if (!string_format(buf, "%-25s %s", key, req_info[i].help))
+			continue;
+
+		view->ops->read(view, buf);
+	}
+}
+
 enum open_flags {
 	OPEN_DEFAULT = 0,	/* Use default view switching. */
 	OPEN_SPLIT = 1,		/* Split current view. */
@@ -1341,8 +2009,11 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
 		return;
 	}
 
-	if ((reload || strcmp(view->vid, view->id)) &&
-	    !begin_update(view)) {
+	if (view == VIEW(REQ_VIEW_HELP)) {
+		open_help_view(view);
+
+	} else if ((reload || strcmp(view->vid, view->id)) &&
+		   !begin_update(view)) {
 		report("Failed to load %s view", view->name);
 		return;
 	}
@@ -1370,7 +2041,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) {
@@ -1382,9 +2053,6 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
 		view->parent = prev;
 	}
 
-	if (view == VIEW(REQ_VIEW_HELP))
-		load_help_page();
-
 	if (view->pipe && view->lines == 0) {
 		/* Clear the old view and let the incremental updating refill
 		 * the screen. */
@@ -1418,7 +2086,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:
@@ -1428,9 +2096,16 @@ view_driver(struct view *view, enum request request)
 		scroll_view(view, request);
 		break;
 
+	case REQ_VIEW_BLOB:
+		if (!ref_blob[0]) {
+			report("No file chosen, press 't' to open tree view");
+			break;
+		}
+		/* Fall-through */
 	case REQ_VIEW_MAIN:
 	case REQ_VIEW_DIFF:
 	case REQ_VIEW_LOG:
+	case REQ_VIEW_TREE:
 	case REQ_VIEW_HELP:
 	case REQ_VIEW_PAGER:
 		open_view(view, request, OPEN_DEFAULT);
@@ -1440,16 +2115,16 @@ view_driver(struct view *view, enum request request)
 	case REQ_PREVIOUS:
 		request = request == REQ_NEXT ? REQ_MOVE_DOWN : REQ_MOVE_UP;
 
-		if (view == VIEW(REQ_VIEW_DIFF) &&
-		    view->parent == VIEW(REQ_VIEW_MAIN)) {
-			bool redraw = display[1] == view;
-
+		if ((view == VIEW(REQ_VIEW_DIFF) &&
+		     view->parent == VIEW(REQ_VIEW_MAIN)) ||
+		   (view == VIEW(REQ_VIEW_BLOB) &&
+		     view->parent == VIEW(REQ_VIEW_TREE))) {
 			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 */
@@ -1482,11 +2157,26 @@ view_driver(struct view *view, enum request request)
 		redraw_display();
 		break;
 
+	case REQ_TOGGLE_REV_GRAPH:
+		opt_rev_graph = !opt_rev_graph;
+		redraw_display();
+		break;
+
 	case REQ_PROMPT:
 		/* Always reload^Wrerun commands from the prompt. */
 		open_view(view, opt_request, OPEN_RELOAD);
 		break;
 
+	case REQ_SEARCH:
+	case REQ_SEARCH_BACK:
+		search_view(view, request);
+		break;
+
+	case REQ_FIND_NEXT:
+	case REQ_FIND_PREV:
+		find_next(view, request);
+		break;
+
 	case REQ_STOP_LOADING:
 		for (i = 0; i < ARRAY_SIZE(views); i++) {
 			view = &views[i];
@@ -1507,7 +2197,7 @@ view_driver(struct view *view, enum request request)
 		redraw_display();
 		break;
 
-	case REQ_SCREEN_UPDATE:
+	case REQ_NONE:
 		doupdate();
 		return TRUE;
 
@@ -1544,7 +2234,7 @@ view_driver(struct view *view, enum request request)
  */
 
 static bool
-pager_draw(struct view *view, struct line *line, unsigned int lineno)
+pager_draw(struct view *view, struct line *line, unsigned int lineno, bool selected)
 {
 	char *text = line->data;
 	enum line_type type = line->type;
@@ -1553,12 +2243,7 @@ pager_draw(struct view *view, struct line *line, unsigned int lineno)
 
 	wmove(view->win, lineno, 0);
 
-	if (view->offset + lineno == view->lineno) {
-		if (type == LINE_COMMIT) {
-			string_copy(view->ref, text + 7);
-			string_copy(ref_commit, view->ref);
-		}
-
+	if (selected) {
 		type = LINE_CURSOR;
 		wchgat(view->win, -1, 0, type, NULL);
 	}
@@ -1618,20 +2303,52 @@ pager_draw(struct view *view, struct line *line, unsigned int lineno)
 	return TRUE;
 }
 
+static bool
+add_describe_ref(char *buf, size_t *bufpos, char *commit_id, const char *sep)
+{
+	char refbuf[SIZEOF_STR];
+	char *ref = NULL;
+	FILE *pipe;
+
+	if (!string_format(refbuf, "git describe %s 2>/dev/null", commit_id))
+		return TRUE;
+
+	pipe = popen(refbuf, "r");
+	if (!pipe)
+		return TRUE;
+
+	if ((ref = fgets(refbuf, sizeof(refbuf), pipe)))
+		ref = chomp_string(ref);
+	pclose(pipe);
+
+	if (!ref || !*ref)
+		return TRUE;
+
+	/* This is the only fatal call, since it can "corrupt" the buffer. */
+	if (!string_nformat(buf, SIZEOF_STR, bufpos, "%s%s", sep, ref))
+		return FALSE;
+
+	return TRUE;
+}
+
 static void
 add_pager_refs(struct view *view, struct line *line)
 {
-	char buf[1024];
-	char *data = line->data;
+	char buf[SIZEOF_STR];
+	char *commit_id = line->data + STRING_SIZE("commit ");
 	struct ref **refs;
-	int bufpos = 0, refpos = 0;
+	size_t bufpos = 0, refpos = 0;
 	const char *sep = "Refs: ";
+	bool is_tag = FALSE;
 
 	assert(line->type == LINE_COMMIT);
 
-	refs = get_refs(data + STRING_SIZE("commit "));
-	if (!refs)
+	refs = get_refs(commit_id);
+	if (!refs) {
+		if (view == VIEW(REQ_VIEW_DIFF))
+			goto try_add_describe_ref;
 		return;
+	}
 
 	do {
 		struct ref *ref = refs[refpos];
@@ -1640,8 +2357,20 @@ add_pager_refs(struct view *view, struct line *line)
 		if (!string_format_from(buf, &bufpos, fmt, sep, ref->name))
 			return;
 		sep = ", ";
+		if (ref->tag)
+			is_tag = TRUE;
 	} while (refs[refpos++]->next);
 
+	if (!is_tag && view == VIEW(REQ_VIEW_DIFF)) {
+try_add_describe_ref:
+		/* Add <tag>-g<commit_id> "fake" reference. */
+		if (!add_describe_ref(buf, &bufpos, commit_id, sep))
+			return;
+	}
+
+	if (bufpos == 0)
+		return;
+
 	if (!realloc_lines(view, view->line_size + 1))
 		return;
 
@@ -1697,14 +2426,254 @@ pager_enter(struct view *view, struct line *line)
 	if (split)
 		update_view_title(view);
 
-	return TRUE;
+	return TRUE;
+}
+
+static bool
+pager_grep(struct view *view, struct line *line)
+{
+	regmatch_t pmatch;
+	char *text = line->data;
+
+	if (!*text)
+		return FALSE;
+
+	if (regexec(view->regex, text, 1, &pmatch, 0) == REG_NOMATCH)
+		return FALSE;
+
+	return TRUE;
+}
+
+static void
+pager_select(struct view *view, struct line *line)
+{
+	if (line->type == LINE_COMMIT) {
+		char *text = line->data;
+
+		string_copy(view->ref, text + STRING_SIZE("commit "));
+		string_copy(ref_commit, view->ref);
+	}
+}
+
+static struct view_ops pager_ops = {
+	"line",
+	pager_draw,
+	pager_read,
+	pager_enter,
+	pager_grep,
+	pager_select,
+};
+
+
+/*
+ * Tree backend
+ */
+
+/* Parse output from git-ls-tree(1):
+ *
+ * 100644 blob fb0e31ea6cc679b7379631188190e975f5789c26	Makefile
+ * 100644 blob 5304ca4260aaddaee6498f9630e7d471b8591ea6	README
+ * 100644 blob f931e1d229c3e185caad4449bf5b66ed72462657	tig.c
+ * 100644 blob ed09fe897f3c7c9af90bcf80cae92558ea88ae38	web.conf
+ */
+
+#define SIZEOF_TREE_ATTR \
+	STRING_SIZE("100644 blob ed09fe897f3c7c9af90bcf80cae92558ea88ae38\t")
+
+#define TREE_UP_FORMAT "040000 tree %s\t.."
+
+static int
+tree_compare_entry(enum line_type type1, char *name1,
+		   enum line_type type2, char *name2)
+{
+	if (type1 != type2) {
+		if (type1 == LINE_TREE_DIR)
+			return -1;
+		return 1;
+	}
+
+	return strcmp(name1, name2);
+}
+
+static bool
+tree_read(struct view *view, char *text)
+{
+	size_t textlen = strlen(text);
+	char buf[SIZEOF_STR];
+	unsigned long pos;
+	enum line_type type;
+	bool first_read = view->lines == 0;
+
+	if (textlen <= SIZEOF_TREE_ATTR)
+		return FALSE;
+
+	type = text[STRING_SIZE("100644 ")] == 't'
+	     ? LINE_TREE_DIR : LINE_TREE_FILE;
+
+	if (first_read) {
+		/* Add path info line */
+		if (string_format(buf, "Directory path /%s", opt_path) &&
+		    realloc_lines(view, view->line_size + 1) &&
+		    pager_read(view, buf))
+			view->line[view->lines - 1].type = LINE_DEFAULT;
+		else
+			return FALSE;
+
+		/* Insert "link" to parent directory. */
+		if (*opt_path &&
+		    string_format(buf, TREE_UP_FORMAT, view->ref) &&
+		    realloc_lines(view, view->line_size + 1) &&
+		    pager_read(view, buf))
+			view->line[view->lines - 1].type = LINE_TREE_DIR;
+		else if (*opt_path)
+			return FALSE;
+	}
+
+	/* Strip the path part ... */
+	if (*opt_path) {
+		size_t pathlen = textlen - SIZEOF_TREE_ATTR;
+		size_t striplen = strlen(opt_path);
+		char *path = text + SIZEOF_TREE_ATTR;
+
+		if (pathlen > striplen)
+			memmove(path, path + striplen,
+				pathlen - striplen + 1);
+	}
+
+	/* Skip "Directory ..." and ".." line. */
+	for (pos = 1 + !!*opt_path; pos < view->lines; pos++) {
+		struct line *line = &view->line[pos];
+		char *path1 = ((char *) line->data) + SIZEOF_TREE_ATTR;
+		char *path2 = text + SIZEOF_TREE_ATTR;
+		int cmp = tree_compare_entry(line->type, path1, type, path2);
+
+		if (cmp <= 0)
+			continue;
+
+		text = strdup(text);
+		if (!text)
+			return FALSE;
+
+		if (view->lines > pos)
+			memmove(&view->line[pos + 1], &view->line[pos],
+				(view->lines - pos) * sizeof(*line));
+
+		line = &view->line[pos];
+		line->data = text;
+		line->type = type;
+		view->lines++;
+		return TRUE;
+	}
+
+	if (!pager_read(view, text))
+		return FALSE;
+
+	/* Move the current line to the first tree entry. */
+	if (first_read)
+		view->lineno++;
+
+	view->line[view->lines - 1].type = type;
+	return TRUE;
+}
+
+static bool
+tree_enter(struct view *view, struct line *line)
+{
+	enum open_flags flags;
+	enum request request;
+
+	switch (line->type) {
+	case LINE_TREE_DIR:
+		/* Depending on whether it is a subdir or parent (updir?) link
+		 * mangle the path buffer. */
+		if (line == &view->line[1] && *opt_path) {
+			size_t path_len = strlen(opt_path);
+			char *dirsep = opt_path + path_len - 1;
+
+			while (dirsep > opt_path && dirsep[-1] != '/')
+				dirsep--;
+
+			dirsep[0] = 0;
+
+		} else {
+			size_t pathlen = strlen(opt_path);
+			size_t origlen = pathlen;
+			char *data = line->data;
+			char *basename = data + SIZEOF_TREE_ATTR;
+
+			if (!string_format_from(opt_path, &pathlen, "%s/", basename)) {
+				opt_path[origlen] = 0;
+				return TRUE;
+			}
+		}
+
+		/* Trees and subtrees share the same ID, so they are not not
+		 * unique like blobs. */
+		flags = OPEN_RELOAD;
+		request = REQ_VIEW_TREE;
+		break;
+
+	case LINE_TREE_FILE:
+		flags = display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT;
+		request = REQ_VIEW_BLOB;
+		break;
+
+	default:
+		return TRUE;
+	}
+
+	open_view(view, request, flags);
+
+	return TRUE;
+}
+
+static void
+tree_select(struct view *view, struct line *line)
+{
+	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);
+
+	} else if (line->type != LINE_TREE_DIR) {
+		return;
+	}
+
+	string_ncopy(view->ref, text, 40);
+}
+
+static struct view_ops tree_ops = {
+	"file",
+	pager_draw,
+	tree_read,
+	tree_enter,
+	pager_grep,
+	tree_select,
+};
+
+static bool
+blob_read(struct view *view, char *line)
+{
+	bool state = pager_read(view, line);
+
+	if (state == TRUE)
+		view->line[view->lines - 1].type = LINE_DEFAULT;
+
+	return state;
 }
 
-static struct view_ops pager_ops = {
+static struct view_ops blob_ops = {
 	"line",
 	pager_draw,
-	pager_read,
+	blob_read,
 	pager_enter,
+	pager_grep,
+	pager_select,
 };
 
 
@@ -1713,15 +2682,17 @@ static struct view_ops pager_ops = {
  */
 
 struct commit {
-	char id[41];		/* SHA1 ID. */
-	char title[75];		/* The first line of the commit message. */
-	char author[75];	/* The author of the commit. */
-	struct tm time;		/* Date from the author ident. */
-	struct ref **refs;	/* Repository references; tags & branch heads. */
+	char id[SIZEOF_REV];		/* SHA1 ID. */
+	char title[128];		/* First line of the commit message. */
+	char author[75];		/* Author of the commit. */
+	struct tm time;			/* Date from the author ident. */
+	struct ref **refs;		/* Repository references. */
+	chtype graph[SIZEOF_REVGRAPH];	/* Ancestry chain graphics. */
+	size_t graph_size;		/* The width of the graph array. */
 };
 
 static bool
-main_draw(struct view *view, struct line *line, unsigned int lineno)
+main_draw(struct view *view, struct line *line, unsigned int lineno, bool selected)
 {
 	char buf[DATE_COLS + 1];
 	struct commit *commit = line->data;
@@ -1736,9 +2707,7 @@ main_draw(struct view *view, struct line *line, unsigned int lineno)
 
 	wmove(view->win, lineno, col);
 
-	if (view->offset + lineno == view->lineno) {
-		string_copy(view->ref, commit->id);
-		string_copy(ref_commit, view->ref);
+	if (selected) {
 		type = LINE_CURSOR;
 		wattrset(view->win, get_line_attr(type));
 		wchgat(view->win, -1, 0, type, NULL);
@@ -1780,9 +2749,19 @@ main_draw(struct view *view, struct line *line, unsigned int lineno)
 	if (type != LINE_CURSOR)
 		wattrset(view->win, A_NORMAL);
 
-	mvwaddch(view->win, lineno, col, ACS_LTEE);
-	wmove(view->win, lineno, col + 2);
-	col += 2;
+	if (opt_rev_graph && commit->graph_size) {
+		size_t i;
+
+		wmove(view->win, lineno, col);
+		/* Using waddch() instead of waddnstr() ensures that
+		 * they'll be rendered correctly for the cursor line. */
+		for (i = 0; i < commit->graph_size; i++)
+			waddch(view->win, commit->graph[i]);
+
+		col += commit->graph_size + 1;
+	}
+
+	wmove(view->win, lineno, col);
 
 	if (commit->refs) {
 		size_t i = 0;
@@ -1838,35 +2817,37 @@ main_read(struct view *view, char *line)
 		view->line[view->lines++].data = commit;
 		string_copy(commit->id, line);
 		commit->refs = get_refs(commit->id);
+		commit->graph[commit->graph_size++] = ACS_LTEE;
 		break;
 
 	case LINE_AUTHOR:
 	{
+		/* Parse author lines where the name may be empty:
+		 *	author  <email@address.tld> 1138474660 +0100
+		 */
 		char *ident = line + STRING_SIZE("author ");
-		char *end = strchr(ident, '<');
+		char *nameend = strchr(ident, '<');
+		char *emailend = strchr(ident, '>');
 
-		if (!commit)
+		if (!commit || !nameend || !emailend)
 			break;
 
-		if (end) {
-			for (; end > ident && isspace(end[-1]); end--) ;
-			*end = 0;
+		*nameend = *emailend = 0;
+		ident = chomp_string(ident);
+		if (!*ident) {
+			ident = chomp_string(nameend + 1);
+			if (!*ident)
+				ident = "Unknown";
 		}
 
 		string_copy(commit->author, ident);
 
 		/* Parse epoch and timezone */
-		if (end) {
-			char *secs = strchr(end + 1, '>');
-			char *zone;
-			time_t time;
+		if (emailend[1] == ' ') {
+			char *secs = emailend + 2;
+			char *zone = strchr(secs, ' ');
+			time_t time = (time_t) atol(secs);
 
-			if (!secs || secs[1] != ' ')
-				break;
-
-			secs += 2;
-			time = (time_t) atol(secs);
-			zone = strchr(secs, ' ');
 			if (zone && strlen(zone) == STRING_SIZE(" +0700")) {
 				long tz;
 
@@ -1881,6 +2862,7 @@ main_read(struct view *view, char *line)
 
 				time -= tz;
 			}
+
 			gmtime_r(&time, &commit->time);
 		}
 		break;
@@ -1895,13 +2877,19 @@ main_read(struct view *view, char *line)
 
 		/* Require titles to start with a non-space character at the
 		 * offset used by git log. */
-		/* FIXME: More gracefull handling of titles; append "..." to
-		 * shortened titles, etc. */
-		if (strncmp(line, "    ", 4) ||
-		    isspace(line[4]))
+		if (strncmp(line, "    ", 4))
 			break;
+		line += 4;
+		/* Well, if the title starts with a whitespace character,
+		 * try to be forgiving.  Otherwise we end up with no title. */
+		while (isspace(*line))
+			line++;
+		if (*line == '\0')
+			break;
+		/* FIXME: More graceful handling of titles; append "..." to
+		 * shortened titles, etc. */
 
-		string_copy(commit->title, line + 4);
+		string_copy(commit->title, line);
 	}
 
 	return TRUE;
@@ -1916,197 +2904,55 @@ main_enter(struct view *view, struct line *line)
 	return TRUE;
 }
 
-static struct view_ops main_ops = {
-	"commit",
-	main_draw,
-	main_read,
-	main_enter,
-};
-
-
-/*
- * Keys
- */
-
-struct keymap {
-	int alias;
-	int request;
-};
-
-static struct keymap keymap[] = {
-	/* View switching */
-	{ 'm',		REQ_VIEW_MAIN },
-	{ 'd',		REQ_VIEW_DIFF },
-	{ 'l',		REQ_VIEW_LOG },
-	{ 'p',		REQ_VIEW_PAGER },
-	{ 'h',		REQ_VIEW_HELP },
-	{ '?',		REQ_VIEW_HELP },
-
-	/* View manipulation */
-	{ 'q',		REQ_VIEW_CLOSE },
-	{ KEY_TAB,	REQ_VIEW_NEXT },
-	{ KEY_RETURN,	REQ_ENTER },
-	{ KEY_UP,	REQ_PREVIOUS },
-	{ KEY_DOWN,	REQ_NEXT },
-
-	/* Cursor navigation */
-	{ 'k',		REQ_MOVE_UP },
-	{ 'j',		REQ_MOVE_DOWN },
-	{ KEY_HOME,	REQ_MOVE_FIRST_LINE },
-	{ KEY_END,	REQ_MOVE_LAST_LINE },
-	{ KEY_NPAGE,	REQ_MOVE_PAGE_DOWN },
-	{ ' ',		REQ_MOVE_PAGE_DOWN },
-	{ KEY_PPAGE,	REQ_MOVE_PAGE_UP },
-	{ 'b',		REQ_MOVE_PAGE_UP },
-	{ '-',		REQ_MOVE_PAGE_UP },
-
-	/* Scrolling */
-	{ KEY_IC,	REQ_SCROLL_LINE_UP },
-	{ KEY_DC,	REQ_SCROLL_LINE_DOWN },
-	{ 'w',		REQ_SCROLL_PAGE_UP },
-	{ 's',		REQ_SCROLL_PAGE_DOWN },
-
-	/* Misc */
-	{ 'Q',		REQ_QUIT },
-	{ 'z',		REQ_STOP_LOADING },
-	{ 'v',		REQ_SHOW_VERSION },
-	{ 'r',		REQ_SCREEN_REDRAW },
-	{ 'n',		REQ_TOGGLE_LINENO },
-	{ ':',		REQ_PROMPT },
-
-	/* wgetch() with nodelay() enabled returns ERR when there's no input. */
-	{ ERR,		REQ_SCREEN_UPDATE },
-
-	/* Use the ncurses SIGWINCH handler. */
-	{ KEY_RESIZE,	REQ_SCREEN_RESIZE },
-};
-
-static enum request
-get_request(int key)
-{
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(keymap); i++)
-		if (keymap[i].alias == key)
-			return keymap[i].request;
-
-	return (enum request) key;
-}
-
-struct key {
-	char *name;
-	int value;
-};
-
-static struct key key_table[] = {
-	{ "Enter",	KEY_RETURN },
-	{ "Space",	' ' },
-	{ "Backspace",	KEY_BACKSPACE },
-	{ "Tab",	KEY_TAB },
-	{ "Escape",	KEY_ESC },
-	{ "Left",	KEY_LEFT },
-	{ "Right",	KEY_RIGHT },
-	{ "Up",		KEY_UP },
-	{ "Down",	KEY_DOWN },
-	{ "Insert",	KEY_IC },
-	{ "Delete",	KEY_DC },
-	{ "Home",	KEY_HOME },
-	{ "End",	KEY_END },
-	{ "PageUp",	KEY_PPAGE },
-	{ "PageDown",	KEY_NPAGE },
-	{ "F1",		KEY_F(1) },
-	{ "F2",		KEY_F(2) },
-	{ "F3",		KEY_F(3) },
-	{ "F4",		KEY_F(4) },
-	{ "F5",		KEY_F(5) },
-	{ "F6",		KEY_F(6) },
-	{ "F7",		KEY_F(7) },
-	{ "F8",		KEY_F(8) },
-	{ "F9",		KEY_F(9) },
-	{ "F10",	KEY_F(10) },
-	{ "F11",	KEY_F(11) },
-	{ "F12",	KEY_F(12) },
-};
-
-static char *
-get_key(enum request request)
+static bool
+main_grep(struct view *view, struct line *line)
 {
-	static char buf[BUFSIZ];
-	static char key_char[] = "'X'";
-	int pos = 0;
-	char *sep = "    ";
-	int i;
-
-	buf[pos] = 0;
-
-	for (i = 0; i < ARRAY_SIZE(keymap); i++) {
-		char *seq = NULL;
-		int key;
-
-		if (keymap[i].request != request)
-			continue;
-
-		for (key = 0; key < ARRAY_SIZE(key_table); key++)
-			if (key_table[key].value == keymap[i].alias)
-				seq = key_table[key].name;
+	struct commit *commit = line->data;
+	enum { S_TITLE, S_AUTHOR, S_DATE, S_END } state;
+	char buf[DATE_COLS + 1];
+	regmatch_t pmatch;
+
+	for (state = S_TITLE; state < S_END; state++) {
+		char *text;
+
+		switch (state) {
+		case S_TITLE:	text = commit->title;	break;
+		case S_AUTHOR:	text = commit->author;	break;
+		case S_DATE:
+			if (!strftime(buf, sizeof(buf), DATE_FORMAT, &commit->time))
+				continue;
+			text = buf;
+			break;
 
-		if (seq == NULL &&
-		    keymap[i].alias < 127 &&
-		    isprint(keymap[i].alias)) {
-			key_char[1] = (char) keymap[i].alias;
-			seq = key_char;
+		default:
+			return FALSE;
 		}
 
-		if (!seq)
-			seq = "'?'";
-
-		if (!string_format_from(buf, &pos, "%s%s", sep, seq))
-			return "Too many keybindings!";
-		sep = ", ";
+		if (regexec(view->regex, text, 1, &pmatch, 0) != REG_NOMATCH)
+			return TRUE;
 	}
 
-	return buf;
+	return FALSE;
 }
 
-static void load_help_page(void)
+static void
+main_select(struct view *view, struct line *line)
 {
-	char buf[BUFSIZ];
-	struct view *view = VIEW(REQ_VIEW_HELP);
-	int lines = ARRAY_SIZE(req_info) + 2;
-	int i;
-
-	if (view->lines > 0)
-		return;
-
-	for (i = 0; i < ARRAY_SIZE(req_info); i++)
-		if (!req_info[i].request)
-			lines++;
-
-	view->line = calloc(lines, sizeof(*view->line));
-	if (!view->line) {
-		report("Allocation failure");
-		return;
-	}
-
-	pager_read(view, "Quick reference for tig keybindings:");
-
-	for (i = 0; i < ARRAY_SIZE(req_info); i++) {
-		char *key;
-
-		if (!req_info[i].request) {
-			pager_read(view, "");
-			pager_read(view, req_info[i].help);
-			continue;
-		}
-
-		key = get_key(req_info[i].request);
-		if (!string_format(buf, "%-25s %s", key, req_info[i].help))
-			continue;
+	struct commit *commit = line->data;
 
-		pager_read(view, buf);
-	}
+	string_copy(view->ref, commit->id);
+	string_copy(ref_commit, view->ref);
 }
 
+static struct view_ops main_ops = {
+	"commit",
+	main_draw,
+	main_read,
+	main_enter,
+	main_grep,
+	main_select,
+};
+
 
 /*
  * Unicode / UTF-8 handling
@@ -2278,33 +3124,37 @@ static bool cursed = FALSE;
 /* The status window is used for polling keystrokes. */
 static WINDOW *status_win;
 
+static bool status_empty = TRUE;
+
 /* Update status and title window. */
 static void
 report(const char *msg, ...)
 {
-	static bool empty = TRUE;
 	struct view *view = display[current_view];
 
-	if (!empty || *msg) {
+	if (input_mode)
+		return;
+
+	if (!status_empty || *msg) {
 		va_list args;
 
 		va_start(args, msg);
 
-		werase(status_win);
 		wmove(status_win, 0, 0);
 		if (*msg) {
 			vwprintw(status_win, msg, args);
-			empty = FALSE;
+			status_empty = FALSE;
 		} else {
-			empty = TRUE;
+			status_empty = TRUE;
 		}
+		wclrtoeol(status_win);
 		wrefresh(status_win);
 
 		va_end(args);
 	}
 
 	update_view_title(view);
-	update_display_cursor();
+	update_display_cursor(view);
 }
 
 /* Controls when nodelay should be in effect when polling user input. */
@@ -2330,6 +3180,8 @@ init_display(void)
 		/* Leave stdin and stdout alone when acting as a pager. */
 		FILE *io = fopen("/dev/tty", "r+");
 
+		if (!io)
+			die("Failed to open /dev/tty");
 		cursed = !!newterm(NULL, io, io);
 	}
 
@@ -2354,6 +3206,72 @@ init_display(void)
 	wbkgdset(status_win, get_line_attr(LINE_STATUS));
 }
 
+static char *
+read_prompt(const char *prompt)
+{
+	enum { READING, STOP, CANCEL } status = READING;
+	static char buf[sizeof(opt_cmd) - STRING_SIZE("git \0")];
+	int pos = 0;
+
+	while (status == READING) {
+		struct view *view;
+		int i, key;
+
+		input_mode = TRUE;
+
+		foreach_view (view, i)
+			update_view(view);
+
+		input_mode = FALSE;
+
+		mvwprintw(status_win, 0, 0, "%s%.*s", prompt, pos, buf);
+		wclrtoeol(status_win);
+
+		/* Refresh, accept single keystroke of input */
+		key = wgetch(status_win);
+		switch (key) {
+		case KEY_RETURN:
+		case KEY_ENTER:
+		case '\n':
+			status = pos ? STOP : CANCEL;
+			break;
+
+		case KEY_BACKSPACE:
+			if (pos > 0)
+				pos--;
+			else
+				status = CANCEL;
+			break;
+
+		case KEY_ESC:
+			status = CANCEL;
+			break;
+
+		case ERR:
+			break;
+
+		default:
+			if (pos >= sizeof(buf)) {
+				report("Input string too long");
+				return NULL;
+			}
+
+			if (isprint(key))
+				buf[pos++] = (char) key;
+		}
+	}
+
+	/* Clear the status window */
+	status_empty = FALSE;
+	report("");
+
+	if (status == CANCEL)
+		return NULL;
+
+	buf[pos++] = 0;
+
+	return buf;
+}
 
 /*
  * Repository references
@@ -2420,25 +3338,22 @@ read_ref(char *id, int idlen, char *name, int namelen)
 {
 	struct ref *ref;
 	bool tag = FALSE;
-	bool tag_commit = FALSE;
 
-	/* Commits referenced by tags has "^{}" appended. */
-	if (name[namelen - 1] == '}') {
+	if (!strncmp(name, "refs/tags/", STRING_SIZE("refs/tags/"))) {
+		/* Commits referenced by tags has "^{}" appended. */
+		if (name[namelen - 1] != '}')
+			return OK;
+
 		while (namelen > 0 && name[namelen] != '^')
 			namelen--;
-		if (namelen > 0)
-			tag_commit = TRUE;
-		name[namelen] = 0;
-	}
 
-	if (!strncmp(name, "refs/tags/", STRING_SIZE("refs/tags/"))) {
-		if (!tag_commit)
-			return OK;
-		name += STRING_SIZE("refs/tags/");
 		tag = TRUE;
+		namelen -= STRING_SIZE("refs/tags/");
+		name	+= STRING_SIZE("refs/tags/");
 
 	} else if (!strncmp(name, "refs/heads/", STRING_SIZE("refs/heads/"))) {
-		name += STRING_SIZE("refs/heads/");
+		namelen -= STRING_SIZE("refs/heads/");
+		name	+= STRING_SIZE("refs/heads/");
 
 	} else if (!strcmp(name, "HEAD")) {
 		return OK;
@@ -2449,10 +3364,12 @@ read_ref(char *id, int idlen, char *name, int namelen)
 		return ERR;
 
 	ref = &refs[refs_size++];
-	ref->name = strdup(name);
+	ref->name = malloc(namelen + 1);
 	if (!ref->name)
 		return ERR;
 
+	strncpy(ref->name, name, namelen);
+	ref->name[namelen] = 0;
 	ref->tag = tag;
 	string_copy(ref->id, id);
 
@@ -2471,9 +3388,8 @@ load_refs(void)
 static int
 read_repo_config_option(char *name, int namelen, char *value, int valuelen)
 {
-	if (!strcmp(name, "i18n.commitencoding")) {
+	if (!strcmp(name, "i18n.commitencoding"))
 		string_copy(opt_encoding, value);
-	}
 
 	return OK;
 }
@@ -2530,12 +3446,6 @@ read_properties(FILE *pipe, const char *separators,
  * Main
  */
 
-#if __GNUC__ >= 3
-#define __NORETURN __attribute__((__noreturn__))
-#else
-#define __NORETURN
-#endif
-
 static void __NORETURN
 quit(int sig)
 {
@@ -2570,6 +3480,10 @@ main(int argc, char *argv[])
 
 	signal(SIGINT, quit);
 
+	if (setlocale(LC_ALL, "")) {
+		string_copy(opt_codeset, nl_langinfo(CODESET));
+	}
+
 	if (load_options() == ERR)
 		die("Failed to load user config.");
 
@@ -2581,6 +3495,12 @@ main(int argc, char *argv[])
 	if (!parse_options(argc, argv))
 		return 0;
 
+	if (*opt_codeset && strcmp(opt_codeset, opt_encoding)) {
+		opt_iconv = iconv_open(opt_codeset, opt_encoding);
+		if (opt_iconv == ICONV_NONE)
+			die("Failed to initialize character set conversion");
+	}
+
 	if (load_refs() == ERR)
 		die("Failed to load refs.");
 
@@ -2604,31 +3524,48 @@ main(int argc, char *argv[])
 
 		/* Refresh, accept single keystroke of input */
 		key = wgetch(status_win);
-		request = get_request(key);
+
+		/* wgetch() with nodelay() enabled returns ERR when there's no
+		 * input. */
+		if (key == ERR) {
+			request = REQ_NONE;
+			continue;
+		}
+
+		request = get_keybinding(display[current_view]->keymap, key);
 
 		/* Some low-level request handling. This keeps access to
 		 * status_win restricted. */
 		switch (request) {
 		case REQ_PROMPT:
-			report(":");
-			/* Temporarily switch to line-oriented and echoed
-			 * input. */
-			nocbreak();
-			echo();
-
-			if (wgetnstr(status_win, opt_cmd + 4, sizeof(opt_cmd) - 4) == OK) {
-				memcpy(opt_cmd, "git ", 4);
-				opt_request = REQ_VIEW_PAGER;
-			} else {
-				report("Prompt interrupted by loading view, "
-				       "press 'z' to stop loading views");
-				request = REQ_SCREEN_UPDATE;
+		{
+			char *cmd = read_prompt(":");
+
+			if (cmd && string_format(opt_cmd, "git %s", cmd)) {
+				if (strncmp(cmd, "show", 4) && isspace(cmd[4])) {
+					opt_request = REQ_VIEW_DIFF;
+				} else {
+					opt_request = REQ_VIEW_PAGER;
+				}
+				break;
 			}
 
-			noecho();
-			cbreak();
+			request = REQ_NONE;
 			break;
+		}
+		case REQ_SEARCH:
+		case REQ_SEARCH_BACK:
+		{
+			const char *prompt = request == REQ_SEARCH
+					   ? "/" : "?";
+			char *search = read_prompt(prompt);
 
+			if (search)
+				string_copy(opt_search, search);
+			else
+				request = REQ_NONE;
+			break;
+		}
 		case REQ_SCREEN_RESIZE:
 		{
 			int height, width;