aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog9
-rw-r--r--display.c13
-rw-r--r--image.c4
3 files changed, 19 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 53983a9..7a86c01 100644
--- 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
@@ -6892,4 +6899,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.721 2003/01/28 16:40:58 ukai Exp $
+$Id: ChangeLog,v 1.722 2003/01/28 16:45:15 ukai Exp $
diff --git a/display.c b/display.c
index a038566..9f9d028 100644
--- a/display.c
+++ b/display.c
@@ -1,4 +1,4 @@
-/* $Id: display.c,v 1.57 2003/01/24 17:34:36 ukai Exp $ */
+/* $Id: display.c,v 1.58 2003/01/28 16:45:18 ukai Exp $ */
#include <signal.h>
#include "fm.h"
@@ -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
index 5c0e2e8..aa8942d 100644
--- a/image.c
+++ b/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.29 2003/01/28 16:46:54 ukai Exp $ */
+/* $Id: image.c,v 1.28 2003/01/28 16:45:19 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
@@ -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;