aboutsummaryrefslogtreecommitdiffstats
path: root/frame.c
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2003-01-29 17:10:17 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2003-01-29 17:10:17 +0000
commitb0a661730f022b85ef0dfd6244a7cef05357856d (patch)
tree1455f40baac66a86894f2f8eb969c93c62e2ff1e /frame.c
parent[w3m-dev 03707] Don't stop loading image when moving to next page. (diff)
downloadw3m-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 'frame.c')
-rw-r--r--frame.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/frame.c b/frame.c
index 11b863b..ae8e83b 100644
--- a/frame.c
+++ b/frame.c
@@ -1,4 +1,4 @@
-/* $Id: frame.c,v 1.30 2003/01/20 15:30:20 ukai Exp $ */
+/* $Id: frame.c,v 1.31 2003/01/29 17:10:39 ukai Exp $ */
#include "fm.h"
#include "parsetagx.h"
#include "myctype.h"
@@ -424,15 +424,10 @@ createFrameFile(struct frameset *f, FILE * f1, Buffer *current, int level,
if (level == 0) {
if (SETJMP(AbortLoading) != 0) {
- if (fmInitialized)
- term_raw();
- signal(SIGINT, prevtrap);
+ TRAP_OFF;
return -1;
}
- prevtrap = signal(SIGINT, KeyAbort);
- if (fmInitialized)
- term_cbreak();
-
+ TRAP_ON;
f->name = "_top";
}
@@ -852,9 +847,7 @@ createFrameFile(struct frameset *f, FILE * f1, Buffer *current, int level,
fputs("</table>\n", f1);
if (level == 0) {
fputs("</body></html>\n", f1);
- signal(SIGINT, prevtrap);
- if (fmInitialized)
- term_raw();
+ TRAP_OFF;
}
return 0;
}