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

[w3m-dev 02894] Re: goURL

Browse Source 
* file.c (HTMLtagproc1): s/goURL/gorURL/
* keybind.c (EscKeymap): M-u = GOTO_RELATIVE
* keybind_lynx.c (EscKeymap): ditto
* doc/keymap.default: ditto
* doc/keymap.lynx: ditto
* doc-jp/keymap.default: ditto
* doc-jp/keymap.lynx: ditto
* main.c (MAIN): add $HTTP_HOME or $WWW_HOME to history
* main.c (MAIN): add history even if it is local file or local cgi
* main.c (goURL0): change args, def_url -> current
* main.c (goURL0): delete ParsedURL *b_url
* main.c (goURL0): add Buffer *cur_buf
* main.c (goURL0): if current is supplied, use its URL as default
* main.c (goURL0): add URL to history if loadURL succeeded
* main.c (goURL): change args for goURL0()
* main.c (gorURL): ditto
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-01-23 17:19:47 +00:00
parent f16943392e
commit 316998e06a
9 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+21 -1
View File
@@ -1,3 +1,23 @@
2002-01-24 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 02894] Re: goURL
* file.c (HTMLtagproc1): s/goURL/gorURL/
* keybind.c (EscKeymap): M-u = GOTO_RELATIVE
* keybind_lynx.c (EscKeymap): ditto
* doc/keymap.default: ditto
* doc/keymap.lynx: ditto
* doc-jp/keymap.default: ditto
* doc-jp/keymap.lynx: ditto
* main.c (MAIN): add $HTTP_HOME or $WWW_HOME to history
* main.c (MAIN): add history even if it is local file or local cgi
* main.c (goURL0): change args, def_url -> current
* main.c (goURL0): delete ParsedURL *b_url
* main.c (goURL0): add Buffer *cur_buf
* main.c (goURL0): if current is supplied, use its URL as default
* main.c (goURL0): add URL to history if loadURL succeeded
* main.c (goURL): change args for goURL0()
* main.c (gorURL): ditto
2002-01-23 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 02889] fix scripts/multipart/multipart.cgi.in
@@ -2217,4 +2237,4 @@
* release-0-2-1
* import w3m-0.2.1
$Id: ChangeLog,v 1.253 2002/01/22 17:34:13 ukai Exp $
$Id: ChangeLog,v 1.254 2002/01/23 17:19:47 ukai Exp $
doc-jp/keymap.default
+1
View File
@@ -100,6 +100,7 @@ keymap M-g GOTO_LINE
keymap M-n NEXT_MARK
keymap M-p PREV_MARK
keymap M-s SAVE
keymap M-u GOTO_RELATIVE
keymap M-v PREV_PAGE
keymap M-w DICT_WORD
doc-jp/keymap.lynx
+1
View File
@@ -94,6 +94,7 @@ keymap M-a ADD_BOOKMARK
keymap M-b BOOKMARK
keymap M-e EDIT_SCREEN
keymap M-s SAVE
keymap M-u GOTO_RELATIVE
keymap M-v PREV_PAGE
keymap UP PREV_LINK
doc/keymap.default
+1
View File
@@ -100,6 +100,7 @@ keymap M-g GOTO_LINE
keymap M-n NEXT_MARK
keymap M-p PREV_MARK
keymap M-s SAVE
keymap M-u GOTO_RELATIVE
keymap M-v PREV_PAGE
keymap M-w DICT_WORD
doc/keymap.lynx
+1
View File
@@ -94,6 +94,7 @@ keymap M-a ADD_BOOKMARK
keymap M-b BOOKMARK
keymap M-e EDIT_SCREEN
keymap M-s SAVE
keymap M-u GOTO_RELATIVE
keymap M-v PREV_PAGE
keymap UP PREV_LINK
file.c
+3 -3
View File
@@ -1,4 +1,4 @@
/* $Id: file.c,v 1.45 2002/01/21 17:57:28 ukai Exp $ */
/* $Id: file.c,v 1.46 2002/01/23 17:19:47 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include "myctype.h"
@@ -3769,14 +3769,14 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
h_env->limit);
if (!is_redisplay && refresh_interval == 0 && MetaRefresh &&
!((obuf->flag & RB_NOFRAMES) && RenderFrame)) {
pushEvent(FUNCNAME_goURL, s_tmp->ptr);
pushEvent(FUNCNAME_gorURL, s_tmp->ptr);
/* pushEvent(deletePrevBuf,NULL); */
}
#ifdef USE_ALARM
else if (!is_redisplay && refresh_interval > 0 && MetaRefresh
&& !((obuf->flag & RB_NOFRAMES) && RenderFrame)) {
setAlarmEvent(refresh_interval, AL_IMPLICIT,
FUNCNAME_goURL, s_tmp->ptr);
FUNCNAME_gorURL, s_tmp->ptr);
}
#endif
}
keybind.c
+2 -2
View File
@@ -1,4 +1,4 @@
/* $Id: keybind.c,v 1.5 2001/12/25 13:43:51 ukai Exp $ */
/* $Id: keybind.c,v 1.6 2002/01/23 17:19:47 ukai Exp $ */
#include "funcname2.h"
char GlobalKeymap[128] = {
@@ -70,7 +70,7 @@ char EscKeymap[128] = {
/* h i j k l m n o */
nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nextMk, nulcmd,
/* p q r s t u v w */
prevMk, nulcmd, nulcmd, svSrc, nulcmd, nulcmd, pgBack, dictword,
prevMk, nulcmd, nulcmd, svSrc, nulcmd, gorURL, pgBack, dictword,
/* x y z { | } ~ DEL */
nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
};
keybind_lynx.c
+2 -2
View File
@@ -1,4 +1,4 @@
/* $Id: keybind_lynx.c,v 1.4 2001/11/24 02:01:26 ukai Exp $ */
/* $Id: keybind_lynx.c,v 1.5 2002/01/23 17:19:47 ukai Exp $ */
/*
* Lynx-like key binding.
*
@@ -78,7 +78,7 @@ char EscKeymap[128] = {
/* h i j k l m n o */
nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
/* p q r s t u v w */
nulcmd, nulcmd, nulcmd, svSrc, nulcmd, nulcmd, pgBack, nulcmd,
nulcmd, nulcmd, nulcmd, svSrc, nulcmd, gorURL, pgBack, nulcmd,
/* x y z { | } ~ DEL */
nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd, nulcmd,
};
main.c
+15 -16
View File
@@ -1,4 +1,4 @@
/* $Id: main.c,v 1.69 2002/01/22 16:59:11 ukai Exp $ */
/* $Id: main.c,v 1.70 2002/01/23 17:19:47 ukai Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -762,6 +762,8 @@ MAIN(int argc, char **argv, char **envp)
newbuf = loadGeneralFile(p, NULL, NO_REFERER, 0, NULL);
if (newbuf == NULL)
Strcat(err_msg, Sprintf("w3m: Can't load %s.\n", p));
else if (newbuf != NO_BUFFER)
pushHashHist(URLHist, parsedURL2Str(&newbuf->currentURL)->ptr);
}
else {
if (fmInitialized)
@@ -840,7 +842,6 @@ MAIN(int argc, char **argv, char **envp)
case SCM_LOCAL:
case SCM_LOCAL_CGI:
unshiftHist(LoadHist, conv_from_system(load_argv[i]));
break;
default:
pushHashHist(URLHist, parsedURL2Str(&newbuf->currentURL)->ptr);
break;
@@ -3612,23 +3613,19 @@ cmd_loadURL(char *url, ParsedURL *current)
/* go to specified URL */
static void
goURL0(char *prompt, char *def_url)
goURL0(char *prompt, ParsedURL *current)
{
char *url;
ParsedURL p_url;
ParsedURL *b_url;
Buffer *cur_buf = Currentbuf;
b_url = baseURL(Currentbuf);
url = searchKeyData();
if (url == NULL) {
if (!(Currentbuf->bufferprop & BP_INTERNAL))
pushHashHist(URLHist, parsedURL2Str(&Currentbuf->currentURL)->ptr);
url = inputLineHist(prompt, def_url, IN_URL, URLHist);
if (url != NULL) {
if (current)
url = parsedURL2Str(current)->ptr;
url = inputLineHist(prompt, url, IN_URL, URLHist);
if (url != NULL)
SKIP_BLANKS(url);
if (def_url != NULL)
b_url = NULL; /* XXX: for retryAsHttp */
}
}
#ifdef JP_CHARSET
if (url != NULL) {
@@ -3646,21 +3643,23 @@ goURL0(char *prompt, char *def_url)
gotoLabel(url + 1);
return;
}
parseURL2(url, &p_url, baseURL(Currentbuf));
parseURL2(url, &p_url, current);
pushHashHist(URLHist, parsedURL2Str(&p_url)->ptr);
cmd_loadURL(url, b_url);
cmd_loadURL(url, current);
if (Currentbuf != cur_buf) /* success */
pushHashHist(URLHist, parsedURL2Str(&Currentbuf->currentURL)->ptr);
}
void
goURL(void)
{
goURL0("Goto URL: ", parsedURL2Str(&Currentbuf->currentURL)->ptr);
goURL0("Goto URL: ", NULL);
}
void
gorURL(void)
{
goURL0("Goto relative URL: ", NULL);
goURL0("Goto relative URL: ", baseURL(Currentbuf));
}
static void