X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=tig.c;h=6f4c03f6abd7fdb407e512a073bae48f44f542cd;hb=6b0f9d0419dfe7d93fe74d5c6f5ff3af105494a7;hp=51c84b8a936d713fbbd987764055c1f5dce9d7cd;hpb=c8af48119c23e9cc90bbc02b84cf6dca7400cdfc;p=tig.git diff --git a/tig.c b/tig.c index 51c84b8..6f4c03f 100644 --- a/tig.c +++ b/tig.c @@ -61,38 +61,21 @@ struct menu_item { static bool prompt_menu(const char *prompt, const struct menu_item *items, int *selected); -enum graphic { - GRAPHIC_ASCII = 0, - GRAPHIC_DEFAULT, - GRAPHIC_UTF_8 -}; +#define GRAPHIC_ENUM(_) \ + _(GRAPHIC, ASCII), \ + _(GRAPHIC, DEFAULT), \ + _(GRAPHIC, UTF_8) -static const struct enum_map graphic_map[] = { -#define GRAPHIC_(name) ENUM_MAP(#name, GRAPHIC_##name) - GRAPHIC_(ASCII), - GRAPHIC_(DEFAULT), - GRAPHIC_(UTF_8) -#undef GRAPHIC_ -}; +DEFINE_ENUM(graphic, GRAPHIC_ENUM); -#define DATE_INFO \ - DATE_(NO), \ - DATE_(DEFAULT), \ - DATE_(LOCAL), \ - DATE_(RELATIVE), \ - DATE_(SHORT) - -enum date { -#define DATE_(name) DATE_##name - DATE_INFO -#undef DATE_ -}; +#define DATE_ENUM(_) \ + _(DATE, NO), \ + _(DATE, DEFAULT), \ + _(DATE, LOCAL), \ + _(DATE, RELATIVE), \ + _(DATE, SHORT) -static const struct enum_map date_map[] = { -#define DATE_(name) ENUM_MAP(#name, DATE_##name) - DATE_INFO -#undef DATE_ -}; +DEFINE_ENUM(date, DATE_ENUM); struct time { time_t sec; @@ -154,23 +137,12 @@ mkdate(const struct time *time, enum date date) } -#define AUTHOR_VALUES \ - AUTHOR_(NO), \ - AUTHOR_(FULL), \ - AUTHOR_(ABBREVIATED) +#define AUTHOR_ENUM(_) \ + _(AUTHOR, NO), \ + _(AUTHOR, FULL), \ + _(AUTHOR, ABBREVIATED) -enum author { -#define AUTHOR_(name) AUTHOR_##name - AUTHOR_VALUES, -#undef AUTHOR_ - AUTHOR_DEFAULT = AUTHOR_FULL -}; - -static const struct enum_map author_map[] = { -#define AUTHOR_(name) ENUM_MAP(#name, AUTHOR_##name) - AUTHOR_VALUES -#undef AUTHOR_ -}; +DEFINE_ENUM(author, AUTHOR_ENUM); static const char * get_author_initials(const char *author) @@ -215,7 +187,7 @@ mkauthor(const char *text, int cols, enum author author) bool trim = author_trim(cols); bool abbreviate = author == AUTHOR_ABBREVIATED || !trim; - if (!author) + if (author == AUTHOR_NO) return ""; if (abbreviate && text) return get_author_initials(text); @@ -369,7 +341,7 @@ get_request(const char *name) /* Option and state variables. */ static enum graphic opt_line_graphics = GRAPHIC_DEFAULT; static enum date opt_date = DATE_DEFAULT; -static enum author opt_author = AUTHOR_DEFAULT; +static enum author opt_author = AUTHOR_FULL; static bool opt_rev_graph = TRUE; static bool opt_line_number = FALSE; static bool opt_show_refs = TRUE; @@ -659,40 +631,30 @@ static struct keybinding default_keybindings[] = { { 'e', REQ_EDIT }, }; -#define KEYMAP_INFO \ - KEYMAP_(GENERIC), \ - KEYMAP_(MAIN), \ - KEYMAP_(DIFF), \ - KEYMAP_(LOG), \ - KEYMAP_(TREE), \ - KEYMAP_(BLOB), \ - KEYMAP_(BLAME), \ - KEYMAP_(BRANCH), \ - KEYMAP_(PAGER), \ - KEYMAP_(HELP), \ - KEYMAP_(STATUS), \ - KEYMAP_(STAGE) - -enum keymap { -#define KEYMAP_(name) KEYMAP_##name - KEYMAP_INFO -#undef KEYMAP_ -}; +#define KEYMAP_ENUM(_) \ + _(KEYMAP, GENERIC), \ + _(KEYMAP, MAIN), \ + _(KEYMAP, DIFF), \ + _(KEYMAP, LOG), \ + _(KEYMAP, TREE), \ + _(KEYMAP, BLOB), \ + _(KEYMAP, BLAME), \ + _(KEYMAP, BRANCH), \ + _(KEYMAP, PAGER), \ + _(KEYMAP, HELP), \ + _(KEYMAP, STATUS), \ + _(KEYMAP, STAGE) -static const struct enum_map keymap_table[] = { -#define KEYMAP_(name) ENUM_MAP(#name, KEYMAP_##name) - KEYMAP_INFO -#undef KEYMAP_ -}; +DEFINE_ENUM(keymap, KEYMAP_ENUM); -#define set_keymap(map, name) map_enum(map, keymap_table, name) +#define set_keymap(map, name) map_enum(map, keymap_map, name) struct keybinding_table { struct keybinding *data; size_t size; }; -static struct keybinding_table keybindings[ARRAY_SIZE(keymap_table)]; +static struct keybinding_table keybindings[ARRAY_SIZE(keymap_map)]; static void add_keybinding(enum keymap keymap, enum request request, int key) @@ -1689,6 +1651,9 @@ draw_author(struct view *view, const char *author) bool trim = author_trim(opt_author_cols); const char *text = mkauthor(author, opt_author_cols, opt_author); + if (opt_author == AUTHOR_NO) + return FALSE; + return draw_field(view, LINE_AUTHOR, text, opt_author_cols, trim); } @@ -2755,6 +2720,7 @@ load_view(struct view *view, enum open_flags flags) } #define refresh_view(view) load_view(view, OPEN_REFRESH) +#define reload_view(view) load_view(view, OPEN_RELOAD) static void split_view(struct view *prev, struct view *view) @@ -3486,7 +3452,7 @@ static struct view_ops diff_ops = { * Help backend */ -static bool help_keymap_hidden[ARRAY_SIZE(keymap_table)]; +static bool help_keymap_hidden[ARRAY_SIZE(keymap_map)]; static bool help_open_keymap_title(struct view *view, enum keymap keymap) @@ -3495,7 +3461,7 @@ help_open_keymap_title(struct view *view, enum keymap keymap) line = add_line_format(view, LINE_HELP_KEYMAP, "[%c] %s bindings", help_keymap_hidden[keymap] ? '+' : '-', - enum_name(keymap_table[keymap])); + enum_name(keymap_map[keymap])); if (line) line->other = keymap; @@ -3578,7 +3544,7 @@ help_open(struct view *view, enum open_flags flags) add_line_text(view, "Quick reference for tig keybindings:", LINE_DEFAULT); add_line_text(view, "", LINE_DEFAULT); - for (keymap = 0; keymap < ARRAY_SIZE(keymap_table); keymap++) + for (keymap = 0; keymap < ARRAY_SIZE(keymap_map); keymap++) help_open_keymap(view, keymap); return TRUE; @@ -4013,7 +3979,7 @@ tree_grep(struct view *view, struct line *line) struct tree_entry *entry = line->data; const char *text[] = { entry->name, - opt_author ? entry->author : "", + mkauthor(entry->author, opt_author_cols, opt_author), mkdate(&entry->time, opt_date), NULL }; @@ -4159,11 +4125,10 @@ blame_open(struct view *view, enum open_flags flags) if (*opt_ref || !begin_update(view, opt_cdup, file_argv, flags)) { const char *blame_cat_file_argv[] = { - "git", "cat-file", "blob", path, NULL + "git", "cat-file", "blob", "%(ref):%(file)", NULL }; - if (!string_format(path, "%s:%s", opt_ref, opt_file) || - !begin_update(view, opt_cdup, blame_cat_file_argv, flags)) + if (!begin_update(view, opt_cdup, blame_cat_file_argv, flags)) return FALSE; } @@ -4462,7 +4427,7 @@ blame_request(struct view *view, enum request request, struct line *line) string_copy(opt_file, blame->commit->filename); if (blame->lineno) view->lineno = blame->lineno; - refresh_view(view); + reload_view(view); } break; @@ -4475,7 +4440,7 @@ blame_request(struct view *view, enum request request, struct line *line) string_copy_rev(opt_ref, blame->commit->parent_id); string_copy(opt_file, blame->commit->parent_filename); setup_blame_parent_line(view, blame); - refresh_view(view); + reload_view(view); } break; @@ -4728,7 +4693,7 @@ branch_grep(struct view *view, struct line *line) struct branch *branch = line->data; const char *text[] = { branch->ref->name, - branch->author, + mkauthor(branch->author, opt_author_cols, opt_author), NULL }; @@ -5982,7 +5947,7 @@ main_grep(struct view *view, struct line *line) struct commit *commit = line->data; const char *text[] = { commit->title, - opt_author ? commit->author : "", + mkauthor(commit->author, opt_author_cols, opt_author), mkdate(&commit->time, opt_date), NULL };