X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/d9d1c722565aea84915579328307dd3be1f046c6..4f774851c65e0660b48ba639b47262e6283fe497:/tig.c?ds=inline

diff --git a/tig.c b/tig.c
index 9019947..efea6f4 100644
--- a/tig.c
+++ b/tig.c
@@ -55,6 +55,7 @@
 static void die(const char *err, ...);
 static void report(const char *msg, ...);
 static void set_nonblocking_input(bool loading);
+static size_t utf8_length(const char *string, size_t max_width, int *coloffset, int *trimmed);
 
 #define ABS(x)		((x) >= 0  ? (x) : -(x))
 #define MIN(x, y)	((x) < (y) ? (x) :  (y))
@@ -74,6 +75,8 @@ static void set_nonblocking_input(bool loading);
 #define DATE_FORMAT	"%Y-%m-%d %H:%M"
 #define DATE_COLS	STRING_SIZE("2006-04-29 14:21 ")
 
+#define AUTHOR_COLS	20
+
 /* The default interval between line numbers. */
 #define NUMBER_INTERVAL	1
 
@@ -109,6 +112,7 @@ enum request {
 	REQ_STOP_LOADING,
 	REQ_TOGGLE_LINE_NUMBERS,
 	REQ_VIEW_NEXT,
+	REQ_VIEW_CLOSE,
 
 	REQ_MOVE_UP,
 	REQ_MOVE_UP_ENTER,
@@ -204,6 +208,25 @@ sq_quote(char buf[SIZEOF_CMD], size_t bufsize, const char *src)
  * -------
  **/
 
+static const char usage[] =
+VERSION " (" __DATE__ ")\n"
+"\n"
+"Usage: tig [options]\n"
+"   or: tig [options] [--] [git log options]\n"
+"   or: tig [options] log  [git log options]\n"
+"   or: tig [options] diff [git diff options]\n"
+"   or: tig [options] show [git show options]\n"
+"   or: tig [options] <    [git command output]\n"
+"\n"
+"Options:\n"
+"  -l                          Start up in log view\n"
+"  -d                          Start up in diff view\n"
+"  -n[I], --line-number[=I]    Show line numbers with given interval\n"
+"  -t[N], --tab-size[=N]       Set number of spaces for tab expansion\n"
+"  --                          Mark end of tig options\n"
+"  -v, --version               Show version and exit\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;
@@ -293,6 +316,16 @@ parse_options(int argc, char *argv[])
 		}
 
 		/**
+		 * -h, --help::
+		 *	Show help message and exit.
+		 **/
+		if (!strcmp(opt, "-h") ||
+		    !strcmp(opt, "--help")) {
+			printf(usage);
+			return FALSE;
+		}
+
+		/**
 		 * \--::
 		 *	End of tig(1) options. Useful when specifying command
 		 *	options for the main view. Example:
@@ -641,7 +674,6 @@ struct view {
 	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} */
-	size_t objsize;		/* Size of objects in the line index */
 
 	struct view_ops {
 		/* What type of content being displayed. Used in the
@@ -667,6 +699,10 @@ struct view {
 	unsigned long offset;	/* Offset of the window top */
 	unsigned long lineno;	/* Current line number */
 
+	/* 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;
+
 	/* Buffering */
 	unsigned long lines;	/* Total number of lines */
 	void **line;		/* Line index; each line contains user data */
@@ -680,11 +716,11 @@ struct view {
 static struct view_ops pager_ops;
 static struct view_ops main_ops;
 
-#define VIEW_STR(name, cmd, env, ref, objsize, ops) \
-	{ name, cmd, #env, ref, objsize, ops }
+#define VIEW_STR(name, cmd, env, ref, ops) \
+	{ name, cmd, #env, ref, ops }
 
-#define VIEW_(id, name, ops, ref, objsize) \
-	VIEW_STR(name, TIG_##id##_CMD,  TIG_##id##_CMD, ref, objsize, ops)
+#define VIEW_(id, name, ops, ref) \
+	VIEW_STR(name, TIG_##id##_CMD,  TIG_##id##_CMD, ref, ops)
 
 /**
  * Views
@@ -717,11 +753,11 @@ static struct view_ops main_ops;
  **/
 
 static struct view views[] = {
-	VIEW_(MAIN,  "main",  &main_ops,  ref_head,   sizeof(struct commit)),
-	VIEW_(DIFF,  "diff",  &pager_ops, ref_commit, sizeof(char)),
-	VIEW_(LOG,   "log",   &pager_ops, ref_head,   sizeof(char)),
-	VIEW_(HELP,  "help",  &pager_ops, "static",   sizeof(char)),
-	VIEW_(PAGER, "pager", &pager_ops, "static",   sizeof(char)),
+	VIEW_(MAIN,  "main",  &main_ops,  ref_head),
+	VIEW_(DIFF,  "diff",  &pager_ops, ref_commit),
+	VIEW_(LOG,   "log",   &pager_ops, ref_head),
+	VIEW_(HELP,  "help",  &pager_ops, "static"),
+	VIEW_(PAGER, "pager", &pager_ops, "static"),
 };
 
 #define VIEW(req) (&views[(req) - REQ_OFFSET - 1])
@@ -1224,21 +1260,7 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
 	bool split = !!(flags & OPEN_SPLIT);
 	bool reload = !!(flags & OPEN_RELOAD);
 	struct view *view = VIEW(request);
-	struct view *displayed;
-	int nviews;
-
-	/* Cycle between displayed views and count the views. */
-	foreach_view (displayed, nviews) {
-		if (prev != view &&
-		    view == displayed &&
-		    !strcmp(view->vid, prev->vid)) {
-			current_view = nviews;
-			/* Blur out the title of the previous view. */
-			update_view_title(prev);
-			report("");
-			return;
-		}
-	}
+	int nviews = display[1] ? 2 : 1;
 
 	if (view == prev && nviews == 1 && !reload) {
 		report("Already in %s view", view->name);
@@ -1281,6 +1303,7 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
 		/* Continue loading split views in the background. */
 		if (!split)
 			end_update(prev);
+		view->parent = prev;
 	}
 
 	if (view->pipe) {
@@ -1384,7 +1407,7 @@ view_driver(struct view *view, enum request request)
 		break;
 
 	case REQ_SHOW_VERSION:
-		report("Version: %s", VERSION);
+		report("%s (built %s)", VERSION, __DATE__);
 		return TRUE;
 
 	case REQ_SCREEN_RESIZE:
@@ -1398,6 +1421,17 @@ view_driver(struct view *view, enum request request)
 		doupdate();
 		return TRUE;
 
+	case REQ_VIEW_CLOSE:
+		if (view->parent) {
+			memset(display, 0, sizeof(display));
+			current_view = 0;
+			display[current_view] = view->parent;
+			view->parent = NULL;
+			resize_display();
+			redraw_display();
+			break;
+		}
+		/* Fall-through */
 	case REQ_QUIT:
 		return FALSE;
 
@@ -1520,18 +1554,25 @@ static bool
 pager_enter(struct view *view)
 {
 	char *line = view->line[view->lineno];
+	int split = 0;
 
-	if (view == VIEW(REQ_VIEW_DIFF)) {
-		scroll_view(view, REQ_SCROLL_LINE_DOWN);
-		return TRUE;
+	if ((view == VIEW(REQ_VIEW_LOG) ||
+	     view == VIEW(REQ_VIEW_LOG)) &&
+	    get_line_type(line) == LINE_COMMIT) {
+		open_view(view, REQ_VIEW_DIFF, OPEN_SPLIT);
+		split = 1;
 	}
 
-	if (get_line_type(line) == LINE_COMMIT) {
-		if (view == VIEW(REQ_VIEW_LOG))
-			open_view(view, REQ_VIEW_DIFF, OPEN_SPLIT | OPEN_BACKGROUNDED);
-		else
-			open_view(view, REQ_VIEW_DIFF, OPEN_DEFAULT);
-	}
+	/* Always scroll the view even if it was split. That way
+	 * you can use Enter to scroll through the log view and
+	 * split open each commit diff. */
+	scroll_view(view, REQ_SCROLL_LINE_DOWN);
+
+	/* FIXME: A minor workaround. Scrolling the view will call report("")
+	 * but if we are scolling a non-current view this won't properly update
+	 * the view title. */
+	if (split)
+		update_view_title(view);
 
 	return TRUE;
 }
@@ -1554,6 +1595,8 @@ main_draw(struct view *view, unsigned int lineno)
 	enum line_type type;
 	int col = 0;
 	size_t timelen;
+	size_t authorlen;
+	int trimmed;
 
 	if (view->offset + lineno >= view->lines)
 		return FALSE;
@@ -1585,8 +1628,11 @@ main_draw(struct view *view, unsigned int lineno)
 	if (type != LINE_CURSOR)
 		wattrset(view->win, get_line_attr(LINE_MAIN_AUTHOR));
 
-	if (strlen(commit->author) > 19) {
-		waddnstr(view->win, commit->author, 18);
+	/* FIXME: Make this optional, and add i18n.commitEncoding support. */
+	authorlen = utf8_length(commit->author, AUTHOR_COLS - 2, &col, &trimmed);
+
+	if (trimmed) {
+		waddnstr(view->win, commit->author, authorlen);
 		if (type != LINE_CURSOR)
 			wattrset(view->win, get_line_attr(LINE_MAIN_DELIM));
 		waddch(view->win, '~');
@@ -1594,7 +1640,7 @@ main_draw(struct view *view, unsigned int lineno)
 		waddstr(view->win, commit->author);
 	}
 
-	col += 20;
+	col += AUTHOR_COLS;
 	if (type != LINE_CURSOR)
 		wattrset(view->win, A_NORMAL);
 
@@ -1728,7 +1774,7 @@ main_read(struct view *view, char *line)
 static bool
 main_enter(struct view *view)
 {
-	open_view(view, REQ_VIEW_DIFF, OPEN_SPLIT | OPEN_BACKGROUNDED);
+	open_view(view, REQ_VIEW_DIFF, OPEN_SPLIT);
 	return TRUE;
 }
 
@@ -1765,6 +1811,10 @@ static struct keymap keymap[] = {
 	 *	Switch to pager view.
 	 * h::
 	 *	Show man page.
+	 * q::
+	 *	Close view, if multiple views are open it will jump back to the
+	 *	previous view in the view stack. If it is the last open view it
+	 *	will quit. Use 'Q' to quit all views at once.
 	 * Enter::
 	 *	This key is "context sensitive" depending on what view you are
 	 *	currently in. When in log view on a commit line or in the main
@@ -1779,6 +1829,7 @@ static struct keymap keymap[] = {
 	{ 'p',		REQ_VIEW_PAGER },
 	{ 'h',		REQ_VIEW_HELP },
 
+	{ 'q',		REQ_VIEW_CLOSE },
 	{ KEY_TAB,	REQ_VIEW_NEXT },
 	{ KEY_RETURN,	REQ_ENTER },
 
@@ -1797,6 +1848,7 @@ static struct keymap keymap[] = {
 	 *	Move cursor one line down and enter.
 	 * PgUp::
 	 * b::
+	 * -::
 	 *	Move cursor one page up.
 	 * PgDown::
 	 * Space::
@@ -1816,6 +1868,7 @@ static struct keymap keymap[] = {
 	{ ' ',		REQ_MOVE_PAGE_DOWN },
 	{ KEY_PPAGE,	REQ_MOVE_PAGE_UP },
 	{ 'b',		REQ_MOVE_PAGE_UP },
+	{ '-',		REQ_MOVE_PAGE_UP },
 
 	/**
 	 * Scrolling
@@ -1883,11 +1936,171 @@ get_request(int key)
 
 
 /*
+ * Unicode / UTF-8 handling
+ *
+ * NOTE: Much of the following code for dealing with unicode is derived from
+ * ELinks' UTF-8 code developed by Scrool <scroolik@gmail.com>. Origin file is
+ * src/intl/charset.c from the utf8 branch commit elinks-0.11.0-g31f2c28.
+ */
+
+/* I've (over)annotated a lot of code snippets because I am not entirely
+ * confident that the approach taken by this small UTF-8 interface is correct.
+ * --jonas */
+
+static inline int
+unicode_width(unsigned long c)
+{
+	if (c >= 0x1100 &&
+	   (c <= 0x115f				/* Hangul Jamo */
+	    || c == 0x2329
+	    || c == 0x232a
+	    || (c >= 0x2e80  && c <= 0xa4cf && c != 0x303f)
+	    					/* CJK ... Yi */
+	    || (c >= 0xac00  && c <= 0xd7a3)	/* Hangul Syllables */
+	    || (c >= 0xf900  && c <= 0xfaff)	/* CJK Compatibility Ideographs */
+	    || (c >= 0xfe30  && c <= 0xfe6f)	/* CJK Compatibility Forms */
+	    || (c >= 0xff00  && c <= 0xff60)	/* Fullwidth Forms */
+	    || (c >= 0xffe0  && c <= 0xffe6)
+	    || (c >= 0x20000 && c <= 0x2fffd)
+	    || (c >= 0x30000 && c <= 0x3fffd)))
+		return 2;
+
+	return 1;
+}
+
+/* Number of bytes used for encoding a UTF-8 character indexed by first byte.
+ * Illegal bytes are set one. */
+static const unsigned char utf8_bytes[256] = {
+	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
+	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
+	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
+	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
+	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
+	1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,
+	2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,
+	3,3,3,3,3,3,3,3, 3,3,3,3,3,3,3,3, 4,4,4,4,4,4,4,4, 5,5,5,5,6,6,1,1,
+};
+
+/* Decode UTF-8 multi-byte representation into a unicode character. */
+static inline unsigned long
+utf8_to_unicode(const char *string, size_t length)
+{
+	unsigned long unicode;
+
+	switch (length) {
+	case 1:
+		unicode  =   string[0];
+		break;
+	case 2:
+		unicode  =  (string[0] & 0x1f) << 6;
+		unicode +=  (string[1] & 0x3f);
+		break;
+	case 3:
+		unicode  =  (string[0] & 0x0f) << 12;
+		unicode += ((string[1] & 0x3f) << 6);
+		unicode +=  (string[2] & 0x3f);
+		break;
+	case 4:
+		unicode  =  (string[0] & 0x0f) << 18;
+		unicode += ((string[1] & 0x3f) << 12);
+		unicode += ((string[2] & 0x3f) << 6);
+		unicode +=  (string[3] & 0x3f);
+		break;
+	case 5:
+		unicode  =  (string[0] & 0x0f) << 24;
+		unicode += ((string[1] & 0x3f) << 18);
+		unicode += ((string[2] & 0x3f) << 12);
+		unicode += ((string[3] & 0x3f) << 6);
+		unicode +=  (string[4] & 0x3f);
+		break;
+	case 6:
+		unicode  =  (string[0] & 0x01) << 30;
+		unicode += ((string[1] & 0x3f) << 24);
+		unicode += ((string[2] & 0x3f) << 18);
+		unicode += ((string[3] & 0x3f) << 12);
+		unicode += ((string[4] & 0x3f) << 6);
+		unicode +=  (string[5] & 0x3f);
+		break;
+	default:
+		die("Invalid unicode length");
+	}
+
+	/* Invalid characters could return the special 0xfffd value but NUL
+	 * should be just as good. */
+	return unicode > 0xffff ? 0 : unicode;
+}
+
+/* Calculates how much of string can be shown within the given maximum width
+ * and sets trimmed parameter to non-zero value if all of string could not be
+ * shown.
+ *
+ * Additionally, adds to coloffset how many many columns to move to align with
+ * the expected position. Takes into account how multi-byte and double-width
+ * characters will effect the cursor position.
+ *
+ * Returns the number of bytes to output from string to satisfy max_width. */
+static size_t
+utf8_length(const char *string, size_t max_width, int *coloffset, int *trimmed)
+{
+	const char *start = string;
+	const char *end = strchr(string, '\0');
+	size_t mbwidth = 0;
+	size_t width = 0;
+
+	*trimmed = 0;
+
+	while (string < end) {
+		int c = *(unsigned char *) string;
+		unsigned char bytes = utf8_bytes[c];
+		size_t ucwidth;
+		unsigned long unicode;
+
+		if (string + bytes > end)
+			break;
+
+		/* Change representation to figure out whether
+		 * it is a single- or double-width character. */
+
+		unicode = utf8_to_unicode(string, bytes);
+		/* FIXME: Graceful handling of invalid unicode character. */
+		if (!unicode)
+			break;
+
+		ucwidth = unicode_width(unicode);
+		width  += ucwidth;
+		if (width > max_width) {
+			*trimmed = 1;
+			break;
+		}
+
+		/* The column offset collects the differences between the
+		 * number of bytes encoding a character and the number of
+		 * columns will be used for rendering said character.
+		 *
+		 * So if some character A is encoded in 2 bytes, but will be
+		 * represented on the screen using only 1 byte this will and up
+		 * adding 1 to the multi-byte column offset.
+		 *
+		 * Assumes that no double-width character can be encoding in
+		 * less than two bytes. */
+		if (bytes > ucwidth)
+			mbwidth += bytes - ucwidth;
+
+		string  += bytes;
+	}
+
+	*coloffset += mbwidth;
+
+	return string - start;
+}
+
+
+/*
  * Status management
  */
 
 /* Whether or not the curses interface has been initialized. */
-bool cursed = FALSE;
+static bool cursed = FALSE;
 
 /* The status window is used for polling keystrokes. */
 static WINDOW *status_win;
@@ -2301,6 +2514,8 @@ main(int argc, char *argv[])
  * ----
  * Known bugs and problems:
  *
+ * - In it's current state tig is pretty much UTF-8 only.
+ *
  * - If the screen width is very small the main view can draw
  *   outside the current view causing bad wrapping. Same goes
  *   for title and status windows.