Commit: 0123b627d0ddbd11b386175706b24385c2dbdf91
Parent: 751342f7e20a435e3043e5ef3fa1613b7c151686
Author: 0x766F6964
Date: Mon, 3 Aug 2020 08:21:36 -0600
setup.h: clean up some unused #defines
Diffstat:
4 files changed, 0 insertions(+), 71 deletions(-)
diff --git a/default.c b/default.c
@@ -994,14 +994,6 @@ int gamma_bits=2; /*0 --- 8, 1 --- 16, 2 --- auto */
int overwrite_instead_of_scroll = 1;
-int menu_font_size = G_BFU_DEFAULT_FONT_SIZE;
-
-unsigned G_BFU_FG_COLOR = G_DEFAULT_BFU_FG_COLOR;
-unsigned G_BFU_BG_COLOR = G_DEFAULT_BFU_BG_COLOR;
-unsigned G_SCROLL_BAR_AREA_COLOR = G_DEFAULT_SCROLL_BAR_AREA_COLOR;
-unsigned G_SCROLL_BAR_BAR_COLOR = G_DEFAULT_SCROLL_BAR_BAR_COLOR;
-unsigned G_SCROLL_BAR_FRAME_COLOR = G_DEFAULT_SCROLL_BAR_FRAME_COLOR;
-
unsigned char bookmarks_file[MAX_STR_LEN]="";
int save_history = 1;
@@ -1092,12 +1084,6 @@ static struct option links_options[] = {
{1, gen_cmd, num_rd, num_wr, 0, 1, &http_options.header.fake_firefox, "fake_firefox", "http.fake-firefox"},
{1, gen_cmd, str_rd, str_wr, 0, MAX_STR_LEN, &http_options.header.fake_useragent, "fake_useragent", "http.fake-user-agent"},
{1, gen_cmd, str_rd, str_wr, 0, MAX_STR_LEN, &http_options.header.extra_header, "http.extra_header", "http.extra-header"},
- {1, gen_cmd, num_rd, num_wr, 1, MAX_FONT_SIZE, &menu_font_size, "menu_font_size", "menu-font-size"},
- {1, gen_cmd, num_rd, num_wr, 0, 0xffffff, &G_BFU_BG_COLOR, "background_color", "menu-background-color"},
- {1, gen_cmd, num_rd, num_wr, 0, 0xffffff, &G_BFU_FG_COLOR, "foreground_color", "menu-foreground-color"},
- {1, gen_cmd, num_rd, num_wr, 0, 0xffffff, &G_SCROLL_BAR_AREA_COLOR, "scroll_bar_area_color", "scroll-bar-area-color"},
- {1, gen_cmd, num_rd, num_wr, 0, 0xffffff, &G_SCROLL_BAR_BAR_COLOR, "scroll_bar_bar_color", "scroll-bar-bar-color"},
- {1, gen_cmd, num_rd, num_wr, 0, 0xffffff, &G_SCROLL_BAR_FRAME_COLOR, "scroll_bar_frame_color", "scroll-bar-frame-color"},
{1, gen_cmd, str_rd, str_wr, 0, MAX_STR_LEN, bookmarks_file, "bookmarks_file", "bookmarks-file"},
{1, gen_cmd, num_rd, num_wr, 0, 1, &save_history, "save_url_history", "save-url-history"},
{1, gen_cmd, dbl_rd, dbl_wr, 1, 10000, &display_red_gamma, "display_red_gamma", "display-red-gamma"},
diff --git a/links.h b/links.h
@@ -2599,9 +2599,6 @@ extern int dither_images;
extern int gamma_bits;
extern int overwrite_instead_of_scroll;
-extern int menu_font_size;
-extern unsigned G_BFU_FG_COLOR, G_BFU_BG_COLOR, G_SCROLL_BAR_AREA_COLOR, G_SCROLL_BAR_BAR_COLOR, G_SCROLL_BAR_FRAME_COLOR;
-
extern unsigned char bookmarks_file[MAX_STR_LEN];
extern int save_history;
diff --git a/listedit.c b/listedit.c
@@ -185,8 +185,6 @@ static void list_edit_toggle(struct dialog_data *dlg, struct list_description *l
/* This function uses these defines from setup.h:
*
- * BFU_GRX_WIDTH
- * BFU_GRX_HEIGHT
* BFU_ELEMENT_WIDTH
*/
diff --git a/setup.h b/setup.h
@@ -58,66 +58,16 @@
#define COLOR_TITLE COL(007)
#define COLOR_STATUS COL(070)
-#define G_BFU_DEFAULT_FONT_SIZE 16
-#define G_DEFAULT_BFU_FG_COLOR 0x000000
-#define G_DEFAULT_BFU_BG_COLOR 0xe0e0e0
-
-#define G_MENU_LEFT_BORDER 8
-#define G_MENU_LEFT_INNER_BORDER 8
-#define G_MENU_TOP_BORDER 16
-#define G_MENU_HOTKEY_SPACE 16
-#define G_MAINMENU_LEFT_BORDER 16
-#define G_MAINMENU_BORDER 16
-
-#define G_DIALOG_TITLE_BORDER 8
-#define G_DIALOG_LEFT_BORDER 24
-#define G_DIALOG_TOP_BORDER 16
-#define G_DIALOG_HLINE_SPACE 3
-#define G_DIALOG_VLINE_SPACE 4
-#define G_DIALOG_LEFT_INNER_BORDER 16
-#define G_DIALOG_TOP_INNER_BORDER (G_BFU_FONT_SIZE < 20 ? 8 : G_BFU_FONT_SIZE - 12)
-
-#define G_DIALOG_BUTTON_SPACE 16
-#define G_DIALOG_CHECKBOX_SPACE 8
-
-#define G_DIALOG_GROUP_SPACE 16
-#define G_DIALOG_GROUP_TEXT_SPACE 8
-
-#define G_DIALOG_CHECKBOX_L "["
-#define G_DIALOG_CHECKBOX_R "]"
-#define G_DIALOG_CHECKBOX_X "X"
-
-#define G_DIALOG_RADIO_L "["
-#define G_DIALOG_RADIO_R "]"
-#define G_DIALOG_RADIO_X "X"
-
-#define G_DIALOG_BUTTON_L "[ "
-#define G_DIALOG_BUTTON_R " ]"
-
-#define G_LEFT_ARROW "\342\206\220"
-#define G_RIGHT_ARROW "\342\206\222"
#define MENU_SUBMENU (cast_uchar ">")
#define CERT_RIGHT_ARROW (cast_uchar " -> ")
#define G_SCROLL_BAR_WIDTH 12
#define G_SCROLL_BAR_MIN_SIZE 20
-#define G_DEFAULT_SCROLL_BAR_FRAME_COLOR 0x000000
-#define G_DEFAULT_SCROLL_BAR_AREA_COLOR 0xc0c0c0
-#define G_DEFAULT_SCROLL_BAR_BAR_COLOR 0x000000
-
-#define G_HTML_DEFAULT_FAMILY "century"
-
-#define G_HTML_TABLE_FRAME_COLOR 0xe0
#define G_HTML_MARGIN 8
-#define G_IMG_REFRESH 1 /* Karle, nedavej sem 0 */
-
#define MAX_FONT_SIZE 500
-#define SLOW_FPU_DETECT_THRESHOLD 1000
-#define SLOW_FPU_MAX_STARTUP 5000
-
#define ESC_TIMEOUT 200
#define DISPLAY_TIME_MIN 200
@@ -156,6 +106,4 @@
* (draw_bfu_element function in listedit.c)
* BFU_ELEMENT_WIDTH is a size of one bfu element (doesn't depend on graphical/text mode)
*/
-#define BFU_GRX_WIDTH (G_BFU_FONT_SIZE >> 1)
#define BFU_ELEMENT_WIDTH 5
-#define BFU_GRX_HEIGHT G_BFU_FONT_SIZE