commit ae5f81ae8bdbd28a3124c704c35ba30274c92534
parent c06eead3109ebc6544ae62b95b22a335e2e9eed1
Author: ukai <ukai>
Date: Thu, 21 Nov 2002 16:15:57 +0000
[w3m-dev 03454] next / previous buffer
* funcname.tab (NEXT): added
(PREV): added
* main.c (nextBf): added
(prevBf): added
* proto.h (nextBf): added
(prevBf): added
* doc/README.func (NEXT): added
(PREV): added
* doc-jp/README.func (NEXT): added
(PREV): added
* scripts/w3mhelp.cgi.in (Buffer operation): nextBf prevBf
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
Diffstat:
7 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,18 @@
+2002-11-22 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03454] next / previous buffer
+ * funcname.tab (NEXT): added
+ (PREV): added
+ * main.c (nextBf): added
+ (prevBf): added
+ * proto.h (nextBf): added
+ (prevBf): added
+ * doc/README.func (NEXT): added
+ (PREV): added
+ * doc-jp/README.func (NEXT): added
+ (PREV): added
+ * scripts/w3mhelp.cgi.in (Buffer operation): nextBf prevBf
+
2002-11-20 Fumitoshi UKAI <ukai@debian.or.jp>
* NEWS: rc: image_map_list
diff --git a/doc-jp/README.func b/doc-jp/README.func
@@ -60,6 +60,7 @@ MOVE_UP
MOVE_UP1 カーソルを上に移動します(改ページ時には１行スクロール)
MSGS エラーメッセージの一覧の表示
NEW_TAB 新しいタブを開きます
+NEXT 次のバッファを表示します
NEXT_DOWN カーソルの下側にあるリンクに移動します
NEXT_LEFT カーソルの左側にあるリンクに移動します
NEXT_LEFT_UP カーソルの左側(無ければ前の行以前)にあるリンクに移動します
@@ -79,6 +80,7 @@ PEEK_IMG
PEEK_LINK リンクが指す先のURLを表示します
PIPE_BUF バッファの内容をパイプに渡します
PIPE_SHELL コマンドを実行し，結果を読みこみながら表示します
+PREV 前のバッファを表示します
PREV_LINK 前のリンクに移動します
PREV_MARK 一つ前のマークに移動します
PREV_PAGE 前のページを表示します
diff --git a/doc/README.func b/doc/README.func
@@ -60,6 +60,7 @@ MOVE_UP Move cursor up (a half screen scroll at the top of screen
MOVE_UP1 Move cursor up (1 line scrol at the top of screen)
MSGS Display error messages
NEW_TAB Open new tab
+NEXT Move to next buffer
NEXT_DOWN Move to next downward link
NEXT_LEFT Move to next left link
NEXT_LEFT_UP Move to next left (or upward) link
@@ -79,6 +80,7 @@ PEEK_IMG Peek image URL
PEEK_LINK Peek link URL
PIPE_BUF Send rendered document to pipe
PIPE_SHELL Execute shell command and browse
+PREV Move to previous buffer
PREV_LINK Move to previous link
PREV_MARK Move to previous mark
PREV_PAGE Move to previous page
diff --git a/funcname.tab b/funcname.tab
@@ -66,6 +66,7 @@ MOVE_UP movU
MOVE_UP1 movU1
MSGS msgs
NEW_TAB newT
+NEXT nextBf
NEXT_DOWN nextD
NEXT_LEFT nextL
NEXT_LEFT_UP nextLU
@@ -86,6 +87,7 @@ PEEK_IMG peekIMG
PEEK_LINK peekURL
PIPE_BUF pipeBuf
PIPE_SHELL pipesh
+PREV prevBf
PREV_LINK prevA
PREV_MARK prevMk
PREV_PAGE pgBack
diff --git a/main.c b/main.c
@@ -3699,6 +3699,44 @@ nextU(void)
nextY(-1);
}
+/* go to the next bufferr */
+void
+nextBf(void)
+{
+ Buffer *buf;
+ int i;
+
+ for (i = 0; i < PREC_NUM; i++) {
+ buf = prevBuffer(Firstbuf, Currentbuf);
+ if (!buf) {
+ if (i == 0)
+ return;
+ break;
+ }
+ Currentbuf = buf;
+ }
+ displayBuffer(Currentbuf, B_FORCE_REDRAW);
+}
+
+/* go to the previous bufferr */
+void
+prevBf(void)
+{
+ Buffer *buf;
+ int i;
+
+ for (i = 0; i < PREC_NUM; i++) {
+ buf = Currentbuf->nextBuffer;
+ if (!buf) {
+ if (i == 0)
+ return;
+ break;
+ }
+ Currentbuf = buf;
+ }
+ displayBuffer(Currentbuf, B_FORCE_REDRAW);
+}
+
static int
checkBackBuffer(Buffer *buf)
{
diff --git a/proto.h b/proto.h
@@ -71,6 +71,8 @@ extern void nextR(void);
extern void nextRD(void);
extern void nextD(void);
extern void nextU(void);
+extern void nextBf(void);
+extern void prevBf(void);
extern void backBf(void);
extern void deletePrevBuf(void);
extern void goURL(void);
diff --git a/scripts/w3mhelp.cgi.in b/scripts/w3mhelp.cgi.in
@@ -131,7 +131,7 @@ for $otherlang (@docdirs) {
split(" ", "goURL gorURL tabURL tabrURL ldfile readsh pipesh"));
&show_keymap("Buffer operation",
- split(" ", "backBf selMn selBuf vwSrc svSrc svBuf
+ split(" ", "backBf nextBf prevBf selMn selBuf vwSrc svSrc svBuf
editBf editScr reload rdrwSc dispI stopI"));
&show_keymap("Tab operation",
