- Dillo-dev - lists.mailman3.com

Re: [WIP PATCH] Use SIGUSR1 to reload the page

by a1ex＠dismail.de

Hi, On Mon, 2 Sep 2024 21:25:12 +0200 Rodrigo Arias <rodarima(a)gmail.com> wrote: > You need to find a pointer to BrowserWindow and pass it to > a_UIcmd_reload(). Check a_Bw_num() and a_Bw_get() in src/bw.c. > > We should reload the current page on all windows. > > I'm not sure if we can do this from the context of a signal, we > probably need to register a timeout in FLTK and handle it from there. > > Probably not a very easy issue. I didn't get much further with this yet, but in the meantime, here is a very simple example script which attempts to achieve the same goal. It opens the specified file in a new Dillo window and then automatically reloads the page whenever the file changes. Note that it only reloads the active tab. This relies on the 'entr' and 'xdotool' programs, but 'entr' can be easily replaced with a bit more scripting if desired. ```` #!/bin/sh # dillomon.sh # Monitor a local file for changes with Dillo # usage: dillomon.sh filename dillo $1 & sleep 1 echo $1 | entr xdotool key --window `xdotool search --classname Dillo | tail -1` ctrl+r ```` Regards, Alex

Sept. 11, 2024

Re: [PATCH] make downloads.dpi use http_user_agent from dillorc

by Rodrigo Arias

On Tue, Sep 03, 2024 at 01:51:18PM +0200, a1ex(a)dismail.de wrote: >Hi, > >Here is a patch which allows wget called from downloads.dpi to use the >user agent provided in dillorc, and fallback to the hardcoded >Dillo/version agent if not defined. Thanks Alex!, I'll queue it. Best, Rodrigo.

Sept. 9, 2024

Re: Queue Downloads

by a1ex＠dismail.de

> Also, if you want to make this portable so it works on other shells > than just bash, you can do something like this to get the port number: > > echo $a | cut -f4- -d"'" | rev | cut -c 5- | rev > > There are probably other ways to do it using sed, etc. Here is a sed equivalent, which might be a more conventional approach: $ echo $a <cmd='send_data' msg='12345' '> $ echo $a | sed "s/^.*msg=[']$[^']*$['].*$/\1/" 12345 -Alex

Sept. 6, 2024

Re: Queue Downloads

by a1ex＠dismail.de

On Fri, 6 Sep 2024 00:06:41 +0200 Diego <darkspirit5000(a)gmail.com> wrote: > I see same when do use filename without a path. I think download.dpi > needs a filename with one path-segment or more. > > Send script v0.2 with a workarround (prefix "./" if there is not a "/" > in filename) That works. It might be nice to set a default download location, and also automatically get the filename from the url with basename. Also, if you want to make this portable so it works on other shells than just bash, you can do something like this to get the port number: echo $a | cut -f4- -d"'" | rev | cut -c 5- | rev There are probably other ways to do it using sed, etc. I attached a quick and probably incomplete example which incorporates these ideas :) Regards, Alex

Sept. 6, 2024

Re: Queue Downloads

by Diego

I see same when do use filename without a path. I think download.dpi needs a filename with one path-segment or more. Send script v0.2 with a workarround (prefix "./" if there is not a "/" in filename) Best, Diego! El jue, 5 sept 2024 a las 15:17, <a1ex(a)dismail.de> escribió: > > Hi Diego, > > On Wed, 4 Sep 2024 18:17:42 +0200 > Diego <darkspirit5000(a)gmail.com> wrote: > > > Hello, maybe this script can be useful to someone. > > > > Requests downloads.dpi to download a URL to a file. He talks to dpid > > like dillo does. > > > > I think it's also a useful coding exercise. > > Nice, looks like a fun experiment! I think it's neat to be able to > interact with dpid outside of Dillo, and possibly could aid in > troubleshooting dpi development issues in future. > > The script seems to work fine, except the filename in the download > window just shows '??'. Do you get that as well? > > Regards, > Alex > > _______________________________________________ > Dillo-dev mailing list -- dillo-dev(a)mailman3.com > To unsubscribe send an email to dillo-dev-leave(a)mailman3.com

Sept. 5, 2024

Re: Queue Downloads

by a1ex＠dismail.de

Hi Diego, On Wed, 4 Sep 2024 18:17:42 +0200 Diego <darkspirit5000(a)gmail.com> wrote: > Hello, maybe this script can be useful to someone. > > Requests downloads.dpi to download a URL to a file. He talks to dpid > like dillo does. > > I think it's also a useful coding exercise. Nice, looks like a fun experiment! I think it's neat to be able to interact with dpid outside of Dillo, and possibly could aid in troubleshooting dpi development issues in future. The script seems to work fine, except the filename in the download window just shows '??'. Do you get that as well? Regards, Alex

Sept. 5, 2024

Queue Downloads

by Diego

Hello, maybe this script can be useful to someone. Requests downloads.dpi to download a URL to a file. He talks to dpid like dillo does. I think it's also a useful coding exercise. I'm bad at naming so if someone has a better name ^_^¡ Best, Diego!

Sept. 4, 2024

[PATCH] make downloads.dpi use http_user_agent from dillorc

by a1ex＠dismail.de

Hi, Here is a patch which allows wget called from downloads.dpi to use the user agent provided in dillorc, and fallback to the hardcoded Dillo/version agent if not defined. Regards, Alex diff -upr a/dlib/dlib.c b/dlib/dlib.c --- a/dlib/dlib.c Sun Aug 11 22:21:59 2024 +++ b/dlib/dlib.c Tue Sep 3 13:49:00 2024 @@ -922,6 +922,45 @@ char *dGethomedir (void) } /** + * Return the http_user_agent value in a static string + */ +char *dGetuseragent (void) +{ + static char *dillorc = NULL; + dillorc = dStrconcat(dGethomedir(), "/", ".dillo/dillorc", NULL); + FILE *In; + int len; + char *rcline = NULL, *value = NULL, *p; + if ((In = fopen(dillorc, "r")) == NULL) { + DLIB_MSG("dGetuseragent: unable to open dillorc.\n"); + return ("Dillo/" VERSION); + } + while ((rcline = dGetline(In)) != NULL) { + if (strncmp(rcline, "http_user_agent", 15) == 0) + break; + dFree(rcline); + } + fclose(In); + if (!rcline) { + value = ("Dillo/" VERSION); + DLIB_MSG("dGetuseragent: no 'http_user_agent' in dillorc.\n"); + } else { + len = (int) strlen(rcline); + if (len && rcline[len - 1] == '\n') + rcline[len - 1] = 0; + if ((p = strchr(rcline, '='))) { + while (*++p == ' '); + value = dStrdup(p); + } else { + value = ("Dillo/" VERSION); + DLIB_MSG("dGetuseragent: error parsing value in dillorc.\n"); + } + } + dFree(rcline); + return (value); +} + +/** * Get a line from a FILE stream. * Return value: read line on success, NULL on EOF. */ diff -upr a/dlib/dlib.h b/dlib/dlib.h --- a/dlib/dlib.h Sun Aug 11 22:21:59 2024 +++ b/dlib/dlib.h Tue Sep 3 13:49:00 2024 @@ -175,6 +175,7 @@ void dLib_show_messages(bool_t show); */ char *dGetcwd(void); char *dGethomedir(void); +char *dGetuseragent(void); char *dGetline(FILE *stream); int dClose(int fd); int dUsleep(unsigned long us); diff -upr a/dpi/downloads.cc b/dpi/downloads.cc --- a/dpi/downloads.cc Sun Aug 11 22:21:59 2024 +++ b/dpi/downloads.cc Tue Sep 3 13:49:06 2024 @@ -45,6 +45,7 @@ #include "config.h" #include "dpiutil.h" #include "../dpip/dpip.h" +#include "../dlib/dlib.h" /* * Debugging macros @@ -324,7 +325,7 @@ DLItem::DLItem(const char *full_filename, const char * cookies_path = dStrconcat(dGethomedir(), "/.dillo/cookies.txt", NULL); dl_argv = new char*[10]; int i = 0; - const char *user_agent = "Dillo/" VERSION; + const char *user_agent = dGetuseragent(); dl_argv[i++] = (char*)"wget"; if (stat(fullname, &ss) == 0) init_bytesize = (int)ss.st_size;

Sept. 3, 2024

Re: [WIP PATCH] Use SIGUSR1 to reload the page

by Rodrigo Arias

Hi, On Mon, Sep 02, 2024 at 04:04:30PM +0200, a1ex(a)dismail.de wrote: >Hi Rodrigo, > >I find your recent idea[0] to refresh the page on local file changes >interesting, and it could be a quite useful feature. > >[0] https://github.com/dillo-browser/dillo/issues/255 > >I imagine it can be triggered with a tool like entr[1]: > >ls /tmp/test.html | entr 'pkill -SIGUSR1 dillo' > >[1] http://eradman.com/entrproject/ Yeah, that was the idea. >So far, I have a working signal handler which will act upon receipt of >a SIGUSR1 signal. It just prints the signal # to the console right now. >I am trying to make it perform an 'a_UIcmd_reload', but haven't been >successful yet: > >dillo.cc:389:19: error: use of undeclared identifier 'vbw' > a_UIcmd_reload(*vbw); > ^ >1 error generated You need to find a pointer to BrowserWindow and pass it to a_UIcmd_reload(). Check a_Bw_num() and a_Bw_get() in src/bw.c. We should reload the current page on all windows. I'm not sure if we can do this from the context of a signal, we probably need to register a timeout in FLTK and handle it from there. Probably not a very easy issue. I should start labeling the ones that are easy. Best, Rodrigo.

Sept. 2, 2024

[WIP PATCH] Use SIGUSR1 to reload the page

by a1ex＠dismail.de

Hi Rodrigo, I find your recent idea[0] to refresh the page on local file changes interesting, and it could be a quite useful feature. [0] https://github.com/dillo-browser/dillo/issues/255 I imagine it can be triggered with a tool like entr[1]: ls /tmp/test.html | entr 'pkill -SIGUSR1 dillo' [1] http://eradman.com/entrproject/ So far, I have a working signal handler which will act upon receipt of a SIGUSR1 signal. It just prints the signal # to the console right now. I am trying to make it perform an 'a_UIcmd_reload', but haven't been successful yet: dillo.cc:389:19: error: use of undeclared identifier 'vbw' a_UIcmd_reload(*vbw); ^ 1 error generated bw.h and uicmd.hh are defined in dillo.cc, so its probably a skill issue on my end :) Any hints would be appreciated! Regards, Alex --- a/src/dillo.cc Sun Aug 11 22:21:59 2024 +++ b/src/dillo.cc Mon Sep 2 14:21:08 2024 @@ -381,6 +381,14 @@ static DilloUrl *makeStartUrl(char *str, bool local) } /* + * Use SIGUSR1 to reload the page + */ +static void reload_handler(int signum) +{ + MSG("signum=%d\n\n", signum); +} + +/* * MAIN */ int main(int argc, char **argv) @@ -579,6 +587,10 @@ int main(int argc, char **argv) a_Url_free(start_url); } } + + // Reload page on SIGUSR1 + if (signal (SIGUSR1, reload_handler) == SIG_IGN) + signal (SIGUSR1, SIG_IGN); Fl::run();

Sept. 2, 2024