Commit: 40ca8cffc138da80fd66bdd055838aa08fe6767d
Parent: a6ef074227f6d53693489ee7ba1a10e47ab0ac89
Author: opask
Date: Wed, 28 Nov 2018 08:34:00 -0700
delete twterm code
Diffstat:
3 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/kbd.c b/kbd.c
@@ -310,10 +310,9 @@ void handle_trm(int sock_out, void *init_string, int init_len)
ev.y = y;
handle_terminal_resize(0, resize_terminal);
queue_event(itrm, (unsigned char *)&ev, sizeof(struct links_event));
- xwin = is_xterm() * ENV_XWIN + is_twterm() * ENV_TWIN + is_screen() * ENV_SCREEN;
+ xwin = is_xterm() * ENV_XWIN + is_screen() * ENV_SCREEN;
itrm->flags = 0;
if (!(ts = cast_uchar getenv("TERM"))) ts = cast_uchar "";
- if ((xwin & ENV_TWIN) && !strcmp(cast_const_char ts, "linux")) itrm->flags |= USE_TWIN_MOUSE;
if (strlen(cast_const_char ts) >= MAX_TERM_LEN) queue_event(itrm, ts, MAX_TERM_LEN);
else {
unsigned char *mm;
diff --git a/links.h b/links.h
@@ -319,7 +319,6 @@ struct open_in_new {
};
void close_fork_tty(void);
-int is_twterm(void);
int is_screen(void);
int is_xterm(void);
int get_terminal_size(int, int *, int *);
@@ -1480,11 +1479,6 @@ struct window {
#define ENV_XWIN 1
#define ENV_SCREEN 2
-#define ENV_OS2VIO 4
-#define ENV_BE 8
-#define ENV_TWIN 16
-#define ENV_WIN32 32
-#define ENV_INTERIX 64
#define ENV_G 32768
struct term_spec;
diff --git a/os_dep.c b/os_dep.c
@@ -256,13 +256,6 @@ DIR *c_opendir(unsigned char *path)
/* Exec */
-int is_twterm(void)
-{
- static int xt = -1;
- if (xt == -1) xt = !!getenv("TWDISPLAY");
- return xt;
-}
-
int is_screen(void)
{
static int xt = -1;
@@ -432,14 +425,6 @@ static void exec_new_links(struct terminal *term, unsigned char *xterm, unsigned
free(str);
}
-static int open_in_new_twterm(struct terminal *term, unsigned char *exe, unsigned char *param)
-{
- unsigned char *twterm;
- if (!(twterm = cast_uchar getenv("LINKS_TWTERM"))) twterm = cast_uchar "twterm -e";
- exec_new_links(term, twterm, exe, param);
- return 0;
-}
-
unsigned char *links_xterm(void)
{
unsigned char *xterm;
@@ -494,7 +479,6 @@ static const struct {
unsigned char *hk;
} oinw[] = {
{ENV_XWIN, open_in_new_xterm, TEXT_(T_XTERM), TEXT_(T_HK_XTERM)},
- {ENV_TWIN, open_in_new_twterm, TEXT_(T_TWTERM), TEXT_(T_HK_TWTERM)},
{ENV_SCREEN, open_in_new_screen, TEXT_(T_SCREEN), TEXT_(T_HK_SCREEN)},
#ifdef G
{ENV_G, open_in_new_g, TEXT_(T_WINDOW), TEXT_(T_HK_WINDOW)},