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

[w3m-dev-en 00783] hsaka@mth.biglobe.ne.jp (Hironori SAKAMOTO)

Browse Source 
add display_lineinfo option
* display.c (displayBuffer): check displayLineInfo
* fm.h (displayLineInfo): added
* rc.c (CMT_DISPLINEINFO): added
	(display_lineinfo): added
* NEWS (rc: display_lineinfo): add
From: Fumitoshi UKAI  <ukai@debian.or.jp>
This commit is contained in:
Fumitoshi UKAI
2002-10-26 08:10:43 +00:00
parent 99f619ecf1
commit 9726b596a7
5 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -1,3 +1,13 @@
2002-10-26 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev-en 00783] hsaka@mth.biglobe.ne.jp (Hironori SAKAMOTO)
add display_lineinfo option
* display.c (displayBuffer): check displayLineInfo
* fm.h (displayLineInfo): added
* rc.c (CMT_DISPLINEINFO): added
(display_lineinfo): added
* NEWS (rc: display_lineinfo): add
2002-10-26 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev-en 00781] "Clemens Fischer" <ino-waiting@gmx.net>
@@ -3969,4 +3979,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
$Id: ChangeLog,v 1.448 2002/10/25 20:02:30 ukai Exp $
$Id: ChangeLog,v 1.449 2002/10/26 08:10:43 ukai Exp $

3
NEWS
View File

@@ -1,5 +1,6 @@
w3m 0.4?
w3m 0.3.2 (release candidate)
* rc: display_lineinfo: display current line number
* rc: passwd_file: passwd file for HTTP auth
* func: MARK_WORD
* rc: imgsize: obsoleted

17
display.c
View File

@@ -1,4 +1,4 @@
/* $Id: display.c,v 1.23 2002/10/25 19:59:51 ukai Exp $ */
/* $Id: display.c,v 1.24 2002/10/26 08:10:43 ukai Exp $ */
#include <signal.h>
#include "fm.h"
@@ -318,13 +318,14 @@ displayBuffer(Buffer *buf, int mode)
else
#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)));
if (displayLineInfo && buf->currentLine != NULL && buf->lastLine != NULL) {
int cl = buf->currentLine->real_linenumber;
int ll = buf->lastLine->real_linenumber;
int r = (int)((double)cl * 100.0 / (double)ll + 0.5);
Strcat(msg, Sprintf("%d/%d (%3d%%)", cl, ll, r));
}
else
Strcat_charp(msg, "Viewing");
#ifdef USE_SSL
if (buf->ssl_certificate)
Strcat_charp(msg, "[SSL]");

3
fm.h
View File

@@ -1,4 +1,4 @@
/* $Id: fm.h,v 1.64 2002/09/11 14:54:33 ukai Exp $ */
/* $Id: fm.h,v 1.65 2002/10/26 08:10:43 ukai Exp $ */
/*
* w3m: WWW wo Miru utility
*
@@ -817,6 +817,7 @@ global int nextpage_topline init(FALSE);
#endif
global char *displayTitleTerm init(NULL);
global int displayLink init(FALSE);
global int displayLineInfo init(FALSE);
global int retryAsHttp init(TRUE);
global int showLineNum init(FALSE);
global int show_srch_str init(TRUE);

6
rc.c
View File

@@ -1,4 +1,4 @@
/* $Id: rc.c,v 1.50 2002/10/25 20:02:41 ukai Exp $ */
/* $Id: rc.c,v 1.51 2002/10/26 08:10:43 ukai Exp $ */
/*
* Initialization file etc.
*/
@@ -66,6 +66,7 @@ static char *config_file = NULL;
#define CMT_ARGV_IS_URL "scheme <20>Τʤ<CEA4><CAA4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> URL <20>Ȥߤʤ<DFA4>"
#define CMT_TSELF "target<65><74>̤<EFBFBD><CCA4><EFBFBD><EFBFBD><EFBFBD>ξ<EFBFBD><CEBE><EFBFBD><EFBFBD><EFBFBD>_self<6C><66><EFBFBD><EFBFBD><EFBFBD>Ѥ<EFBFBD><D1A4><EFBFBD>"
#define CMT_DISPLINK "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>μ<EFBFBD>ưɽ<C6B0><C9BD>"
#define CMT_DISPLINEINFO "<22><><EFBFBD>ߤι<DFA4><CEB9>ֹ<EFBFBD><D6B9><EFBFBD>ɽ<EFBFBD><C9BD>"
#ifdef USE_IMAGE
#define CMT_DISP_IMAGE "<22><><EFBFBD><EFBFBD><EFBFBD>饤<EFBFBD><E9A5A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD>"
#define CMT_AUTO_IMAGE "<22><><EFBFBD><EFBFBD><EFBFBD>饤<EFBFBD><E9A5A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ư<EFBFBD><C6B0><EFBFBD>ɤ߹<C9A4><DFB9><EFBFBD>"
@@ -208,6 +209,7 @@ static char *config_file = NULL;
#define CMT_ARGV_IS_URL "Treat argument without scheme as URL"
#define CMT_TSELF "Use _self as default target"
#define CMT_DISPLINK "Display link URL automatically"
#define CMT_DISPLINEINFO "Display current line number"
#ifdef USE_IMAGE
#define CMT_DISP_IMAGE "Display inline images"
#define CMT_AUTO_IMAGE "Load inline images automatically"
@@ -465,6 +467,8 @@ struct param_ptr params1[] = {
{"target_self", P_CHARINT, PI_ONOFF, (void *)&TargetSelf, CMT_TSELF, NULL},
{"display_link", P_INT, PI_ONOFF, (void *)&displayLink, CMT_DISPLINK,
NULL},
{"display_lineinfo", P_INT, PI_ONOFF, (void *)&displayLineInfo,
CMT_DISPLINEINFO, NULL},
{"ext_dirlist", P_INT, PI_ONOFF, (void *)&UseExternalDirBuffer,
CMT_EXT_DIRLIST, NULL},
{"dirlist_cmd", P_STRING, PI_TEXT, (void *)&DirBufferCommand,