![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 7a996dca08ca43e21b13428ebfdb3f4d0109cd42..3d04317cd6da6beb23f804bfe9bd23ffe8de4939 100644 (file)
--- a/tig.c
+++ b/tig.c
#define ABS(x) ((x) >= 0 ? (x) : -(x))
#define MIN(x, y) ((x) < (y) ? (x) : (y))
+#define MAX(x, y) ((x) > (y) ? (x) : (y))
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
#define STRING_SIZE(x) (sizeof(x) - 1)
@@ -103,15 +104,9 @@ static size_t utf8_length(const char **string, size_t col, int *width, size_t ma
#define DATE_FORMAT "%Y-%m-%d %H:%M"
#define DATE_COLS STRING_SIZE("2006-04-29 14:21 ")
-#define AUTHOR_COLS 20
#define ID_COLS 8
-/* The default interval between line numbers. */
-#define NUMBER_INTERVAL 5
-
-#define TAB_SIZE 8
-
-#define SCALE_SPLIT_VIEW(height) ((height) * 2 / 3)
+#define MIN_VIEW_HEIGHT 4
#define NULL_ID "0000000000000000000000000000000000000000"
static char *prompt_input(const char *prompt, input_handler handler, void *data);
static bool prompt_yesno(const char *prompt);
+struct menu_item {
+ int hotkey;
+ const char *text;
+ void *data;
+};
+
+static bool prompt_menu(const char *prompt, const struct menu_item *items, int *selected);
+
/*
* Allocation helpers ... Entering macro hell to never be seen again.
*/
REQ_(FIND_PREV, "Find previous search match"), \
\
REQ_GROUP("Option manipulation") \
+ REQ_(OPTIONS, "Open option menu"), \
REQ_(TOGGLE_LINENO, "Toggle line numbers"), \
REQ_(TOGGLE_DATE, "Toggle date display"), \
REQ_(TOGGLE_AUTHOR, "Toggle author display"), \
static bool opt_line_graphics = TRUE;
static bool opt_rev_graph = FALSE;
static bool opt_show_refs = TRUE;
-static int opt_num_interval = NUMBER_INTERVAL;
+static int opt_num_interval = 5;
static double opt_hscroll = 0.50;
-static int opt_tab_size = TAB_SIZE;
-static int opt_author_cols = AUTHOR_COLS-1;
+static double opt_scale_split_view = 2.0 / 3.0;
+static int opt_tab_size = 8;
+static int opt_author_cols = 19;
static char opt_path[SIZEOF_STR] = "";
static char opt_file[SIZEOF_STR] = "";
static char opt_ref[SIZEOF_REF] = "";
{ 'z', REQ_STOP_LOADING },
{ 'v', REQ_SHOW_VERSION },
{ 'r', REQ_SCREEN_REDRAW },
+ { 'o', REQ_OPTIONS },
{ '.', REQ_TOGGLE_LINENO },
{ 'D', REQ_TOGGLE_DATE },
{ 'A', REQ_TOGGLE_AUTHOR },
if (!strcmp(argv[0], "horizontal-scroll"))
return parse_step(&opt_hscroll, argv[2]);
+ if (!strcmp(argv[0], "split-view-height"))
+ return parse_step(&opt_scale_split_view, argv[2]);
+
if (!strcmp(argv[0], "tab-size"))
return parse_int(&opt_tab_size, argv[2], 1, 1024);
wnoutrefresh(view->title);
}
+static int
+apply_step(double step, int value)
+{
+ if (step >= 1)
+ return (int) step;
+ value *= step + 0.01;
+ return value ? value : 1;
+}
+
static void
resize_display(void)
{
if (view != base) {
/* Horizontal split. */
view->width = base->width;
- view->height = SCALE_SPLIT_VIEW(base->height);
+ view->height = apply_step(opt_scale_split_view, base->height);
+ view->height = MAX(view->height, MIN_VIEW_HEIGHT);
+ view->height = MIN(view->height, base->height - MIN_VIEW_HEIGHT);
base->height -= view->height;
/* Make room for the title bar. */
report("%sabling %s", *option ? "En" : "Dis", help);
}
+static void
+open_option_menu(void)
+{
+ const struct menu_item menu[] = {
+ { '.', "line numbers", &opt_line_number },
+ { 'D', "date display", &opt_date },
+ { 'A', "author display", &opt_author },
+ { 'g', "revision graph display", &opt_rev_graph },
+ { 'F', "reference display", &opt_show_refs },
+ { 0 }
+ };
+ int selected = 0;
+
+ if (prompt_menu("Toggle option", menu, &selected))
+ toggle_view_option(menu[selected].data, menu[selected].text);
+}
+
static void
maximize_view(struct view *view)
{
@@ -2326,15 +2363,6 @@ goto_view_line(struct view *view, unsigned long offset, unsigned long lineno)
return FALSE;
}
-static int
-apply_step(double step, int value)
-{
- if (step >= 1)
- return (int) step;
- value *= step + 0.01;
- return value ? value : 1;
-}
-
/* Scrolling backend */
static void
do_scroll_view(struct view *view, int lines)
maximize_view(view);
break;
+ case REQ_OPTIONS:
+ open_option_menu();
+ break;
+
case REQ_TOGGLE_LINENO:
toggle_view_option(&opt_line_number, "line numbers");
break;
}
}
-static enum input_status
-select_commit_parent_handler(void *data, char *buf, int c)
+static bool
+open_commit_parent_menu(char buf[SIZEOF_STR], int *parents)
{
- size_t parents = *(size_t *) data;
- int parent = 0;
+ char rev[SIZEOF_REV];
+ const char *revlist_argv[] = {
+ "git", "log", "--no-color", "-1", "--pretty=format:%s", rev, NULL
+ };
+ struct menu_item *items;
+ char text[SIZEOF_STR];
+ bool ok = TRUE;
+ int i;
- if (!isdigit(c))
- return INPUT_SKIP;
+ items = calloc(*parents + 1, sizeof(*items));
+ if (!items)
+ return FALSE;
- if (*buf)
- parent = atoi(buf) * 10;
- parent += c - '0';
+ for (i = 0; i < *parents; i++) {
+ string_copy_rev(rev, &buf[SIZEOF_REV * i]);
+ if (!run_io_buf(revlist_argv, text, sizeof(text)) ||
+ !(items[i].text = strdup(text))) {
+ ok = FALSE;
+ break;
+ }
+ }
- if (parent > parents)
- return INPUT_SKIP;
- return INPUT_OK;
+ if (ok) {
+ *parents = 0;
+ ok = prompt_menu("Select parent", items, parents);
+ }
+ for (i = 0; items[i].text; i++)
+ free((char *) items[i].text);
+ free(items);
+ return ok;
}
static bool
@@ -3509,12 +3558,13 @@ select_commit_parent(const char *id, char rev[SIZEOF_REV], const char *path)
{
char buf[SIZEOF_STR * 4];
const char *revlist_argv[] = {
- "git", "rev-list", "-1", "--parents", id, "--", path, NULL
+ "git", "log", "--no-color", "-1",
+ "--pretty=format:%P", id, "--", path, NULL
};
int parents;
if (!run_io_buf(revlist_argv, buf, sizeof(buf)) ||
- (parents = (strlen(buf) / 40) - 1) < 0) {
+ (parents = strlen(buf) / 40) < 0) {
report("Failed to get parent information");
return FALSE;
return FALSE;
}
- if (parents > 1) {
- char prompt[SIZEOF_STR];
- char *result;
-
- if (!string_format(prompt, "Which parent? [1..%d] ", parents))
- return FALSE;
- result = prompt_input(prompt, select_commit_parent_handler, &parents);
- if (!result)
- return FALSE;
- parents = atoi(result);
- }
+ if (parents > 1 && !open_commit_parent_menu(buf, &parents))
+ return FALSE;
string_copy_rev(rev, &buf[41 * parents]);
return TRUE;
setup_update(view, view->id);
foreach_ref(branch_open_visitor, view);
+ view->p_restore = TRUE;
return TRUE;
}
return prompt_input(prompt, read_prompt_handler, NULL);
}
+static bool prompt_menu(const char *prompt, const struct menu_item *items, int *selected)
+{
+ enum input_status status = INPUT_OK;
+ int size = 0;
+
+ while (items[size].text)
+ size++;
+
+ while (status == INPUT_OK) {
+ const struct menu_item *item = &items[*selected];
+ int key;
+ int i;
+
+ mvwprintw(status_win, 0, 0, "%s (%d of %d) ",
+ prompt, *selected + 1, size);
+ if (item->hotkey)
+ wprintw(status_win, "[%c] ", (char) item->hotkey);
+ wprintw(status_win, "%s", item->text);
+ wclrtoeol(status_win);
+
+ key = get_input(COLS - 1);
+ switch (key) {
+ case KEY_RETURN:
+ case KEY_ENTER:
+ case '\n':
+ status = INPUT_STOP;
+ break;
+
+ case KEY_LEFT:
+ case KEY_UP:
+ *selected = *selected - 1;
+ if (*selected < 0)
+ *selected = size - 1;
+ break;
+
+ case KEY_RIGHT:
+ case KEY_DOWN:
+ *selected = (*selected + 1) % size;
+ break;
+
+ case KEY_ESC:
+ status = INPUT_CANCEL;
+ break;
+
+ default:
+ for (i = 0; items[i].text; i++)
+ if (items[i].hotkey == key) {
+ *selected = i;
+ status = INPUT_STOP;
+ break;
+ }
+ }
+ }
+
+ /* Clear the status window */
+ status_empty = FALSE;
+ report("");
+
+ return status != INPUT_CANCEL;
+}
+
/*
* Repository properties
*/