Commit: c6ed589ec8e273cf3de2717698d40a4385397d15
Parent: eab06c3a084b8356515aa61b800fd922a978de5c
Author: 0x766F6964
Date: Mon, 3 Aug 2020 09:33:42 -0600
delete some stuff that was missed during graphics removal
Diffstat:
4 files changed, 0 insertions(+), 57 deletions(-)
diff --git a/default.c b/default.c
@@ -937,12 +937,6 @@ void end_config(void)
free(links_home);
}
-int ggr = 0;
-int force_g = 0;
-unsigned char ggr_drv[MAX_STR_LEN] = "";
-unsigned char ggr_mode[MAX_STR_LEN] = "";
-unsigned char ggr_display[MAX_STR_LEN] = "";
-
int anonymous = 0;
unsigned char default_target[MAX_STR_LEN] ="";
@@ -1034,11 +1028,7 @@ static struct option links_options[] = {
{1, lookup_cmd, NULL, NULL, 0, 0, NULL, NULL, "lookup"},
{1, set_cmd, NULL, NULL, 0, 0, &no_connect, NULL, "no-connect"},
{1, set_cmd, NULL, NULL, 0, 0, &anonymous, NULL, "anonymous"},
- {1, set_cmd, NULL, NULL, 0, 0, &ggr, NULL, "g"},
- {1, setstr_cmd, NULL, NULL, 0, MAX_STR_LEN, ggr_drv, NULL, "driver"},
{1, setstr_cmd, NULL, NULL, 0, MAX_STR_LEN, default_target, NULL, "target"},
- {1, setstr_cmd, NULL, NULL, 0, MAX_STR_LEN, ggr_mode, NULL, "mode"},
- {1, setstr_cmd, NULL, NULL, 0, MAX_STR_LEN, ggr_display, NULL, "display"},
{1, gen_cmd, num_rd, NULL, 0, INT_MAX, &base_session, NULL, "base-session"},
{1, set_cmd, NULL, NULL, 0, 0, &force_html, NULL, "force-html"},
{1, dump_cmd, NULL, NULL, D_SOURCE, 0, NULL, NULL, "source"},
diff --git a/links.1 b/links.1
@@ -36,30 +36,6 @@ version number and exit.
Does name lookup, like command "host".
.TP
-\f3-g\f1
-Run Links in graphics mode. If not given, Links will run in text mode.
-Running in graphics mode means that Links will probe all compiled-in graphics
-devices and run on the first found. If none found, links will not run in
-graphics mode.
-
-.TP
-\f3-driver \f2<driver name>\f1
-Graphics driver to use. Drivers are: x, svgalib, fb, directfb, pmshell,
-atheos.
-List of drivers will be shown if you give it an unknown driver.
-Available drivers depend on your operating system and available libraries.
-
-.TP
-\f3-mode \f2<parameter>\f1
-Pass a parameter to the graphics driver. On SVGAlib, this is widthxheightxdepth,
-(where depth is 16, 256, 32K, 64K, 16M or 16M32) and defines the graphics mode, on X the format is WIDTHxHEIGHT and defines the
-window size.
-
-.TP
-\f3-display \f2<x-display>\f1
-Set Xwindow display.
-
-.TP
\f3-force-html\f1
Treat files with unknown type as html rather than text.
(can be toggled with '\\' key)
diff --git a/links.h b/links.h
@@ -2456,12 +2456,6 @@ void add_table_cache_entry(unsigned char *start, unsigned char *end, int align,
/* default.c */
-extern int ggr;
-extern int force_g;
-extern unsigned char ggr_drv[MAX_STR_LEN];
-extern unsigned char ggr_mode[MAX_STR_LEN];
-extern unsigned char ggr_display[MAX_STR_LEN];
-
extern unsigned char default_target[MAX_STR_LEN];
unsigned char *parse_options(int, char *[]);
diff --git a/main.c b/main.c
@@ -267,14 +267,6 @@ static void end_dump(struct object_request *r, void *p)
terminate_loop = 1;
}
-static void fixup_g(void)
-{
- if (ggr_drv[0] || ggr_mode[0] || force_g)
- ggr = 1;
- if (dmp)
- ggr = 0;
-}
-
static void init(void)
{
void *info;
@@ -291,12 +283,10 @@ static void init(void)
retval = RET_SYNTAX;
goto ttt;
}
- fixup_g();
dds.assume_cp = 0;
load_config();
if (proxies.only_proxies)
reset_settings_for_tor();
- fixup_g();
if (!u) {
ttt:
initialize_all_subsystems_2();
@@ -306,13 +296,6 @@ static void init(void)
}
init_cookies();
if (!dmp) {
- if (ggr) {
- close_socket(&terminal_pipe[0]);
- close_socket(&terminal_pipe[1]);
- fprintf(stderr, "Graphics not enabled when compiling\n");
- retval = RET_SYNTAX;
- goto ttt;
- }
init_b = 1;
init_bookmarks();
create_initial_extensions();