[w3m-dev 03160] Re: "ttp:" is marked instead of "http:" by MARL_URL

* NEWS:
* anchor.c (reAnchorAny): check MarkAllPages
* fm.h (MarkAllPages): added
* rc.c (CMT_MARK_ALL_PAGES): added
	(mark_all_pages): added
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>

5 files changed, 22 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index a9e0427..f302ec0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2002-03-30  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
 
+	* [w3m-dev 03160] Re: "ttp:" is marked instead of "http:" by MARL_URL
+	* NEWS: 
+	* anchor.c (reAnchorAny): check MarkAllPages
+	* fm.h (MarkAllPages): added
+	* rc.c (CMT_MARK_ALL_PAGES): added
+		(mark_all_pages): added
+
+2002-03-30  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
 	* [w3m-dev 03159] "ttp:" is marked instead of "http:" by MARL_URL
 	* main.c (chkURLBuffer): check internal URLs first
 
@@ -3308,4 +3317,4 @@
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.364 2002/03/29 16:32:00 ukai Exp $
+$Id: ChangeLog,v 1.365 2002/03/29 16:39:37 ukai Exp $
diff --git a/NEWS b/NEWS
index 39a7f7e..c9406f2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 w3m 0.4?
 
+* rc: mark_all_pages
 * configure: -mandir
 * func: COMMAND
 * -title option: set buffer name to terminal title
diff --git a/anchor.c b/anchor.c
index 7f864ee..d62f2ef 100644
--- a/anchor.c
+++ b/anchor.c
@@ -1,4 +1,4 @@
-/* $Id: anchor.c,v 1.9 2002/01/31 18:28:24 ukai Exp $ */
+/* $Id: anchor.c,v 1.10 2002/03/29 16:39:37 ukai Exp $ */
 #include "fm.h"
 #include "myctype.h"
 #include "regex.h"
@@ -295,7 +295,9 @@ reAnchorAny(Buffer *buf, char *re,
     if ((re = regexCompile(re, 1)) != NULL) {
 	return re;
     }
-    for (l = buf->firstLine; l != NULL; l = l->next) {
+    for (l = MarkAllPages ? buf->firstLine : buf->topLine; l != NULL &&
+	 (MarkAllPages || l->linenumber < buf->topLine->linenumber + LASTLINE);
+	 l = l->next) {
 	p = l->lineBuf;
 	for (;;) {
 	    if (regexMatch(p, &l->lineBuf[l->len] - p, p == l->lineBuf) == 1) {
diff --git a/fm.h b/fm.h
index cf5ebd0..d3f7e78 100644
--- a/fm.h
+++ b/fm.h
@@ -1,4 +1,4 @@
-/* $Id: fm.h,v 1.57 2002/03/19 16:06:52 ukai Exp $ */
+/* $Id: fm.h,v 1.58 2002/03/29 16:39:37 ukai Exp $ */
 /* 
  * w3m: WWW wo Miru utility
  * 
@@ -866,6 +866,7 @@ global int FoldTextarea init(FALSE);
 #define DEFAULT_URL_CURRENT	1
 #define DEFAULT_URL_LINK	2
 global int DefaultURLString init(DEFAULT_URL_EMPTY);
+global int MarkAllPages init(FALSE);
 
 #ifdef USE_MIGEMO
 global int use_migemo init(FALSE);
diff --git a/rc.c b/rc.c
index 5315bf8..bf559a0 100644
--- a/rc.c
+++ b/rc.c
@@ -1,4 +1,4 @@
-/* $Id: rc.c,v 1.40 2002/02/19 15:25:19 ukai Exp $ */
+/* $Id: rc.c,v 1.41 2002/03/29 16:39:37 ukai Exp $ */
 /* 
  * Initialization file etc.
  */
@@ -138,6 +138,7 @@ static char *config_file = NULL;
 #define CMT_ACCEPTLANG   "受けつける言語(Accept-Language:)"
 #define CMT_DOCUMENTCODE "文書の文字コード"
 #define CMT_SYSTEMCODE   "システムの文字コード"
+#define CMT_MARK_ALL_PAGES "全てのページのURL風の文字列をリンクにする"
 #define CMT_WRAP         "折り返し検索"
 #define CMT_VIEW_UNSEENOBJECTS "背景画像等へのリンクを作る"
 #ifdef __EMX__
@@ -272,6 +273,7 @@ static char *config_file = NULL;
 #define CMT_ACCEPTLANG   "Accept-Language"
 /* #define CMT_DOCUMENTCODE "Document Charset" */
 /* #define CMT_SYSTEMCODE   "System Kanji Code" */
+#define CMT_MARK_ALL_PAGES "Mark URL-like strings as anchors in all pages"
 #define CMT_WRAP         "Wrap search"
 #define CMT_VIEW_UNSEENOBJECTS "Display unseenobjects (e.g. bgimage) tag"
 #ifdef __EMX__
@@ -539,6 +541,8 @@ struct param_ptr params3[] = {
     {"vi_prec_num", P_INT, PI_ONOFF, (void *)&vi_prec_num, CMT_VI_PREC_NUM,
      NULL},
 #endif
+    {"mark_all_pages", P_INT, PI_ONOFF, (void *)&MarkAllPages,
+     CMT_MARK_ALL_PAGES, NULL},
     {"wrap_search", P_INT, PI_ONOFF, (void *)&WrapDefault, CMT_WRAP, NULL},
     {"ignorecase_search", P_INT, PI_ONOFF, (void *)&IgnoreCase,
      CMT_IGNORE_CASE, NULL},