[w3m-dev 03582] add config options graphic_char and use_proxy

* NEWS: rc: graphic_char, use_proxy
* fm.h (Do_no_use_proxy): macro using use_proxy
	(use_proxy): added
	(no_graphic_char): deleted
	(UseGraphicChar): added
* main.c (main): UseGraphicChar, use_proxy
* rc.c (CMT_GRAPHIC_CHAR): added
	(CMT_USE_PROXY): added
	(params1): graphic_char
	(params4): use_proxy
* terms.c (graph_ok): UseGraphicChar
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

6 files changed, 38 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 6759287..b84395c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2002-12-19  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
 
+	* [w3m-dev 03582] add config options graphic_char and use_proxy
+	* NEWS: rc: graphic_char, use_proxy
+	* fm.h (Do_no_use_proxy): macro using use_proxy
+		(use_proxy): added
+		(no_graphic_char): deleted
+		(UseGraphicChar): added
+	* main.c (main): UseGraphicChar, use_proxy
+	* rc.c (CMT_GRAPHIC_CHAR): added
+		(CMT_USE_PROXY): added
+		(params1): graphic_char
+		(params4): use_proxy
+	* terms.c (graph_ok): UseGraphicChar
+
+2002-12-19  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
 	* [w3m-dev 03581] MARK_URL, MARK_WORD
 	* main.c (chkWORD): accept ()[]{}&|;*?$ as anchor
 
@@ -5944,4 +5959,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.632 2002/12/18 16:38:49 ukai Exp $
+$Id: ChangeLog,v 1.633 2002/12/18 16:42:30 ukai Exp $
diff --git a/NEWS b/NEWS
index c1a0bc0..02ebeb8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 w3m 0.3.3 or 0.4?
 
+* rc: graphic_char
+* rc: use_proxy
 * rc: preserve_timestamp
 * func: REDO, UNDO
 * func: LIST, LIST_MENU, MOVE_LIST_MENU
diff --git a/fm.h b/fm.h
index d815d40..48abafa 100644
--- a/fm.h
+++ b/fm.h
@@ -1,4 +1,4 @@
-/* $Id: fm.h,v 1.98 2002/12/18 16:20:52 ukai Exp $ */
+/* $Id: fm.h,v 1.99 2002/12/18 16:42:31 ukai Exp $ */
 /* 
  * w3m: WWW wo Miru utility
  * 
@@ -813,7 +813,8 @@ extern int ai_family_order_table[3][3];	/* XXX */
 #endif				/* INET6 */
 global TextList *NO_proxy_domains;
 global char NoCache init(FALSE);
-global int Do_not_use_proxy init(FALSE);
+global char use_proxy init(TRUE);
+#define Do_not_use_proxy (!use_proxy)
 global int Do_not_use_ti_te init(FALSE);
 
 global char *document_root init(NULL);
@@ -1005,7 +1006,7 @@ global char UseAutoDetect init(TRUE);
 #define url_quote_conv(x,c) url_quote(x)
 #endif				/* JP_CHARSET */
 #ifndef KANJI_SYMBOLS
-global int no_graphic_char init(FALSE);
+global char UseGraphicChar init(TRUE);
 extern char alt_rule[];
 #endif				/* not KANJI_SYMBOLS */
 extern char UseAltEntity;
diff --git a/main.c b/main.c
index ff5dfeb..710e3f0 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.175 2002/12/18 16:38:49 ukai Exp $ */
+/* $Id: main.c,v 1.176 2002/12/18 16:42:31 ukai Exp $ */
 #define MAINPROGRAM
 #include "fm.h"
 #include <signal.h>
@@ -511,7 +511,7 @@ main(int argc, char **argv, char **envp)
 #endif				/* JP_CHARSET */
 #ifndef KANJI_SYMBOLS
 	    else if (!strcmp("-no-graph", argv[i]))
-		no_graphic_char = TRUE;
+		UseGraphicChar = FALSE;
 #endif				/* not KANJI_SYMBOLS */
 	    else if (!strcmp("-T", argv[i])) {
 		if (++i >= argc)
@@ -610,7 +610,7 @@ main(int argc, char **argv, char **envp)
 	    else if (!strcmp("-num", argv[i]))
 		showLineNum = TRUE;
 	    else if (!strcmp("-no-proxy", argv[i]))
-		Do_not_use_proxy = TRUE;
+		use_proxy = FALSE;
 	    else if (!strcmp("-post", argv[i])) {
 		if (++i >= argc)
 		    usage();
diff --git a/rc.c b/rc.c
index 9b39e61..0312612 100644
--- a/rc.c
+++ b/rc.c
@@ -1,4 +1,4 @@
-/* $Id: rc.c,v 1.71 2002/12/14 15:24:04 ukai Exp $ */
+/* $Id: rc.c,v 1.72 2002/12/18 16:42:31 ukai Exp $ */
 /* 
  * Initialization file etc.
  */
@@ -80,6 +80,7 @@ static char *config_file = NULL;
 #endif
 #define CMT_MULTICOL     "ファイル名のマルチカラム表示"
 #define CMT_ALT_ENTITY   "エンティティを ASCII の代替表現で表す"
+#define CMT_GRAPHIC_CHAR "テーブルやメニューの枠に graphic 文字を使う"
 #define CMT_FOLD_TEXTAREA "TEXTAREA の行を折り返して表示"
 #define CMT_DISP_INS_DEL "DEL, S, STRIKE 要素の内容を表示する。"
 #define CMT_COLOR        "カラー表示"
@@ -93,6 +94,7 @@ static char *config_file = NULL;
 #define CMT_C_COLOR	 "現在選択されているリンクの色"
 #define CMT_VISITED_ANCHOR	"訪れたことがあるリンクは色を変える"
 #define CMT_V_COLOR	 "訪れたことがあるリンクの色"
+#define CMT_USE_PROXY    "プロキシを使用する"
 #define CMT_HTTP_PROXY   "HTTPプロキシ(URLで入力)"
 #ifdef USE_SSL
 #define CMT_HTTPS_PROXY  "HTTPSプロキシ(URLで入力)"
@@ -236,6 +238,7 @@ static char *config_file = NULL;
 #endif
 #define CMT_MULTICOL     "Display file names in multi-column format"
 #define CMT_ALT_ENTITY   "Use ASCII equivalents to display entities"
+#define CMT_GRAPHIC_CHAR "Use graphic char for border of table and menu"
 #define CMT_FOLD_TEXTAREA "Fold lines in TEXTAREA"
 #define CMT_DISP_INS_DEL "Display DEL, S and STRIKE element"
 #define CMT_COLOR        "Display with color"
@@ -249,6 +252,7 @@ static char *config_file = NULL;
 #define CMT_V_COLOR	 "Color of visited link"
 #define CMT_BG_COLOR     "Color of background"
 #define CMT_MARK_COLOR   "Color of mark"
+#define CMT_USE_PROXY    "Use proxy"
 #define CMT_HTTP_PROXY   "URL of HTTP proxy host"
 #ifdef USE_SSL
 #define CMT_HTTPS_PROXY  "URL of HTTPS proxy host"
@@ -526,6 +530,10 @@ struct param_ptr params1[] = {
     {"multicol", P_INT, PI_ONOFF, (void *)&multicolList, CMT_MULTICOL, NULL},
     {"alt_entity", P_CHARINT, PI_ONOFF, (void *)&UseAltEntity, CMT_ALT_ENTITY,
      NULL},
+#ifndef KANJI_SYMBOLS
+    {"graphic_char", P_CHARINT, PI_ONOFF, (void *)&UseGraphicChar,
+     CMT_GRAPHIC_CHAR, NULL},
+#endif
     {"fold_textarea", P_CHARINT, PI_ONOFF, (void *)&FoldTextarea,
      CMT_FOLD_TEXTAREA, NULL},
     {"display_ins_del", P_INT, PI_ONOFF, (void *)&displayInsDel,
@@ -650,6 +658,8 @@ struct param_ptr params3[] = {
 };
 
 struct param_ptr params4[] = {
+    {"use_proxy", P_CHARINT, PI_ONOFF, (void *)&use_proxy, CMT_USE_PROXY,
+     NULL},
     {"http_proxy", P_STRING, PI_TEXT, (void *)&HTTP_proxy, CMT_HTTP_PROXY,
      NULL},
 #ifdef USE_SSL
diff --git a/terms.c b/terms.c
index 90f3bd1..53a7018 100644
--- a/terms.c
+++ b/terms.c
@@ -1,4 +1,4 @@
-/* $Id: terms.c,v 1.41 2002/12/11 15:07:53 ukai Exp $ */
+/* $Id: terms.c,v 1.42 2002/12/18 16:42:32 ukai Exp $ */
 /* 
  * An original curses library for EUC-kanji by Akinori ITO,     December 1989
  * revised by Akinori ITO, January 1995
@@ -1204,7 +1204,7 @@ int
 graph_ok(void)
 {
 #ifndef KANJI_SYMBOLS
-    if (no_graphic_char)
+    if (!UseGraphicChar)
 	return 0;
 #endif				/* not KANJI_SYMBOLS */
     return T_as[0] != 0 && T_ae[0] != 0 && T_ac[0] != 0;