![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index cad66c8e6e20d85fe8f84eb262e007c7e2112dc7..86be4a2973615219fb321863eaa648e73210a8b6 100644 (file)
--- a/tig.c
+++ b/tig.c
static void __NORETURN die(const char *err, ...);
static void warn(const char *msg, ...);
static void report(const char *msg, ...);
-static size_t utf8_length(const char **start, size_t skip, int *width, size_t max_width, int *trimmed, bool reserve, int tab_size);
-static inline unsigned char utf8_char_length(const char *string, const char *end);
#define ABS(x) ((x) >= 0 ? (x) : -(x))
#define MIN(x, y) ((x) < (y) ? (x) : (y))
enum format_flags {
FORMAT_ALL, /* Perform replacement in all arguments. */
- FORMAT_DASH, /* Perform replacement up until "--". */
FORMAT_NONE /* No replacement should be performed. */
};
}
+/*
+ * 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 UTF-8 branch commit elinks-0.11.0-g31f2c28.
+ */
+
+static inline int
+unicode_width(unsigned long c, int tab_size)
+{
+ 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;
+
+ if (c == '\t')
+ return tab_size;
+
+ 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,
+};
+
+static inline unsigned char
+utf8_char_length(const char *string, const char *end)
+{
+ int c = *(unsigned char *) string;
+
+ return utf8_bytes[c];
+}
+
+/* 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:
+ return 0;
+ }
+
+ /* 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. If the reserve flag is TRUE, it will reserve at least one
+ * trailing character, which can be useful when drawing a delimiter.
+ *
+ * Returns the number of bytes to output from string to satisfy max_width. */
+static size_t
+utf8_length(const char **start, size_t skip, int *width, size_t max_width, int *trimmed, bool reserve, int tab_size)
+{
+ const char *string = *start;
+ const char *end = strchr(string, '\0');
+ unsigned char last_bytes = 0;
+ size_t last_ucwidth = 0;
+
+ *width = 0;
+ *trimmed = 0;
+
+ while (string < end) {
+ unsigned char bytes = utf8_char_length(string, end);
+ 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, tab_size);
+ if (skip > 0) {
+ skip -= ucwidth <= skip ? ucwidth : skip;
+ *start += bytes;
+ }
+ *width += ucwidth;
+ if (*width > max_width) {
+ *trimmed = 1;
+ *width -= ucwidth;
+ if (reserve && *width == max_width) {
+ string -= last_bytes;
+ *width -= last_ucwidth;
+ }
+ break;
+ }
+
+ string += bytes;
+ last_bytes = ucwidth ? bytes : 0;
+ last_ucwidth = ucwidth;
+ }
+
+ return string - *start;
+}
+
+
#define DATE_INFO \
DATE_(NO), \
DATE_(DEFAULT), \
+ DATE_(LOCAL), \
DATE_(RELATIVE), \
DATE_(SHORT)
}
}
- gmtime_r(&time->sec, &tm);
+ if (date == DATE_LOCAL) {
+ time_t date = time->sec + time->tz;
+ localtime_r(&date, &tm);
+ }
+ else {
+ gmtime_r(&time->sec, &tm);
+ }
return strftime(buf, sizeof(buf), DATE_FORMAT, &tm) ? buf : NULL;
}
return *argc < SIZEOF_ARG;
}
-static void
+static bool
argv_from_env(const char **argv, const char *name)
{
char *env = argv ? getenv(name) : NULL;
if (env && *env)
env = strdup(env);
- if (env && !argv_from_string(argv, &argc, env))
- die("Too many arguments in the `%s` environment variable", name);
+ return !env || argv_from_string(argv, &argc, env);
+}
+
+static void
+argv_free(const char *argv[])
+{
+ int argc;
+
+ for (argc = 0; argv[argc]; argc++)
+ free((void *) argv[argc]);
+ argv[0] = NULL;
+}
+
+static bool
+argv_copy(const char *dst[], const char *src[], bool allocate)
+{
+ int argc;
+
+ for (argc = 0; src[argc]; argc++)
+ if (!(dst[argc] = allocate ? strdup(src[argc]) : src[argc]))
+ return FALSE;
+ return TRUE;
}
io->dir = dir;
}
-static bool
-io_format(struct io *io, const char *dir, enum io_type type,
- const char *argv[], enum format_flags flags)
+static void
+io_prepare(struct io *io, const char *dir, enum io_type type, const char *argv[])
{
io_init(io, dir, type);
- return format_argv(io->argv, argv, flags);
+ argv_copy(io->argv, argv, FALSE);
}
static bool
static bool
io_run(struct io *io, const char **argv, const char *dir, enum io_type type)
{
- io_init(io, dir, type);
- if (!format_argv(io->argv, argv, FORMAT_NONE))
- return FALSE;
+ io_prepare(io, dir, type, argv);
return io_start(io);
}
-static int
-io_complete(struct io *io)
-{
- return io_start(io) && io_done(io);
-}
-
-static int
-io_run_bg(const char **argv)
+static bool
+io_complete(enum io_type type, const char **argv, const char *dir, int fd)
{
struct io io = {};
- if (!io_format(&io, NULL, IO_BG, argv, FORMAT_NONE))
- return FALSE;
- return io_complete(&io);
+ io_prepare(&io, dir, type, argv);
+ io.pipe = fd;
+ return io_start(&io) && io_done(&io);
}
static bool
-io_run_fg(const char **argv, const char *dir)
+io_run_bg(const char **argv)
{
- struct io io = {};
-
- if (!io_format(&io, dir, IO_FG, argv, FORMAT_NONE))
- return FALSE;
- return io_complete(&io);
+ return io_complete(IO_BG, argv, NULL, -1);
}
static bool
-io_run_append(const char **argv, enum format_flags flags, int fd)
+io_run_fg(const char **argv, const char *dir)
{
- struct io io = {};
-
- if (!io_format(&io, NULL, IO_AP, argv, flags)) {
- close(fd);
- return FALSE;
- }
-
- io.pipe = fd;
- return io_complete(&io);
+ return io_complete(IO_FG, argv, dir, -1);
}
static bool
-io_run_rd(struct io *io, const char **argv, const char *dir, enum format_flags flags)
+io_run_append(const char **argv, int fd)
{
- return io_format(io, dir, IO_RD, argv, flags) && io_start(io);
+ return io_complete(IO_AP, argv, NULL, -1);
}
static bool
{
struct io io = {};
- return io_run_rd(&io, argv, NULL, FORMAT_NONE)
- && io_read_buf(&io, buf, bufsize);
+ io_prepare(&io, NULL, IO_RD, argv);
+ return io_start(&io) && io_read_buf(&io, buf, bufsize);
}
static int
{
struct io io = {};
- return io_format(&io, NULL, IO_RD, argv, FORMAT_NONE)
- ? io_load(&io, separators, read_property) : ERR;
+ io_prepare(&io, NULL, IO_RD, argv);
+ return io_load(&io, separators, read_property);
}
#define REQ_(req, help) REQ_##req
/* Offset all requests to avoid conflicts with ncurses getch values. */
- REQ_OFFSET = KEY_MAX + 1,
+ REQ_UNKNOWN = KEY_MAX + 1,
+ REQ_OFFSET,
REQ_INFO
#undef REQ_GROUP
if (enum_equals(req_info[i], name, namelen))
return req_info[i].request;
- return REQ_NONE;
+ return REQ_UNKNOWN;
}
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(TESTED, " Tested-by", COLOR_YELLOW, COLOR_DEFAULT, 0), \
+LINE(REVIEWED, " Reviewed-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), \
enum request request;
};
-static const struct keybinding default_keybindings[] = {
+static struct keybinding default_keybindings[] = {
/* View switching */
{ 'm', REQ_VIEW_MAIN },
{ 'd', REQ_VIEW_DIFF },
add_keybinding(enum keymap keymap, enum request request, int key)
{
struct keybinding_table *table = &keybindings[keymap];
+ size_t i;
+
+ for (i = 0; i < keybindings[keymap].size; i++) {
+ if (keybindings[keymap].data[i].alias == key) {
+ keybindings[keymap].data[i].request = request;
+ return;
+ }
+ }
table->data = realloc(table->data, (table->size + 1) * sizeof(*table->data));
if (!table->data)
die("Failed to allocate keybinding");
table->data[table->size].alias = key;
table->data[table->size++].request = request;
+
+ if (request == REQ_NONE && keymap == KEYMAP_GENERIC) {
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(default_keybindings); i++)
+ if (default_keybindings[i].alias == key)
+ default_keybindings[i].request = REQ_NONE;
+ }
}
/* Looks for a key binding first in the given map, then in the generic map, and
req->key = key;
req->argv[0] = NULL;
- if (!format_argv(req->argv, argv, FORMAT_NONE))
+ if (!argv_copy(req->argv, argv, TRUE))
return REQ_NONE;
return REQ_NONE + ++run_requests;
add_builtin_run_requests(void)
{
const char *cherry_pick[] = { "git", "cherry-pick", "%(commit)", NULL };
+ const char *checkout[] = { "git", "checkout", "%(branch)", NULL };
const char *commit[] = { "git", "commit", NULL };
const char *gc[] = { "git", "gc", NULL };
struct {
} reqs[] = {
{ KEYMAP_MAIN, 'C', ARRAY_SIZE(cherry_pick) - 1, cherry_pick },
{ KEYMAP_STATUS, 'C', ARRAY_SIZE(commit) - 1, commit },
+ { KEYMAP_BRANCH, 'C', ARRAY_SIZE(checkout) - 1, checkout },
{ KEYMAP_GENERIC, 'G', ARRAY_SIZE(gc) - 1, gc },
};
int i;
for (i = 0; i < ARRAY_SIZE(reqs); i++) {
- enum request req;
+ enum request req = get_keybinding(reqs[i].keymap, reqs[i].key);
+ if (req != reqs[i].key)
+ continue;
req = add_run_request(reqs[i].keymap, reqs[i].key, reqs[i].argc, reqs[i].argv);
if (req != REQ_NONE)
add_keybinding(reqs[i].keymap, req, reqs[i].key);
return ERR;
}
- if (set_keymap(&keymap, argv[0]) == ERR) {
+ if (!set_keymap(&keymap, argv[0])) {
config_msg = "Unknown key map";
return ERR;
}
}
request = get_request(argv[2]);
- if (request == REQ_NONE) {
+ if (request == REQ_UNKNOWN) {
static const struct enum_map obsolete[] = {
ENUM_MAP("cherry-pick", REQ_NONE),
ENUM_MAP("screen-resize", REQ_NONE),
return ERR;
}
}
- if (request == REQ_NONE && *argv[2]++ == '!')
+ if (request == REQ_UNKNOWN && *argv[2]++ == '!')
request = add_run_request(keymap, key, argc - 2, argv + 2);
- if (request == REQ_NONE) {
+ if (request == REQ_UNKNOWN) {
config_msg = "Unknown request name";
return ERR;
}
const char *tigrc_system = getenv("TIGRC_SYSTEM");
char buf[SIZEOF_STR];
- add_builtin_run_requests();
-
if (!tigrc_system)
tigrc_system = SYSCONFDIR "/tigrc";
load_option_file(tigrc_system);
}
load_option_file(tigrc_user);
+ /* Add _after_ loading config files to avoid adding run requests
+ * that conflict with keybindings. */
+ add_builtin_run_requests();
+
return OK;
}
static char ref_blob[SIZEOF_REF] = "";
static char ref_commit[SIZEOF_REF] = "HEAD";
static char ref_head[SIZEOF_REF] = "HEAD";
+static char ref_branch[SIZEOF_REF] = "";
+
+enum view_type {
+ VIEW_MAIN,
+ VIEW_DIFF,
+ VIEW_LOG,
+ VIEW_TREE,
+ VIEW_BLOB,
+ VIEW_BLAME,
+ VIEW_BRANCH,
+ VIEW_HELP,
+ VIEW_PAGER,
+ VIEW_STATUS,
+ VIEW_STAGE,
+};
struct view {
+ enum view_type type; /* View type */
const char *name; /* View name */
const char *cmd_env; /* Command line set via environment */
const char *id; /* Points to either of ref_{head,commit,blob} */
/* 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;
+ struct view *prev;
/* Buffering */
size_t lines; /* Total number of lines */
static struct view_ops tree_ops;
static struct view_ops branch_ops;
-#define VIEW_STR(name, env, ref, ops, map, git) \
- { name, #env, ref, ops, map, git }
+#define VIEW_STR(type, name, env, ref, ops, map, git) \
+ { type, name, #env, ref, ops, map, git }
#define VIEW_(id, name, ops, git, ref) \
- VIEW_STR(name, TIG_##id##_CMD, ref, ops, KEYMAP_##id, git)
-
+ VIEW_STR(VIEW_##id, name, TIG_##id##_CMD, ref, ops, KEYMAP_##id, git)
static struct view views[] = {
VIEW_(MAIN, "main", &main_ops, TRUE, ref_head),
};
#define VIEW(req) (&views[(req) - REQ_OFFSET - 1])
-#define VIEW_REQ(view) ((view) - views + 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 enum request
+view_request(struct view *view, enum request request)
+{
+ if (!view || !view->lines)
+ return request;
+ return view->ops->request(view, request, &view->line[view->lineno]);
+}
+
+
+/*
+ * View drawing.
+ */
static inline void
set_view_attr(struct view *view, enum line_type type)
assert(view_is_displayed(view));
- if (view != VIEW(REQ_VIEW_STATUS) && view->lines) {
+ if (view->type != VIEW_STATUS && view->lines) {
unsigned int view_lines = view->offset + view->height;
unsigned int lines = view->lines
? MIN(view_lines, view->lines) * 100 / view->lines
}
}
+
+/*
+ * Option management
+ */
+
static void
toggle_enum_option_do(unsigned int *opt, const char *help,
const struct enum_map *map, size_t size)
view->update_secs = 0;
}
-static void
-free_argv(const char *argv[])
-{
- int argc;
-
- for (argc = 0; argv[argc]; argc++)
- free((void *) argv[argc]);
-}
-
static const char *
format_arg(const char *name)
{
FORMAT_VAR("%(head)", ref_head, ""),
FORMAT_VAR("%(commit)", ref_commit, ""),
FORMAT_VAR("%(blob)", ref_blob, ""),
+ FORMAT_VAR("%(branch)", ref_branch, ""),
};
int i;
if (!strncmp(name, vars[i].name, vars[i].namelen))
return *vars[i].value ? vars[i].value : vars[i].value_if_empty;
+ report("Unknown replacement: `%s`", name);
return NULL;
}
@@ -2972,7 +3185,7 @@ format_argv(const char *dst_argv[], const char *src_argv[], enum format_flags fl
int argc;
bool noreplace = flags == FORMAT_NONE;
- free_argv(dst_argv);
+ argv_free(dst_argv);
for (argc = 0; src_argv[argc]; argc++) {
const char *arg = src_argv[argc];
@@ -2984,8 +3197,6 @@ format_argv(const char *dst_argv[], const char *src_argv[], enum format_flags fl
const char *value;
if (!next || noreplace) {
- if (flags == FORMAT_DASH && !strcmp(arg, "--"))
- noreplace = TRUE;
len = strlen(arg);
value = "";
@@ -2993,7 +3204,6 @@ format_argv(const char *dst_argv[], const char *src_argv[], enum format_flags fl
value = format_arg(next);
if (!value) {
- report("Unknown replacement: `%s`", next);
return FALSE;
}
}
}
static bool
-prepare_update(struct view *view, const char *argv[], const char *dir,
- enum format_flags flags)
+prepare_io(struct view *view, const char *dir, const char *argv[], bool replace)
+{
+ io_init(&view->io, dir, IO_RD);
+ return format_argv(view->io.argv, argv, replace ? FORMAT_ALL : FORMAT_NONE);
+}
+
+static bool
+prepare_update(struct view *view, const char *argv[], const char *dir)
{
if (view->pipe)
end_update(view, TRUE);
- return io_format(&view->io, dir, IO_RD, argv, flags);
+ return prepare_io(view, dir, argv, FALSE);
+}
+
+static bool
+start_update(struct view *view, const char **argv, const char *dir)
+{
+ if (view->pipe)
+ io_done(view->pipe);
+ return prepare_io(view, dir, argv, FALSE) &&
+ io_start(&view->io);
}
static bool
if (view->ops->prepare) {
if (!view->ops->prepare(view))
return FALSE;
- } else if (!io_format(&view->io, NULL, IO_RD, view->ops->argv, FORMAT_ALL)) {
+ } else if (!prepare_io(view, NULL, view->ops->argv, TRUE)) {
return FALSE;
}
/* Keep the displayed view in sync with line number scaling. */
if (digits != view->digits) {
view->digits = digits;
- if (opt_line_number || view == VIEW(REQ_VIEW_BLAME))
+ if (opt_line_number || view->type == VIEW_BLAME)
redraw = TRUE;
}
}
end_update(view, TRUE);
} else if (io_eof(view->pipe)) {
- report("");
+ if (view_is_displayed(view))
+ report("");
end_update(view, FALSE);
}
if (split) {
display[1] = view;
current_view = 1;
+ view->parent = prev;
} else if (!nomaximize) {
/* Maximize the current view. */
memset(display, 0, sizeof(display));
display[current_view] = view;
}
- /* No parent signals that this is the first loaded view. */
+ /* No prev signals that this is the first loaded view. */
if (prev && view != prev) {
- view->parent = prev;
+ view->prev = prev;
}
/* Resize the view when switching between split- and full-screen,
if (format_argv(argv, req->argv, FORMAT_ALL))
open_external_viewer(argv, NULL);
- free_argv(argv);
+ argv_free(argv);
}
/*
if (request > REQ_NONE) {
open_run_request(request);
- /* FIXME: When all views can refresh always do this. */
- if (view == VIEW(REQ_VIEW_STATUS) ||
- view == VIEW(REQ_VIEW_MAIN) ||
- view == VIEW(REQ_VIEW_LOG) ||
- view == VIEW(REQ_VIEW_BRANCH) ||
- view == VIEW(REQ_VIEW_STAGE))
- request = REQ_REFRESH;
- else
- return TRUE;
+ view_request(view, REQ_REFRESH);
+ return TRUE;
}
- if (view && view->lines) {
- request = view->ops->request(view, request, &view->line[view->lineno]);
- if (request == REQ_NONE)
- return TRUE;
- }
+ request = view_request(view, request);
+ if (request == REQ_NONE)
+ return TRUE;
switch (request) {
case REQ_MOVE_UP:
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)) ||
- (view == VIEW(REQ_VIEW_DIFF) &&
- view->parent == VIEW(REQ_VIEW_BLAME)) ||
- (view == VIEW(REQ_VIEW_STAGE) &&
- view->parent == VIEW(REQ_VIEW_STATUS)) ||
- (view == VIEW(REQ_VIEW_BLOB) &&
- view->parent == VIEW(REQ_VIEW_TREE)) ||
- (view == VIEW(REQ_VIEW_MAIN) &&
- view->parent == VIEW(REQ_VIEW_BRANCH))) {
+ if (view->parent) {
int line;
view = view->parent;
if (view_is_displayed(view))
update_view_title(view);
if (line != view->lineno)
- view->ops->request(view, REQ_ENTER,
- &view->line[view->lineno]);
-
+ view_request(view, REQ_ENTER);
} else {
move_view(view, request);
}
break;
case REQ_STOP_LOADING:
- for (i = 0; i < ARRAY_SIZE(views); i++) {
- view = &views[i];
+ foreach_view(view, i) {
if (view->pipe)
report("Stopped loading the %s view", view->name),
end_update(view, TRUE);
break;
case REQ_VIEW_CLOSE:
- /* XXX: Mark closed views by letting view->parent point to the
+ /* XXX: Mark closed views by letting view->prev point to the
* view itself. Parents to closed view should never be
* followed. */
- if (view->parent &&
- view->parent->parent != view->parent) {
- maximize_view(view->parent);
- view->parent = view;
+ if (view->prev && view->prev != view) {
+ maximize_view(view->prev);
+ view->prev = view;
break;
}
/* Fall-through */
tz = ('0' - zone[1]) * 60 * 60 * 10;
tz += ('0' - zone[2]) * 60 * 60;
- tz += ('0' - zone[3]) * 60;
- tz += ('0' - zone[4]);
+ tz += ('0' - zone[3]) * 60 * 10;
+ tz += ('0' - zone[4]) * 60;
if (zone[0] == '-')
tz = -tz;
return FALSE;
}
- if (parents > 1 && !open_commit_parent_menu(buf, &parents))
+ if (parents == 1)
+ parents = 0;
+ else if (!open_commit_parent_menu(buf, &parents))
return FALSE;
string_copy_rev(rev, &buf[41 * parents]);
list = get_ref_list(commit_id);
if (!list) {
- if (view == VIEW(REQ_VIEW_DIFF))
+ if (view->type == VIEW_DIFF)
goto try_add_describe_ref;
return;
}
is_tag = TRUE;
}
- if (!is_tag && view == VIEW(REQ_VIEW_DIFF)) {
+ if (!is_tag && view->type == VIEW_DIFF) {
try_add_describe_ref:
/* Add <tag>-g<commit_id> "fake" reference. */
if (!add_describe_ref(buf, &bufpos, commit_id, sep))
return FALSE;
if (line->type == LINE_COMMIT &&
- (view == VIEW(REQ_VIEW_DIFF) ||
- view == VIEW(REQ_VIEW_LOG)))
+ (view->type == VIEW_DIFF ||
+ view->type == VIEW_LOG))
add_pager_refs(view, line);
return TRUE;
return request;
if (line->type == LINE_COMMIT &&
- (view == VIEW(REQ_VIEW_LOG) ||
- view == VIEW(REQ_VIEW_PAGER))) {
+ (view->type == VIEW_LOG ||
+ view->type == VIEW_PAGER)) {
open_view(view, REQ_VIEW_DIFF, OPEN_SPLIT);
split = 1;
}
if (line->type == LINE_COMMIT) {
char *text = (char *)line->data + STRING_SIZE("commit ");
- if (view != VIEW(REQ_VIEW_PAGER))
+ if (view->type != VIEW_PAGER)
string_copy_rev(view->ref, text);
string_copy_rev(ref_commit, text);
}
"git", "log", "--no-color", "--pretty=raw",
"--cc", "--raw", view->id, "--", path, NULL
};
- struct io io = {};
if (!view->lines) {
tree_entry(view, LINE_TREE_HEAD, opt_path, NULL, NULL);
return TRUE;
}
- if (!io_run_rd(&io, log_file, opt_cdup, FORMAT_NONE)) {
+ if (!start_update(view, log_file, opt_cdup)) {
report("Failed to load tree data");
return TRUE;
}
- io_done(view->pipe);
- view->io = io;
*read_date = TRUE;
return FALSE;
}
static void
-open_blob_editor()
+open_blob_editor(const char *id)
{
+ const char *blob_argv[] = { "git", "cat-file", "blob", id, NULL };
char file[SIZEOF_STR] = "/tmp/tigblob.XXXXXX";
int fd = mkstemp(file);
if (fd == -1)
report("Failed to create temporary file");
- else if (!io_run_append(blob_ops.argv, FORMAT_ALL, fd))
+ else if (!io_run_append(blob_argv, fd))
report("Failed to save blob data to file");
else
open_editor(file);
tree_request(struct view *view, enum request request, struct line *line)
{
enum open_flags flags;
+ struct tree_entry *entry = line->data;
switch (request) {
case REQ_VIEW_BLAME:
if (line->type != LINE_TREE_FILE) {
report("Edit only supported for files");
} else if (!is_head_commit(view->vid)) {
- open_blob_editor();
+ open_blob_editor(entry->id);
} else {
open_editor(opt_file);
}
break;
case LINE_TREE_FILE:
- flags = display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT;
+ flags = view_is_displayed(view) ? OPEN_SPLIT : OPEN_DEFAULT;
request = REQ_VIEW_BLOB;
break;
opt_path[0] = 0;
}
- return io_format(&view->io, opt_cdup, IO_RD, view->ops->argv, FORMAT_ALL);
+ return prepare_io(view, opt_cdup, view->ops->argv, TRUE);
}
static const char *tree_argv[SIZEOF_ARG] = {
{
switch (request) {
case REQ_EDIT:
- open_blob_editor();
+ open_blob_editor(view->vid);
return REQ_NONE;
default:
return pager_request(view, request, line);
* reading output from git-blame.
*/
-static const char *blame_head_argv[] = {
- "git", "blame", "--incremental", "--", "%(file)", NULL
-};
-
-static const char *blame_ref_argv[] = {
- "git", "blame", "--incremental", "%(ref)", "--", "%(file)", NULL
-};
-
-static const char *blame_cat_file_argv[] = {
- "git", "cat-file", "blob", "%(ref):%(file)", NULL
-};
-
struct blame_commit {
char id[SIZEOF_REV]; /* SHA1 ID. */
char title[128]; /* First line of the commit message. */
{
char path[SIZEOF_STR];
- if (!view->parent && *opt_prefix) {
+ if (!view->prev && *opt_prefix) {
string_copy(path, opt_file);
if (!string_format(opt_file, "%s%s", opt_prefix, path))
return FALSE;
}
if (*opt_ref || !io_open(&view->io, "%s%s", opt_cdup, opt_file)) {
- if (!io_run_rd(&view->io, blame_cat_file_argv, opt_cdup, FORMAT_ALL))
+ const char *blame_cat_file_argv[] = {
+ "git", "cat-file", "blob", path, NULL
+ };
+
+ if (!string_format(path, "%s:%s", opt_ref, opt_file) ||
+ !start_update(view, blame_cat_file_argv, opt_cdup))
return FALSE;
}
blame_read_file(struct view *view, const char *line, bool *read_file)
{
if (!line) {
- const char **argv = *opt_ref ? blame_ref_argv : blame_head_argv;
- struct io io = {};
+ const char *blame_argv[] = {
+ "git", "blame", "--incremental",
+ *opt_ref ? opt_ref : "--incremental", "--", opt_file, NULL
+ };
- if (view->lines == 0 && !view->parent)
+ if (view->lines == 0 && !view->prev)
die("No blame exist for %s", view->vid);
- if (view->lines == 0 || !io_run_rd(&io, argv, opt_cdup, FORMAT_ALL)) {
+ if (view->lines == 0 || !start_update(view, blame_argv, opt_cdup)) {
report("Failed to load blame data");
return TRUE;
}
- io_done(view->pipe);
- view->io = io;
*read_file = FALSE;
return FALSE;
static enum request
blame_request(struct view *view, enum request request, struct line *line)
{
- enum open_flags flags = display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT;
+ enum open_flags flags = view_is_displayed(view) ? OPEN_SPLIT : OPEN_DEFAULT;
struct blame *blame = line->data;
switch (request) {
diff_index_argv[7] = "/dev/null";
}
- if (!prepare_update(diff, diff_index_argv, NULL, FORMAT_DASH)) {
+ if (!prepare_update(diff, diff_index_argv, NULL)) {
report("Failed to allocate diff command");
break;
}
};
struct view *main_view = VIEW(REQ_VIEW_MAIN);
- if (!prepare_update(main_view, all_branches_argv, NULL, FORMAT_NONE)) {
+ if (!prepare_update(main_view, all_branches_argv, NULL)) {
report("Failed to load view of all branches");
return REQ_NONE;
}
"--simplify-by-decoration", "--all", NULL
};
- if (!io_run_rd(&view->io, branch_log, NULL, FORMAT_NONE)) {
+ if (!start_update(view, branch_log, NULL)) {
report("Failed to load branch data");
return TRUE;
}
string_copy_rev(view->ref, branch->ref->id);
string_copy_rev(ref_commit, branch->ref->id);
string_copy_rev(ref_head, branch->ref->id);
+ string_copy_rev(ref_branch, branch->ref->name);
}
static struct view_ops branch_ops = {
"--", "/dev/null", newpath, NULL
};
- if (!prepare_update(stage, no_head_diff_argv, opt_cdup, FORMAT_DASH))
+ if (!prepare_update(stage, no_head_diff_argv, opt_cdup))
return status_load_error(view, stage, newpath);
} else {
const char *index_show_argv[] = {
oldpath, newpath, NULL
};
- if (!prepare_update(stage, index_show_argv, opt_cdup, FORMAT_DASH))
+ if (!prepare_update(stage, index_show_argv, opt_cdup))
return status_load_error(view, stage, newpath);
}
"-C", "-M", "--", oldpath, newpath, NULL
};
- if (!prepare_update(stage, files_show_argv, opt_cdup, FORMAT_DASH))
+ if (!prepare_update(stage, files_show_argv, opt_cdup))
return status_load_error(view, stage, newpath);
if (status)
info = "Unstaged changes to %s";
die("line type %d not handled in switch", line->type);
}
- split = view_is_displayed(view) ? OPEN_SPLIT : 0;
+ split = view_is_displayed(view) ? OPEN_SPLIT : OPEN_DEFAULT;
open_view(view, REQ_VIEW_STAGE, OPEN_PREPARED | split);
if (view_is_displayed(VIEW(REQ_VIEW_STAGE))) {
if (status) {
if (!line) {
int i;
- if (!view->lines && !view->parent)
+ if (!view->lines && !view->prev)
die("No revisions match the given arguments.");
if (view->lines > 0) {
commit = view->line[view->lines - 1].data;
static enum request
main_request(struct view *view, enum request request, struct line *line)
{
- enum open_flags flags = display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT;
+ enum open_flags flags = view_is_displayed(view) ? OPEN_SPLIT : OPEN_DEFAULT;
switch (request) {
case REQ_ENTER:
};
-/*
- * 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 UTF-8 branch commit elinks-0.11.0-g31f2c28.
- */
-
-static inline int
-unicode_width(unsigned long c, int tab_size)
-{
- 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;
-
- if (c == '\t')
- return tab_size;
-
- 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,
-};
-
-static inline unsigned char
-utf8_char_length(const char *string, const char *end)
-{
- int c = *(unsigned char *) string;
-
- return utf8_bytes[c];
-}
-
-/* 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. If the reserve flag is TRUE, it will reserve at least one
- * trailing character, which can be useful when drawing a delimiter.
- *
- * Returns the number of bytes to output from string to satisfy max_width. */
-static size_t
-utf8_length(const char **start, size_t skip, int *width, size_t max_width, int *trimmed, bool reserve, int tab_size)
-{
- const char *string = *start;
- const char *end = strchr(string, '\0');
- unsigned char last_bytes = 0;
- size_t last_ucwidth = 0;
-
- *width = 0;
- *trimmed = 0;
-
- while (string < end) {
- unsigned char bytes = utf8_char_length(string, end);
- 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, tab_size);
- if (skip > 0) {
- skip -= ucwidth <= skip ? ucwidth : skip;
- *start += bytes;
- }
- *width += ucwidth;
- if (*width > max_width) {
- *trimmed = 1;
- *width -= ucwidth;
- if (reserve && *width == max_width) {
- string -= last_bytes;
- *width -= last_ucwidth;
- }
- break;
- }
-
- string += bytes;
- last_bytes = ucwidth ? bytes : 0;
- last_ucwidth = ucwidth;
- }
-
- return string - *start;
-}
-
-
/*
* Status management
*/
size_t i;
if (!init) {
- argv_from_env(ls_remote_argv, "TIG_LS_REMOTE");
+ if (!argv_from_env(ls_remote_argv, "TIG_LS_REMOTE"))
+ die("TIG_LS_REMOTE contains too many arguments");
init = TRUE;
}
die("command too long");
}
- if (!prepare_update(VIEW(request), custom_argv, NULL, FORMAT_NONE))
+ if (!prepare_update(VIEW(request), custom_argv, NULL))
die("Failed to format arguments");
return request;
die("Failed to load refs.");
foreach_view (view, i)
- argv_from_env(view->ops->argv, view->cmd_env);
+ if (!argv_from_env(view->ops->argv, view->cmd_env))
+ die("Too many arguments in the `%s` environment variable",
+ view->cmd_env);
init_display();
/* Some low-level request handling. This keeps access to
* status_win restricted. */
switch (request) {
+ case REQ_NONE:
+ report("Unknown key, press %s for help",
+ get_key(view->keymap, REQ_VIEW_HELP));
+ break;
case REQ_PROMPT:
{
char *cmd = read_prompt(":");
if (!argv_from_string(argv, &argc, cmd)) {
report("Too many arguments");
- } else if (!prepare_update(next, argv, NULL, FORMAT_DASH)) {
+ } else if (!prepare_update(next, argv, NULL)) {
report("Failed to format command");
} else {
open_view(view, REQ_VIEW_PAGER, OPEN_PREPARED);