w3m

commit 9e5b4c72d2c9b849f9dd2b9fa8c5bfba3bb198af
parent fd0fd0ad27cfd43d2041dd0842fd9cf4b0bd841b
Author: ukai <ukai>
Date:   Tue, 28 Jan 2003 16:45:15 +0000

[w3m-dev 03707] Don't stop loading image when moving to next page.
* display.c (save_current_buf): required when defined USE_IMAGE
	(displayBuffer): stop only buffer changed
* image.c (loadImage): IMG_FLAG_START load from maxLoadImage
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
display.c
 | 
11
++++++++---
M
image.c
 | 
2
+-

3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,12 @@
 2003-01-29  NAKAJIMA Mikio <minakaji@osaka.email.ne.jp>
 
+	* [w3m-dev 03707] Don't stop loading image when moving to next page.
+	* display.c (save_current_buf): required when defined USE_IMAGE
+		(displayBuffer): stop only buffer changed
+	* image.c (loadImage): IMG_FLAG_START load from maxLoadImage
+
+2003-01-29  NAKAJIMA Mikio <minakaji@osaka.email.ne.jp>
+
 	* [w3m-dev 03706] X-Image-URL: support, bug fix of reshapeBuffer()
 	* buffer.c (reshapeBuffer): rewrite
 	* file.c (readHeader): rewrite
diff --git a/display.c b/display.c
@@ -210,7 +210,7 @@ static int graph_mode = 0;
 static Linecolor color_mode = 0;
 #endif
 
-#ifdef USE_BUFINFO
+#if defined(USE_BUFINFO) || defined(USE_IMAGE)
 static Buffer *save_current_buf = NULL;
 #endif
 
@@ -431,7 +431,10 @@ displayBuffer(Buffer *buf, int mode)
 		if (draw_image_flag)
 		    clear();
 		clearImage();
-		loadImage(IMG_FLAG_STOP);
+		if (buf != save_current_buf)
+		    loadImage(IMG_FLAG_STOP);
+		else
+		    loadImage(IMG_FLAG_START);
 		image_touch++;
 		draw_image_flag = FALSE;
 	    }
@@ -475,9 +478,11 @@ displayBuffer(Buffer *buf, int mode)
 	drawImage();
     }
 #endif
-#ifdef USE_BUFINFO
+#if defined(USE_BUFINFO) || defined(USE_IMAGE)
     if (buf != save_current_buf) {
+#ifdef USE_BUFINFO
 	saveBufferInfo();
+#endif
 	save_current_buf = buf;
     }
 #endif
diff --git a/image.c b/image.c
@@ -340,7 +340,7 @@ loadImage(int flag)
 	    i = 0;
 	else
 	    i = maxLoadImage;
-	for (; i < n_load_image; i++) {
+	for ( ; i < n_load_image; i++) {
 	    cache = image_cache[i];
 	    if (!cache)
 		continue;