From 69d9bff2319d5e1952a988c38a44b5ef5562a027 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Wed, 11 Dec 2002 15:07:53 +0000 Subject: [w3m-dev 03559] Re: use select instead of signal for loading images * fm.h (Buffer): add image_loaded * image.c (W3M_SIGIMG): deleted (image_lock): deleted (need_load_image): deleted (load_image_handler): deleted (load_image_next): deleted (getAllImage): check image_loaded (loadImage): delete image_lock delete IMG_FLAG_NEXT * main.c (main): check image_loaded * proto.h (sleep_till_anykey): return int * terms.c (sleep_till_anykey): return int From: Hironori SAKAMOTO --- main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 32078d6..da48229 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.166 2002/12/10 15:53:03 ukai Exp $ */ +/* $Id: main.c,v 1.167 2002/12/11 15:07:53 ukai Exp $ */ #define MAINPROGRAM #include "fm.h" #include @@ -1039,14 +1039,14 @@ main(int argc, char **argv, char **envp) signal(SIGWINCH, resize_handler); #endif #ifdef USE_IMAGE - if (activeImage && displayImage) - loadImage(IMG_FLAG_NEXT); + if (activeImage && displayImage && Currentbuf->img && + !Currentbuf->image_loaded) { + do { + loadImage(IMG_FLAG_NEXT); + } while (sleep_till_anykey(1, 0) <= 0); + } #endif c = getch(); -#ifdef USE_IMAGE - if (activeImage && displayImage) - loadImage(IMG_FLAG_START); -#endif #ifdef SIGWINCH signal(SIGWINCH, resize_hook); #endif -- cgit v1.2.3