Remove macros which are only used for default option values

[tig.git] / tig.c

diff --git a/tig.c b/tig.c
index 60d73d52cdb0e8d58629c41b5bfa798268e1a883..3d04317cd6da6beb23f804bfe9bd23ffe8de4939 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -72,6 +72,7 @@ static size_t utf8_length(const char **string, size_t col, int *width, size_t ma
 
 #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"
 
@@ -911,10 +906,11 @@ static bool opt_line_number               = FALSE;
 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]                = "";
@@ -1594,6 +1590,9 @@ option_set_command(int argc, const char *argv[])
        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);
 
@@ -2223,6 +2222,15 @@ update_view_title(struct view *view)
        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)
 {
@@ -2240,7 +2248,9 @@ 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. */
@@ -2353,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)
@@ -3530,7 +3531,7 @@ open_commit_parent_menu(char buf[SIZEOF_STR], int *parents)
        int i;
 
        items = calloc(*parents + 1, sizeof(*items));
-       if (items)
+       if (!items)
                return FALSE;
 
        for (i = 0; i < *parents; i++) {