[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>

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
@@ -4929,4 +4944,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.538 2002/11/19 17:47:44 ukai Exp $
+$Id: ChangeLog,v 1.539 2002/11/21 16:15:57 ukai Exp $

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	前のページを表示します

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

funcname.tab

@@ -1,4 +1,4 @@
-# $Id: funcname.tab,v 1.13 2002/11/15 15:19:45 ukai Exp $
+# $Id: funcname.tab,v 1.14 2002/11/21 16:15:57 ukai Exp $
 # macro name	function name
 #----------------------------
 @@@		nulcmd
@@ -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

main.c

@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.145 2002/11/19 17:47:59 ukai Exp $ */
+/* $Id: main.c,v 1.146 2002/11/21 16:15:58 ukai Exp $ */
 #define MAINPROGRAM
 #include "fm.h"
 #include <signal.h>
@@ -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)
 {

proto.h

@@ -1,4 +1,4 @@
-/* $Id: proto.h,v 1.56 2002/11/19 17:40:34 ukai Exp $ */
+/* $Id: proto.h,v 1.57 2002/11/21 16:15:58 ukai Exp $ */
 /* 
  *   This file was automatically generated by version 1.7 of cextract.
  *   Manual editing not recommended.
@@ -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);

scripts/w3mhelp.cgi.in

@@ -1,5 +1,5 @@
 #!@PERL@
-# $Id: w3mhelp.cgi.in,v 1.15 2002/11/18 17:43:40 ukai Exp $
+# $Id: w3mhelp.cgi.in,v 1.16 2002/11/21 16:15:59 ukai Exp $
 
 if ( $^O =~ /^(ms)?(dos|win(32|nt)?)/i ) {
   $CYGPATH = 1;
@@ -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",