Use view_is_displayed when figuring setting up the open flags

[tig.git] / tig.c

diff --git a/tig.c b/tig.c
index 7eb9f71b6827036fea61d811fedd0296d0a7dc28..a31d18eb23bd1213610bc94fe78f09e2836bff8d 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -1279,6 +1279,8 @@ LINE(AUTHOR,         "author ",           COLOR_GREEN,    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(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), \
@@ -1522,6 +1524,14 @@ static void
 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)
@@ -2229,6 +2239,7 @@ struct view {
        /* 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 */
@@ -2309,8 +2320,10 @@ static struct view views[] = {
 #define view_is_displayed(view) \
        (view == display[0] || view == display[1])
 
-#define view_has_parent(view, child_type, parent_type) \
-       (view->type == child_type && view->parent && view->parent->type == parent_type)
+
+/*
+ * View drawing.
+ */
 
 static inline void
 set_view_attr(struct view *view, enum line_type type)
@@ -2701,6 +2714,11 @@ redraw_display(bool clear)
        }
 }
 
+
+/*
+ * Option management
+ */
+
 static void
 toggle_enum_option_do(unsigned int *opt, const char *help,
                      const struct enum_map *map, size_t size)
@@ -3368,7 +3386,8 @@ update_view(struct view *view)
                end_update(view, TRUE);
 
        } else if (io_eof(view->pipe)) {
-               report("");
+               if (view_is_displayed(view))
+                       report("");
                end_update(view, FALSE);
        }
 
@@ -3465,6 +3484,7 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
        if (split) {
                display[1] = view;
                current_view = 1;
+               view->parent = prev;
        } else if (!nomaximize) {
                /* Maximize the current view. */
                memset(display, 0, sizeof(display));
@@ -3472,9 +3492,9 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
                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,
@@ -3683,11 +3703,7 @@ view_driver(struct view *view, enum request request)
        case REQ_PREVIOUS:
                request = request == REQ_NEXT ? REQ_MOVE_DOWN : REQ_MOVE_UP;
 
-               if (view_has_parent(view, VIEW_DIFF, VIEW_MAIN) ||
-                   view_has_parent(view, VIEW_DIFF, VIEW_BLAME) ||
-                   view_has_parent(view, VIEW_STAGE, VIEW_STATUS) ||
-                   view_has_parent(view, VIEW_BLOB, VIEW_TREE) ||
-                   view_has_parent(view, VIEW_MAIN, VIEW_BRANCH)) {
+               if (view->parent) {
                        int line;
 
                        view = view->parent;
@@ -3793,13 +3809,12 @@ view_driver(struct view *view, enum request request)
                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 */
@@ -4008,7 +4023,9 @@ select_commit_parent(const char *id, char rev[SIZEOF_REV], const char *path)
                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]);
@@ -4730,7 +4747,7 @@ tree_request(struct view *view, enum request request, struct line *line)
                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;
 
@@ -4895,7 +4912,7 @@ blame_open(struct view *view)
 {
        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;
@@ -4995,7 +5012,7 @@ blame_read_file(struct view *view, const char *line, bool *read_file)
                const char **argv = *opt_ref ? blame_ref_argv : blame_head_argv;
                struct io io = {};
 
-               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)) {
@@ -5167,7 +5184,7 @@ setup_blame_parent_line(struct view *view, struct blame *blame)
 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) {
@@ -5893,7 +5910,7 @@ status_enter(struct view *view, struct line *line)
                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) {
@@ -6773,7 +6790,7 @@ main_read(struct view *view, char *line)
        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;
@@ -6863,7 +6880,7 @@ main_read(struct view *view, char *line)
 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: