storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

terms.c (set_tty): s/term_info/w3m_term_info/g;

Browse Source 
struct term_info is defined in FreeBSD's sys/consio.h
	reported by KOIE Hidetaka <hide@koie.org>
From: Fumitoshi UKAI  <ukai@debian.or.jp>
This commit is contained in:
Fumitoshi UKAI
2002-03-27 15:41:37 +00:00
parent f63662d330
commit d1db6a9ef1
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,9 @@
2002-03-28 Fumitoshi UKAI <ukai@debian.or.jp>
* terms.c (set_tty): s/term_info/w3m_term_info/g;
struct term_info is defined in FreeBSD's sys/consio.h
reported by KOIE Hidetaka <hide@koie.org>
2002-03-28 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp> 2002-03-28 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03146] Re: header option * [w3m-dev 03146] Re: header option
@@ -3297,4 +3303,4 @@
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.362 2002/03/27 15:35:06 ukai Exp $ $Id: ChangeLog,v 1.363 2002/03/27 15:41:37 ukai Exp $

34
terms.c
View File

@@ -1,4 +1,4 @@
/* $Id: terms.c,v 1.31 2002/03/20 17:53:00 ukai Exp $ */ /* $Id: terms.c,v 1.32 2002/03/27 15:41:38 ukai Exp $ */
/* /*
* An original curses library for EUC-kanji by Akinori ITO, December 1989 * An original curses library for EUC-kanji by Akinori ITO, December 1989
* revised by Akinori ITO, January 1995 * revised by Akinori ITO, January 1995
@@ -476,33 +476,33 @@ writestr(char *s)
#define MOVE(line,column) writestr(tgoto(T_cm,column,line)); #define MOVE(line,column) writestr(tgoto(T_cm,column,line));
#ifdef USE_MOUSE #ifdef USE_MOUSE
#define TERM_INFO(name, title, mouse) name, title, mouse #define W3M_TERM_INFO(name, title, mouse) name, title, mouse
#else #else
#define TERM_INFO(name, title, mouse) name, title #define W3M_TERM_INFO(name, title, mouse) name, title
#endif #endif
#define XTERM_TITLE "\033]0;w3m: %s\007" #define XTERM_TITLE "\033]0;w3m: %s\007"
#define SCREEN_TITLE "\033k%s\033\134" #define SCREEN_TITLE "\033k%s\033\134"
/* *INDENT-OFF* */ /* *INDENT-OFF* */
static struct term_info { static struct w3m_term_info {
char *term; char *term;
char *title_str; char *title_str;
#ifdef USE_MOUSE #ifdef USE_MOUSE
int mouse_flag; int mouse_flag;
#endif #endif
} term_info_list[] = { } w3m_term_info_list[] = {
{TERM_INFO("xterm", XTERM_TITLE, (NEED_XTERM_ON|NEED_XTERM_OFF))}, {W3M_TERM_INFO("xterm", XTERM_TITLE, (NEED_XTERM_ON|NEED_XTERM_OFF))},
{TERM_INFO("kterm", XTERM_TITLE, (NEED_XTERM_ON|NEED_XTERM_OFF))}, {W3M_TERM_INFO("kterm", XTERM_TITLE, (NEED_XTERM_ON|NEED_XTERM_OFF))},
{TERM_INFO("rxvt", XTERM_TITLE, (NEED_XTERM_ON|NEED_XTERM_OFF))}, {W3M_TERM_INFO("rxvt", XTERM_TITLE, (NEED_XTERM_ON|NEED_XTERM_OFF))},
{TERM_INFO("Eterm", XTERM_TITLE, (NEED_XTERM_ON|NEED_XTERM_OFF))}, {W3M_TERM_INFO("Eterm", XTERM_TITLE, (NEED_XTERM_ON|NEED_XTERM_OFF))},
{TERM_INFO("screen", SCREEN_TITLE, 0)}, {W3M_TERM_INFO("screen", SCREEN_TITLE, 0)},
#ifdef __CYGWIN__ #ifdef __CYGWIN__
{TERM_INFO("cygwin", NULL, NEED_XTERM_ON)}, {W3M_TERM_INFO("cygwin", NULL, NEED_XTERM_ON)},
#endif #endif
{TERM_INFO(NULL, NULL, 0)} {W3M_TERM_INFO(NULL, NULL, 0)}
}; };
#undef TERM_INFO #undef W3M_TERM_INFO
/* *INDENT-ON * */ /* *INDENT-ON * */
int int
@@ -525,8 +525,8 @@ set_tty(void)
#endif #endif
TerminalGet(tty, &d_ioval); TerminalGet(tty, &d_ioval);
if (displayTitleTerm != NULL) { if (displayTitleTerm != NULL) {
struct term_info *p; struct w3m_term_info *p;
for (p = term_info_list; p->term != NULL; p++) { for (p = w3m_term_info_list; p->term != NULL; p++) {
if (!strncmp(displayTitleTerm, p->term, strlen(p->term))) { if (!strncmp(displayTitleTerm, p->term, strlen(p->term))) {
title_str = p->title_str; title_str = p->title_str;
break; break;
@@ -536,8 +536,8 @@ set_tty(void)
#ifdef USE_MOUSE #ifdef USE_MOUSE
{ {
char *term = getenv("TERM"); char *term = getenv("TERM");
struct term_info *p; struct w3m_term_info *p;
for (p = term_info_list; p->term != NULL; p++) { for (p = w3m_term_info_list; p->term != NULL; p++) {
if (!strncmp(term, p->term, strlen(p->term))) { if (!strncmp(term, p->term, strlen(p->term))) {
is_xterm = p->mouse_flag; is_xterm = p->mouse_flag;
break; break;