commit f64ba14fdcaa107d0761913c4a0ee201e1d8123c
parent 34fbcf0c966ad9febbfc07d34c6e214fda9c7f57
Author: ukai <ukai>
Date: Fri, 15 Nov 2002 16:14:25 +0000
[w3m-dev 03440] Re: restore alarm event
* fm.h (BP_RELOAD): added
(DOWNLOAD_LIST_TITLE): added
* main.c (main): if BP_RELOAD, do reload
(reload): if buffer is DOWNLOAD_LIST, ldDL()
(DownloadListBuffer): rewrite with DOWNLOAD_LIST_TITLE
(download_action): delete "update"
don't delete prev buffer
(ldDL): rewrite to do reload
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
Diffstat:
3 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,17 @@
2002-11-16 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+ * [w3m-dev 03440] Re: restore alarm event
+ * fm.h (BP_RELOAD): added
+ (DOWNLOAD_LIST_TITLE): added
+ * main.c (main): if BP_RELOAD, do reload
+ (reload): if buffer is DOWNLOAD_LIST, ldDL()
+ (DownloadListBuffer): rewrite with DOWNLOAD_LIST_TITLE
+ (download_action): delete "update"
+ don't delete prev buffer
+ (ldDL): rewrite to do reload
+
+2002-11-16 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
* [w3m-dev 03439] restore alarm event
* fm.h (AL_RESTORE): added
* main.c (alarm_sec): deleted
diff --git a/fm.h b/fm.h
@@ -177,6 +177,7 @@ void bzero(void *, int);
#define BP_NO_URL 0x10
#define BP_REDIRECTED 0x20
#define BP_CLOSE 0x40
+#define BP_RELOAD 0x80
/* Link Buffer */
#define LB_NOLINK -1
@@ -466,6 +467,7 @@ typedef struct _DownloadList {
struct _DownloadList *next;
struct _DownloadList *prev;
} DownloadList;
+#define DOWNLOAD_LIST_TITLE "Download List Panel"
#define COPY_BUFPOSITION(dstbuf, srcbuf) {\
(dstbuf)->topLine = (srcbuf)->topLine; \
diff --git a/main.c b/main.c
@@ -986,6 +986,8 @@ main(int argc, char **argv, char **envp)
mouse_active();
#endif /* USE_MOUSE */
#ifdef USE_ALARM
+ if (Currentbuf->bufferprop & BP_RELOAD)
+ setAlarmEvent(1, AL_IMPLICIT, FUNCNAME_reload, NULL);
if (CurrentAlarm.status & AL_IMPLICIT) {
CurrentAlarm.buffer = Currentbuf;
CurrentAlarm.status = AL_IMPLICIT_DONE
@@ -4334,6 +4336,10 @@ reload(void)
int multipart;
if (Currentbuf->bufferprop & BP_INTERNAL) {
+ if (!strcmp(Currentbuf->buffername, DOWNLOAD_LIST_TITLE)) {
+ ldDL();
+ return;
+ }
disp_err_message("Can't reload...", FALSE);
return;
}
@@ -5809,10 +5815,9 @@ DownloadListBuffer(void)
if (!FirstDL)
return NULL;
cur_time = time(0);
- src = Strnew_charp("<html><head><title>Download Panel</title></head>\
-<body><h1 align=center>Download Panel</h1>\
-<form method=internal action=download>\
-<input type=submit name=update value=Update><hr>\n");
+ src = Strnew_charp("<html><head><title>" DOWNLOAD_LIST_TITLE \
+"</title></head>\n<body><h1 align=center>" DOWNLOAD_LIST_TITLE "</h1>\n" \
+"<form method=internal action=download><hr>\n");
for (d = LastDL; d != NULL; d = d->prev) {
#ifdef HAVE_LSTAT
if (lstat(d->lock, &st))
@@ -5888,9 +5893,7 @@ download_action(struct parsed_tagarg *arg)
pid_t pid;
for (; arg; arg = arg->next) {
- if (!strcmp(arg->arg, "update"))
- break;
- else if (!strncmp(arg->arg, "stop", 4)) {
+ if (!strncmp(arg->arg, "stop", 4)) {
pid = (pid_t) atoi(&arg->arg[4]);
kill(pid, SIGKILL);
}
@@ -5913,10 +5916,8 @@ download_action(struct parsed_tagarg *arg)
}
}
}
- if (FirstDL) {
+ if (FirstDL)
ldDL();
- deletePrevBuf();
- }
else
backBf();
}
@@ -5940,8 +5941,27 @@ stopDownload(void)
void
ldDL(void)
{
+ Buffer *prev = Currentbuf;
+ int delete = FALSE;
+#ifdef USE_ALARM
+ int reload;
+#endif
+
if (!FirstDL)
return;
+ if (Currentbuf->bufferprop & BP_INTERNAL &&
+ !strcmp(Currentbuf->buffername, DOWNLOAD_LIST_TITLE))
+ delete = TRUE;
+#ifdef USE_ALARM
+ reload = checkDownloadList();
+#endif
cmd_loadBuffer(DownloadListBuffer(), BP_NO_URL, LB_NOLINK);
- nextA();
+ if (delete && Currentbuf != prev)
+ deletePrevBuf();
+#ifdef USE_ALARM
+ if (reload && Currentbuf != prev) {
+ Currentbuf->bufferprop |= BP_RELOAD;
+ setAlarmEvent(1, AL_IMPLICIT, FUNCNAME_reload, NULL);
+ }
+#endif
}
