- Dillo-dev - lists.mailman3.com

[patch] Gopher DPI

by p37sitdu＠lavabit.com

On Sat, Dec 15, 2012 at 09:27:14PM +0100, Johannes Hofmann wrote: I have added setbuf(fp, NULL) instead. Fixed patch is attaced. > Took me quite a while to figure this out ... > Anyway, with these tiny modifications it works nice for me and I'd > like to commit it. Let me know when you think it's ready. I think attached patch is ready to be commited, I will develop code that changes dillo internals (DPI api) as a separate patch.

Dec. 15, 2012

[patch] Gopher DPI

by p37sitdu＠lavabit.com

Now search works properly. URL looks like gopher://gopher.floodgap.com:70/7/v2/vs?query=dillo, but ?query is replaced with %09 internally. I have not found the way to make redirect. The patch is ready to be commited and should not break anything as it is a separate DPI that is only called for gopher URLs. I will try to implement search without forms by adding input dialogs as a separate patch in my patch queue on top of it. User experience will be similar to lynx: you open the page and then browser asks you for search query. Also patch for src/IO/dpi.c is attached to make Dpi_parse_token more robust as I accedently made it segfault during development of gopher DPI.

Dec. 15, 2012

[patch] Gopher DPI

by Johannes.Hofmann＠gmx.de

very cool! To get it working on DragonFlyBSD I had to add a fflush() after the fprintf() on the socket. Also the fdopen() flags had to be changed to w+ (from man page: ``w+'' Open for reading and writing.). Otherwise the fflush() doesn't work. There is the following comment in the fflush code: /* * There is disagreement about the correct behaviour of * fflush() * when passed a file which is not open for reading. * According to * the ISO C standard, the behaviour is undefined. * Under linux, such an fflush returns success and has no * effect; * under Windows, such an fflush is documented as behaving * instead * as fpurge(). * Given that applications may be written with the * expectation of * either of these two behaviours, the only safe * (non-astonishing) * option is to return EBADF and ask that applications be * fixed. */ Took me quite a while to figure this out ... Anyway, with these tiny modifications it works nice for me and I'd like to commit it. Let me know when you think it's ready. Cheers, Johannes

Dec. 15, 2012

[patch] Gopher DPI

by p37sitdu＠lavabit.com

I am trying to make search work. Now (latest version of patch is included) I process type '7' (FullText search) is the same as '1'. So link "Search Veronica-2" on [1]/ is just a link that leads to [2]. Search terms can be added manually, like [3]. It works and it is what gopher URI Scheme RFC4266 says. DPI dialogs don't support text input, though it should not be hard to add. Another option is HTML forms and redirections. [1] gopher://gopherproject.org:70/1/ [2] gopher://gopher.floodgap.com:70/7/v2/vs [3] gopher://gopher.floodgap.com:70/7/v2/vs%09dillo

Dec. 15, 2012

[patch] Gopher DPI

by p37sitdu＠lavabit.com

Updated patch a little to support URLs without path (like gopher://gopher.quux.org) Made functions static, added newlines to messages etc.

Dec. 15, 2012

Fwd: Re: Dillo early exit

by corvid＠lavabit.com

Sebastian wrote: > However, IMO there should be a conversion to clean UTF-8 so that only > a small part of dillo should have to bother about such problems, while > most parts can rely on clean UTF-8. (Something to consider after the > release.) I just checked whether we could get free stripping of non-utf-8 by asking iconv to convert from utf-8 to utf-8 when that's the claimed charset, but unsurprisingly it didn't do anything.

Dec. 15, 2012

[patch] Gopher DPI

by abe＠deuxchevaux.org

Hi, On Sat, Dec 15, 2012 at 07:24:23PM +0400, p37sitdu at lavabit.com wrote: > I implemented basic Gopher support using DPI, patch is attached. It is > already quite usable. Yay, very cool! Looking forward to see it in the next release! :-) Kind regards, Axel -- /~\ Plain Text Ribbon Campaign | Axel Beckert \ / Say No to HTML in E-Mail and News | abe at deuxchevaux.org (Mail) X See http://www.asciiribbon.org/ | abe at noone.org (Mail+Jabber) / \ I love long mails: http://email.is-not-s.ms/ | http://noone.org/abe/ (Web)

Dec. 15, 2012

[patch] Gopher DPI

by p37sitdu＠lavabit.com

I implemented basic Gopher support using DPI, patch is attached. It is already quite usable. "URL:" links are not supported, but Gopher servers send redirect pages for compatibility. The only major problem is unrecognized file types. I looked at FTP DPI. It sends Content-type: application/octet-stream. This forces Dillo to ask downloads DPI to start download. With gopher it doesn't work as downloads DPI doesn't suppport gopher. So Dillo just says "Content-Type 'application/octet-stream' not viewable.". I left it as it is for now, because I don't think adding support for all known and unknown protocols into downloads.cc is the right solution. Maybe downloads DPI protocol should be changed so Dillo would feed plugin with data it receives as octet-stream and downloads DPI would only save what it receives to disk instead of connecting to server and downloading the file itself.

Dec. 15, 2012

Fwd: Re: Dillo early exit

by sgeerken＠dillo.org

On Fri, Dec 14, Jorge Arellano Cid wrote: > On Fri, Dec 14, 2012 at 04:48:23PM +0100, Sebastian Geerken wrote: > > The HTML parser passes invalid UTF-8 to dw::Textblock. I will make > > nextUtf8Char more robust (of course, dillo should not crash), but > > Jorge's page is HTML, encoded in ISO-8859-1, not UTF-8, as seen here: > > > > 000009b0 34 38 22 3e 2d 20 4b 65 79 73 74 72 6f 6b 65 20 |48">- Keystroke | > > 000009c0 4c 6f 67 67 69 6e 67 20 77 69 74 68 20 42 65 61 |Logging with Bea| > > 000009d0 63 6f 6e 20 ab 20 53 74 72 61 74 65 67 69 63 20 |con . Strategic | > > ^^ > > > > It seems that the Fltk functions do some checks, and sometimes decode > > as ISO-8859-1. > > AFAIR from comments in fltk, some utf8 functions dealt with mixed > latin1, utf8 and some windows codec. > > They got into it because the mix was inevitable for them. I've modified my code so that it works in a similar way, but I've not yet cared about the differences between ISO-8859-1, ISO-8859-15, and Windows-1252. Anyway these differences are marginal. However, IMO there should be a conversion to clean UTF-8 so that only a small part of dillo should have to bother about such problems, while most parts can rely on clean UTF-8. (Something to consider after the release.) Sebastian

Dec. 15, 2012

Fwd: Re: Patch for xembed (updated for resize) FIXED!!

by podarcis＠lavabit.com

Damn, something went wrong with pasting in the patch. Here the complete patch, sorry. --- diff -r 52633c6c3fc6 src/xembed.cc --- a/src/xembed.cc Wed Dec 12 19:40:33 2012 +0000 +++ b/src/xembed.cc Sat Dec 15 11:49:23 2012 +0100 @@ -21,93 +21,49 @@ #ifdef X_PROTOCOL -typedef enum { - XEMBED_EMBEDDED_NOTIFY = 0, - XEMBED_WINDOW_ACTIVATE = 1, - XEMBED_WINDOW_DEACTIVATE = 2, - XEMBED_REQUEST_FOCUS = 3, - XEMBED_FOCUS_IN = 4, - XEMBED_FOCUS_OUT = 5, - XEMBED_FOCUS_NEXT = 6, - XEMBED_FOCUS_PREV = 7, - XEMBED_GRAB_KEY = 8, - XEMBED_UNGRAB_KEY = 9, - XEMBED_MODALITY_ON = 10, - XEMBED_MODALITY_OFF = 11, -} XEmbedMessageType; - -void -Xembed::setXembedInfo(unsigned long flags) -{ - unsigned long buffer[2]; - - Atom xembed_info_atom = XInternAtom (fl_display, "_XEMBED_INFO", false); - - buffer[0] = 1; - buffer[1] = flags; - - XChangeProperty (fl_display, - xid, - xembed_info_atom, xembed_info_atom, 32, - PropModeReplace, - (unsigned char *)buffer, 2); +void Xembed::update_size() { + XWindowAttributes winAttributes; + XGetWindowAttributes( fl_display, xid, &winAttributes ); + int width = winAttributes.width; + int height = winAttributes.height; + update_size(width, height); } -void -Xembed::sendXembedEvent(uint32_t message) { - XClientMessageEvent xclient; - - memset (&xclient, 0, sizeof (xclient)); - xclient.window = xid; - xclient.type = ClientMessage; - xclient.message_type = XInternAtom (fl_display, "_XEMBED", false); - xclient.format = 32; - xclient.data.l[0] = fl_event_time; - xclient.data.l[1] = message; - - XSendEvent(fl_display, xid, False, NoEventMask, (XEvent *)&xclient); - XSync(fl_display, False); +void Xembed::update_size(int width, int height) { + if (w() != width || h() != height) + { + resize(x(), y(), width, height); + redraw(); + } } -int -Xembed::handle(int e) { - if (e == FL_PUSH) - sendXembedEvent(XEMBED_REQUEST_FOCUS); - - return Fl_Window::handle(e); -} - +static Xembed *xembed = 0; static int event_handler(int e, Fl_Window *w) { - Atom xembed_atom = XInternAtom (fl_display, "_XEMBED", false); - - if (fl_xevent->type == ClientMessage) { - if (fl_xevent->xclient.message_type == xembed_atom) { - long message = fl_xevent->xclient.data.l[1]; - - switch (message) { - case XEMBED_WINDOW_ACTIVATE: - // Force a ConfigureNotify message so fltk can get the new - // coordinates after a move of the embedder window. - if (w) - w->resize(0,0, w->w(), w->h()); - break; - case XEMBED_WINDOW_DEACTIVATE: - break; - default: - break; - } + if ( fl_xevent->type == ConfigureNotify ) + { + XConfigureEvent *xcfg = (XConfigureEvent *)fl_xevent; + uint32_t xid = xcfg->window; + if (xembed && xembed->myxid() == xid) + { + xembed->update_size(xcfg->width, xcfg->height); } } - return Fl::handle_(e, w); } // TODO: Implement more XEMBED support; +void Xembed::create() { + xembed = this; + createInternal(xid); + long mask( StructureNotifyMask ); + XSelectInput(fl_display, xid, mask); + Fl::event_dispatch(event_handler); +} + void Xembed::show() { - createInternal(xid); - setXembedInfo(1); - Fl::event_dispatch(event_handler); + Fl_Window::show(); + update_size(); } void Xembed::createInternal(uint32_t parent) { diff -r 52633c6c3fc6 src/xembed.hh --- a/src/xembed.hh Wed Dec 12 19:40:33 2012 +0000 +++ b/src/xembed.hh Sat Dec 15 11:49:23 2012 +0100 @@ -9,15 +9,16 @@ private: uint32_t xid; void createInternal(uint32_t parent); - void setXembedInfo(unsigned long flags); - void sendXembedEvent(uint32_t message); public: Xembed(uint32_t xid, int _w, int _h) : Fl_Window(_w, _h) { - this->xid = xid; + this->xid = xid; create(); }; + uint32_t myxid() const { return xid; } + void create(); void show(); - int handle(int event); + void update_size(); + void update_size( int, int ); }; #endif ---

Dec. 15, 2012