X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/b3c965c9d8bbfde4b99b02376b535976e1a3f48e..e34f45d4dddeb070a83e40b9959a2344295af1bc:/tig.c

diff --git a/tig.c b/tig.c
index 3a534fa..8f86b95 100644
--- a/tig.c
+++ b/tig.c
@@ -64,7 +64,7 @@
 
 static void die(const char *err, ...);
 static void report(const char *msg, ...);
-static int read_properties(FILE *pipe, int separator, int (*read)(char *, int, char *, int));
+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);
 
@@ -149,6 +149,29 @@ struct ref {
 
 static struct ref **get_refs(char *id);
 
+struct int_map {
+	const char *name;
+	int namelen;
+	int value;
+};
+
+static int
+set_from_int_map(struct int_map *map, size_t map_size,
+		 int *value, const char *name, int namelen)
+{
+
+	int i;
+
+	for (i = 0; i < map_size; i++)
+		if (namelen == map[i].namelen &&
+		    !strncasecmp(name, map[i].name, namelen)) {
+			*value = map[i].value;
+			return OK;
+		}
+
+	return ERR;
+}
+
 
 /*
  * String helpers
@@ -166,6 +189,21 @@ string_ncopy(char *dst, const char *src, int dstlen)
 #define string_copy(dst, src) \
 	string_ncopy(dst, src, sizeof(dst))
 
+static char *
+chomp_string(char *name)
+{
+	int namelen;
+
+	while (isspace(*name))
+		name++;
+
+	namelen = strlen(name) - 1;
+	while (namelen > 0 && isspace(name[namelen]))
+		name[namelen--] = 0;
+
+	return name;
+}
+
 
 /* Shell quoting
  *
@@ -521,42 +559,68 @@ parse_options(int argc, char *argv[])
 	""
 
 
-/*
- * Line-oriented content detection.
- */
+/**
+ * FILES
+ * -----
+ * '~/.tigrc'::
+ *	User configuration file. See tigrc(5) for examples.
+ *
+ * '.git/config'::
+ *	Repository config file. Read on startup with the help of
+ *	git-repo-config(1).
+ **/
+
+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),
+};
 
 #define LINE_INFO \
-/*   Line type	   String to match	Foreground	Background	Attributes
- *   ---------     ---------------      ----------      ----------      ---------- */ \
-/* Diff markup */ \
-LINE(DIFF,	   "diff --git ",	COLOR_YELLOW,	COLOR_DEFAULT,	0), \
-LINE(DIFF_INDEX,   "index ",		COLOR_BLUE,	COLOR_DEFAULT,	0), \
+LINE(DIFF_HEADER,  "diff --git ",	COLOR_YELLOW,	COLOR_DEFAULT,	0), \
 LINE(DIFF_CHUNK,   "@@",		COLOR_MAGENTA,	COLOR_DEFAULT,	0), \
 LINE(DIFF_ADD,	   "+",			COLOR_GREEN,	COLOR_DEFAULT,	0), \
 LINE(DIFF_DEL,	   "-",			COLOR_RED,	COLOR_DEFAULT,	0), \
-LINE(DIFF_OLDMODE, "old file mode ",	COLOR_YELLOW,	COLOR_DEFAULT,	0), \
-LINE(DIFF_NEWMODE, "new file mode ",	COLOR_YELLOW,	COLOR_DEFAULT,	0), \
-LINE(DIFF_COPY,	   "copy ",		COLOR_YELLOW,	COLOR_DEFAULT,	0), \
-LINE(DIFF_RENAME,  "rename ",		COLOR_YELLOW,	COLOR_DEFAULT,	0), \
-LINE(DIFF_SIM,	   "similarity ",	COLOR_YELLOW,	COLOR_DEFAULT,	0), \
-LINE(DIFF_DISSIM,  "dissimilarity ",	COLOR_YELLOW,	COLOR_DEFAULT,	0), \
-/* Pretty print commit header */ \
+LINE(DIFF_INDEX,	"index ",	  COLOR_BLUE,	COLOR_DEFAULT,	0), \
+LINE(DIFF_OLDMODE,	"old file mode ", COLOR_YELLOW,	COLOR_DEFAULT,	0), \
+LINE(DIFF_NEWMODE,	"new file mode ", COLOR_YELLOW,	COLOR_DEFAULT,	0), \
+LINE(DIFF_COPY_FROM,	"copy from",	  COLOR_YELLOW,	COLOR_DEFAULT,	0), \
+LINE(DIFF_COPY_TO,	"copy to",	  COLOR_YELLOW,	COLOR_DEFAULT,	0), \
+LINE(DIFF_RENAME_FROM,	"rename from",	  COLOR_YELLOW,	COLOR_DEFAULT,	0), \
+LINE(DIFF_RENAME_TO,	"rename to",	  COLOR_YELLOW,	COLOR_DEFAULT,	0), \
+LINE(DIFF_SIMILARITY,   "similarity ",	  COLOR_YELLOW,	COLOR_DEFAULT,	0), \
+LINE(DIFF_DISSIMILARITY,"dissimilarity ", COLOR_YELLOW,	COLOR_DEFAULT,	0), \
+LINE(DIFF_TREE,		"diff-tree ",	  COLOR_BLUE,	COLOR_DEFAULT,	0), \
 LINE(PP_AUTHOR,	   "Author: ",		COLOR_CYAN,	COLOR_DEFAULT,	0), \
 LINE(PP_COMMIT,	   "Commit: ",		COLOR_MAGENTA,	COLOR_DEFAULT,	0), \
 LINE(PP_MERGE,	   "Merge: ",		COLOR_BLUE,	COLOR_DEFAULT,	0), \
 LINE(PP_DATE,	   "Date:   ",		COLOR_YELLOW,	COLOR_DEFAULT,	0), \
 LINE(PP_ADATE,	   "AuthorDate: ",	COLOR_YELLOW,	COLOR_DEFAULT,	0), \
 LINE(PP_CDATE,	   "CommitDate: ",	COLOR_YELLOW,	COLOR_DEFAULT,	0), \
-/* Raw commit header */ \
 LINE(COMMIT,	   "commit ",		COLOR_GREEN,	COLOR_DEFAULT,	0), \
 LINE(PARENT,	   "parent ",		COLOR_BLUE,	COLOR_DEFAULT,	0), \
 LINE(TREE,	   "tree ",		COLOR_BLUE,	COLOR_DEFAULT,	0), \
 LINE(AUTHOR,	   "author ",		COLOR_CYAN,	COLOR_DEFAULT,	0), \
 LINE(COMMITTER,	   "committer ",	COLOR_MAGENTA,	COLOR_DEFAULT,	0), \
-/* Misc */ \
-LINE(DIFF_TREE,	   "diff-tree ",	COLOR_BLUE,	COLOR_DEFAULT,	0), \
 LINE(SIGNOFF,	   "    Signed-off-by", COLOR_YELLOW,	COLOR_DEFAULT,	0), \
-/* UI colors */ \
 LINE(DEFAULT,	   "",			COLOR_DEFAULT,	COLOR_DEFAULT,	A_NORMAL), \
 LINE(CURSOR,	   "",			COLOR_WHITE,	COLOR_GREEN,	A_BOLD), \
 LINE(STATUS,	   "",			COLOR_GREEN,	COLOR_DEFAULT,	0), \
@@ -567,7 +631,12 @@ LINE(MAIN_AUTHOR,  "",			COLOR_GREEN,	COLOR_DEFAULT,	0), \
 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(MAIN_REF,     "",			COLOR_CYAN,	COLOR_DEFAULT,	A_BOLD), \
+
+
+/*
+ * Line-oriented content detection.
+ */
 
 enum line_type {
 #define LINE(type, line, fg, bg, attr) \
@@ -577,6 +646,8 @@ enum line_type {
 };
 
 struct line_info {
+	const char *name;	/* Option name. */
+	int namelen;		/* Size of option name. */
 	const char *line;	/* The start of line to match. */
 	int linelen;		/* Size of string to match. */
 	int fg, bg, attr;	/* Color and text attributes for the lines. */
@@ -584,7 +655,7 @@ struct line_info {
 
 static struct line_info line_info[] = {
 #define LINE(type, line, fg, bg, attr) \
-	{ (line), STRING_SIZE(line), (fg), (bg), (attr) }
+	{ #type, STRING_SIZE(#type), (line), STRING_SIZE(line), (fg), (bg), (attr) }
 	LINE_INFO
 #undef	LINE
 };
@@ -611,6 +682,28 @@ get_line_attr(enum line_type type)
 	return COLOR_PAIR(type) | line_info[type].attr;
 }
 
+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))
+			return &line_info[type];
+
+	return NULL;
+}
+
 static void
 init_colors(void)
 {
@@ -640,6 +733,121 @@ struct line {
 };
 
 
+/*
+ * User config file handling.
+ */
+
+#define set_color(color, name, namelen) \
+	set_from_int_map(color_map, ARRAY_SIZE(color_map), color, name, namelen)
+
+#define set_attribute(attr, name, namelen) \
+	set_from_int_map(attr_map, ARRAY_SIZE(attr_map), attr, name, namelen)
+
+static int   config_lineno;
+static bool  config_errors;
+static char *config_msg;
+
+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;
+		}
+
+		value = chomp_string(value + valuelen);
+		valuelen = strcspn(value, " \t");
+		if (set_color(&info->fg, value, valuelen) == ERR) {
+			config_msg = "Unknown color";
+			return ERR;
+		}
+
+		value = chomp_string(value + valuelen);
+		valuelen = strcspn(value, " \t");
+		if (set_color(&info->bg, value, valuelen) == ERR) {
+			config_msg = "Unknown color";
+			return ERR;
+		}
+
+		value = chomp_string(value + valuelen);
+		if (*value &&
+		    set_attribute(&info->attr, value, strlen(value)) == ERR) {
+			config_msg = "Unknown attribute";
+			return ERR;
+		}
+
+		return OK;
+	}
+
+	return ERR;
+}
+
+static int
+read_option(char *opt, int optlen, char *value, int valuelen)
+{
+	config_lineno++;
+	config_msg = "Internal error";
+
+	optlen = strcspn(opt, "#;");
+	if (optlen == 0) {
+		/* The whole line is a commend or empty. */
+		return OK;
+
+	} 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;
+	}
+
+	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;
+	}
+
+	/* Always keep going if errors are encountered. */
+	return OK;
+}
+
+static int
+load_options(void)
+{
+	char *home = getenv("HOME");
+	char buf[1024];
+	FILE *file;
+
+	config_lineno = 0;
+	config_errors = FALSE;
+
+	if (!home ||
+	    snprintf(buf, sizeof(buf), "%s/.tigrc", home) >= sizeof(buf))
+		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
  * ----------
@@ -2389,7 +2597,7 @@ load_refs(void)
 	const char *cmd_env = getenv("TIG_LS_REMOTE");
 	const char *cmd = cmd_env && *cmd_env ? cmd_env : TIG_LS_REMOTE;
 
-	return read_properties(popen(cmd, "r"), '\t', read_ref);
+	return read_properties(popen(cmd, "r"), "\t", read_ref);
 }
 
 static int
@@ -2410,7 +2618,7 @@ load_repo_config(void)
 }
 
 static int
-read_properties(FILE *pipe, int separator,
+read_properties(FILE *pipe, const char *separators,
 		int (*read_property)(char *, int, char *, int))
 {
 	char buffer[BUFSIZ];
@@ -2421,27 +2629,24 @@ read_properties(FILE *pipe, int separator,
 		return ERR;
 
 	while (state == OK && (name = fgets(buffer, sizeof(buffer), pipe))) {
-		char *value = strchr(name, separator);
-		int namelen;
-		int valuelen;
+		char *value;
+		size_t namelen;
+		size_t valuelen;
 
-		if (value) {
-			namelen = value - name;
-			*value++ = 0;
+		name = chomp_string(name);
+		namelen = strcspn(name, separators);
+
+		if (name[namelen]) {
+			name[namelen] = 0;
+			value = chomp_string(name + namelen + 1);
 			valuelen = strlen(value);
-			if (valuelen > 0) {
-				valuelen--;
-				value[valuelen] = 0;
-			}
 
 		} else {
-			namelen = strlen(name);
 			value = "";
 			valuelen = 0;
 		}
 
-		if (namelen)
-			state = read_property(name, namelen, value, valuelen);
+		state = read_property(name, namelen, value, valuelen);
 	}
 
 	if (state != ERR && ferror(pipe))
@@ -2497,7 +2702,10 @@ main(int argc, char *argv[])
 
 	signal(SIGINT, quit);
 
-	/* Load the repo config file first so options can be overwritten from
+	if (load_options() == ERR)
+		die("Failed to load user config.");
+
+	/* Load the repo config file so options can be overwritten from
 	 * the command line.  */
 	if (load_repo_config() == ERR)
 		die("Failed to load repo config.");
@@ -2672,28 +2880,7 @@ main(int argc, char *argv[])
  *
  *	$ tig -- --all --since=1.week -- Makefile
  *
- * BUGS
- * ----
- * 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.
- *
- * - The cursor can wrap-around on the last line and cause the
- *   window to scroll.
- *
- * - The prompt doesn't work while loading.
- *
- * TODO
- * ----
- * Features that should be explored.
- *
- * - Searching.
- *
- * - Locale support.
+ * include::BUGS[]
  *
  * COPYRIGHT
  * ---------