From 738e4a6e31cf25577a49f8a1d37b240d3cfd4725 Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Fri, 25 Oct 2002 19:59:48 +0000
Subject: * [w3m-dev-en 00780] "Carlo E. Prelz" <fluido@fluido.as>   always
 print on screen the relative position * display.c (displayBuffer): relative
 position From: Fumitoshi UKAI  <ukai@debian.or.jp>

---
 ChangeLog    |  8 ++++++-
 display.c    |  8 ++++++-
 file.c       | 74 ++++++++++++++++++++++++++++++------------------------------
 version.c.in |  4 ++--
 4 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4c3a0e7..1d2b365 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-26  Fumitoshi UKAI  <ukai@debian.or.jp>
+
+	* [w3m-dev-en 00780] "Carlo E. Prelz" <fluido@fluido.as>
+	  always print on screen the relative position
+	* display.c (displayBuffer): relative position
+
 2002-10-26  Fumitoshi UKAI  <ukai@debian.or.jp>
 
 	* 0.3.2 release candidate 1
@@ -3957,4 +3963,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.446 2002/10/25 16:11:20 ukai Exp $
+$Id: ChangeLog,v 1.447 2002/10/25 19:59:48 ukai Exp $
diff --git a/display.c b/display.c
index 2a95716..02a2db3 100644
--- a/display.c
+++ b/display.c
@@ -1,4 +1,4 @@
-/* $Id: display.c,v 1.22 2002/03/15 18:33:32 ukai Exp $ */
+/* $Id: display.c,v 1.23 2002/10/25 19:59:51 ukai Exp $ */
 #include <signal.h>
 #include "fm.h"
 
@@ -319,6 +319,12 @@ displayBuffer(Buffer *buf, int mode)
 #endif				/* not USE_MOUSE */
 	msg = Strnew();
     Strcat_charp(msg, "Viewing");
+    if (buf->currentLine != NULL && buf->lastLine != NULL)
+	Strcat(msg, Sprintf(" %3d%%",
+			    (int)((double)buf->currentLine->real_linenumber
+				  * 100.0 /
+				  (double)buf->lastLine->real_linenumber
+				  + 0.5)));
 #ifdef USE_SSL
     if (buf->ssl_certificate)
 	Strcat_charp(msg, "[SSL]");
diff --git a/file.c b/file.c
index 6e7481b..eff1b63 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.104 2002/10/25 16:00:54 ukai Exp $ */
+/* $Id: file.c,v 1.105 2002/10/25 19:59:54 ukai Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include "myctype.h"
@@ -2078,7 +2078,7 @@ is_period_char(int ch)
     case '}':
     case '>':
 #ifndef JP_CHARSET
-    case 0x203A:	/* ">" */
+    case 0x203A:		/* ">" */
 #endif
 	return 1;
     default:
@@ -2096,8 +2096,8 @@ is_beginning_char(int ch)
     case '`':
     case '<':
 #ifndef JP_CHARSET
-    case 0x2018:	/* "`" */
-    case 0x2039:	/* "<" */
+    case 0x2018:		/* "`" */
+    case 0x2039:		/* "<" */
 #endif
 	return 1;
     default:
@@ -2110,46 +2110,46 @@ is_word_char(int ch)
 {
 #ifndef JP_CHARSET
     switch (ch) {
-    case 0x0152:	/* "OE"   */
-    case 0x0153:	/* "oe"   */
+    case 0x0152:		/* "OE"   */
+    case 0x0153:		/* "oe"   */
 	return 1;
-    case 0x0178:	/* "Y:"   */ /* ? */
-    case 0x0192:	/* "f"    */ /* ? */
-    case 0x02C6:	/* "^"    */ /* ? */
+    case 0x0178:		/* "Y:"   *//* ? */
+    case 0x0192:		/* "f"    *//* ? */
+    case 0x02C6:		/* "^"    *//* ? */
 	return 0;
-    case 0x02DC:	/* "~"    */
-    case 0x03BC:	/* "\xB5" "mu" */
+    case 0x02DC:		/* "~"    */
+    case 0x03BC:		/* "\xB5" "mu" */
 	return 1;
-    case 0x2002:	/* " "    "ensp" */
-    case 0x2003:	/* " "    "emsp" */
+    case 0x2002:		/* " "    "ensp" */
+    case 0x2003:		/* " "    "emsp" */
 	return 0;
-    case 0x2013:	/* "\xAD" "ndash" */
-    case 0x2014:	/* "-"    "mdash" */
-    case 0x2018:	/* "`"    "lsquo" */
-    case 0x2019:	/* "'"    "rsquo" */
-    case 0x201A:	/* "\xB8" "sbquo" */
-    case 0x201C:	/* "\""   "ldquo" */
-    case 0x201D:	/* "\""   "rdquo" */
-    case 0x201E:	/* ",,"   "bdquo" */
-    case 0x2022:	/* "*"    "bull" */ /* ? */
-    case 0x2030:	/* "0/00" "permil" */
-    case 0x2032:	/* "'"    "prime" */
-    case 0x2033:	/* "\""   "Prime" */
-    case 0x2039:	/* "<"    "lsaquo" */
-    case 0x203A:	/* ">"    "rsaquo" */
-    case 0x2044:	/* "/"    "frasl" */
-    case 0x20AC:	/* "=C="  "euro" */
-    case 0x2122:	/* "TM"   "trade" */
+    case 0x2013:		/* "\xAD" "ndash" */
+    case 0x2014:		/* "-"    "mdash" */
+    case 0x2018:		/* "`"    "lsquo" */
+    case 0x2019:		/* "'"    "rsquo" */
+    case 0x201A:		/* "\xB8" "sbquo" */
+    case 0x201C:		/* "\""   "ldquo" */
+    case 0x201D:		/* "\""   "rdquo" */
+    case 0x201E:		/* ",,"   "bdquo" */
+    case 0x2022:		/* "*"    "bull" *//* ? */
+    case 0x2030:		/* "0/00" "permil" */
+    case 0x2032:		/* "'"    "prime" */
+    case 0x2033:		/* "\""   "Prime" */
+    case 0x2039:		/* "<"    "lsaquo" */
+    case 0x203A:		/* ">"    "rsaquo" */
+    case 0x2044:		/* "/"    "frasl" */
+    case 0x20AC:		/* "=C="  "euro" */
+    case 0x2122:		/* "TM"   "trade" */
 	return 1;
-    case 0x2205:	/* "\xF8" "empty" */ /* ? */
+    case 0x2205:		/* "\xF8" "empty" *//* ? */
 	return 0;
-    case 0x2212:	/* "-"    */
-    case 0x223C:	/* "~"    */
+    case 0x2212:		/* "-"    */
+    case 0x223C:		/* "~"    */
 	return 1;
-    case 0x2260:	/* "!="   */ /* ? */
-    case 0x2261:	/* "="    */ /* ? */
-    case 0x2264:	/* "<="   */ /* ? */
-    case 0x2265:	/* ">="   */ /* ? */
+    case 0x2260:		/* "!="   *//* ? */
+    case 0x2261:		/* "="    *//* ? */
+    case 0x2264:		/* "<="   *//* ? */
+    case 0x2265:		/* ">="   *//* ? */
 	return 0;
     }
 #endif
diff --git a/version.c.in b/version.c.in
index 32affbc..52c3414 100644
--- a/version.c.in
+++ b/version.c.in
@@ -1,5 +1,5 @@
-/* $Id: version.c.in,v 1.17 2002/10/25 16:11:20 ukai Exp $ */
-#define CURRENT_VERSION "w3m/0.3.2rc1"
+/* $Id: version.c.in,v 1.18 2002/10/25 19:59:58 ukai Exp $ */
+#define CURRENT_VERSION "w3m/0.3.2rc1+cvs"
 
 #ifndef FM_H
 char *w3m_version = CURRENT_VERSION;
-- 
cgit v1.2.3