aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2002-04-17 02:36:45 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2002-04-17 02:36:45 +0000
commitb7f12d8798c43c08b6ced3b10c0f4b53ac857c1d (patch)
treea08d76c652959f44ca57cb6cad87bd24002a0a62
parent[w3m-dev 03176] no Content-Type in http response header (diff)
downloadw3m-b7f12d8798c43c08b6ced3b10c0f4b53ac857c1d.tar.gz
w3m-b7f12d8798c43c08b6ced3b10c0f4b53ac857c1d.zip
[w3m-dev 03177] SIGUSR1 --> W3M_SIGIMG in image.c
* image.c (W3M_SIGIMG): added (load_image_handler): s/SIGUSR1/W3M_SIGIMG/ (load_image_next): ditto (loadImage): ditto From: Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
-rw-r--r--ChangeLog10
-rw-r--r--image.c16
2 files changed, 19 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a77261..4f3187a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2002-04-17 Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
+ * [w3m-dev 03177] SIGUSR1 --> W3M_SIGIMG in image.c
+ * image.c (W3M_SIGIMG): added
+ (load_image_handler): s/SIGUSR1/W3M_SIGIMG/
+ (load_image_next): ditto
+ (loadImage): ditto
+
+2002-04-17 Kiyokazu SUTO <suto@ks-and-ks.ne.jp>
+
* [w3m-dev 03176] no Content-Type in http response header
* file.c (loadGeneralFile): guess content-type from filename
@@ -3345,4 +3353,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.370 2002/04/17 02:32:13 ukai Exp $
+$Id: ChangeLog,v 1.371 2002/04/17 02:36:45 ukai Exp $
diff --git a/image.c b/image.c
index 00fe158..3d2921a 100644
--- a/image.c
+++ b/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.8 2002/03/06 03:32:11 ukai Exp $ */
+/* $Id: image.c,v 1.9 2002/04/17 02:36:45 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
@@ -12,6 +12,10 @@
#ifdef USE_IMAGE
+#ifndef W3M_SIGIMG
+#define W3M_SIGIMG (SIGUSR1)
+#endif
+
static int image_index = 0;
/* display image */
@@ -279,7 +283,7 @@ static MySignalHandler
load_image_handler(SIGNAL_ARG)
{
need_load_image = TRUE;
- signal(SIGUSR1, load_image_handler);
+ signal(W3M_SIGIMG, load_image_handler);
SIGNAL_RETURN;
}
@@ -287,7 +291,7 @@ static MySignalHandler
load_image_next(SIGNAL_ARG)
{
need_load_image = TRUE;
- signal(SIGUSR1, load_image_handler);
+ signal(W3M_SIGIMG, load_image_handler);
loadImage(IMG_FLAG_NEXT);
SIGNAL_RETURN;
}
@@ -446,7 +450,7 @@ loadImage(int flag)
if (image_lock)
unlink(image_lock);
need_load_image = FALSE;
- signal(SIGUSR1, load_image_handler);
+ signal(W3M_SIGIMG, load_image_handler);
if (!image_list)
return;
@@ -506,7 +510,7 @@ loadImage(int flag)
exit(0);
fclose(f);
#endif
- kill(getppid(), SIGUSR1);
+ kill(getppid(), W3M_SIGIMG);
}
exit(0);
}
@@ -517,7 +521,7 @@ loadImage(int flag)
}
load_image_end:
if (flag == IMG_FLAG_NEXT)
- signal(SIGUSR1, load_image_next);
+ signal(W3M_SIGIMG, load_image_next);
}
ImageCache *