diff options
| author | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-01-29 17:10:17 +0000 |
|---|---|---|
| committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-01-29 17:10:17 +0000 |
| commit | b0a661730f022b85ef0dfd6244a7cef05357856d (patch) | |
| tree | 1455f40baac66a86894f2f8eb969c93c62e2ff1e /display.c | |
| parent | [w3m-dev 03707] Don't stop loading image when moving to next page. (diff) | |
| download | w3m-b0a661730f022b85ef0dfd6244a7cef05357856d.tar.gz w3m-b0a661730f022b85ef0dfd6244a7cef05357856d.zip | |
[w3m-dev 03708] Re: Don't stop loading image when moving to next page.
* config.h.dist (lstat): define ifndef HAVE_LSTAT
* configure (config.h) ditto
* display.c (fmTerm): new loadImage
(save_current_buf): only ifdef USE_BUFINFO
(displayBuffer): new loadImage
* etc.c (setup_child): TrapSignal
* file.c (loadGeneralFile): TRAP_OFF, TRAP_ON
(loadHTMLstream): ditto
(loadGopherDir): ditto
(loadBuffer): ditto
(loadImageBuffer): ditto
(getNextPage): ditto
(save2tmp): ditto
* fm.h (TrapSignal): added
(TRAP_ON): added
(TRAP_OFF): added
* form.c (HAVE_LSTAT): deleted
* frame.c (createFrameFile): TRAP_OFF, TRAP_ON
* image.c (image_buffer): added
(deleteImage): new loadImage
(getAllImage): initialize image_buffer
(loadImage): rewrite
* main.c (main): new loadImage
(checkDownloadList): remove ifdef HAVE_LSTAT
* news.c (loadNwesgroup): TRAP_ON, TRAP_OFF
* proto.h (loadImage): add buf arg
* url.c (openSocket): TRAP_ON, TRAP_OFF
(check_no_proxy): TRAP_ON, TRAP_OFF
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
Diffstat (limited to 'display.c')
| -rw-r--r-- | display.c | 18 |
1 files changed, 5 insertions, 13 deletions
@@ -1,4 +1,4 @@ -/* $Id: display.c,v 1.58 2003/01/28 16:45:18 ukai Exp $ */ +/* $Id: display.c,v 1.59 2003/01/29 17:10:27 ukai Exp $ */ #include <signal.h> #include "fm.h" @@ -164,7 +164,7 @@ fmTerm(void) refresh(); #ifdef USE_IMAGE if (activeImage) - loadImage(IMG_FLAG_STOP); + loadImage(NULL, IMG_FLAG_STOP); #endif #ifdef USE_MOUSE if (use_mouse) @@ -210,7 +210,7 @@ static int graph_mode = 0; static Linecolor color_mode = 0; #endif -#if defined(USE_BUFINFO) || defined(USE_IMAGE) +#ifdef USE_BUFINFO static Buffer *save_current_buf = NULL; #endif @@ -431,10 +431,7 @@ displayBuffer(Buffer *buf, int mode) if (draw_image_flag) clear(); clearImage(); - if (buf != save_current_buf) - loadImage(IMG_FLAG_STOP); - else - loadImage(IMG_FLAG_START); + loadImage(buf, IMG_FLAG_STOP); image_touch++; draw_image_flag = FALSE; } @@ -472,17 +469,12 @@ displayBuffer(Buffer *buf, int mode) refresh(); #ifdef USE_IMAGE if (activeImage && displayImage && buf->img) { - /* - * loadImage(IMG_FLAG_START); - */ drawImage(); } #endif -#if defined(USE_BUFINFO) || defined(USE_IMAGE) - if (buf != save_current_buf) { #ifdef USE_BUFINFO + if (buf != save_current_buf) { saveBufferInfo(); -#endif save_current_buf = buf; } #endif |