- Dillo-dev - lists.mailman3.com

patch: Re: [Dillo-dev] start on image maps (dw-part)

by jcid＠dillo.org

On Tue, Apr 22, 2008 at 04:50:32AM +0000, corvid wrote: > dw: I added motionNotifyImpl() and currLink > > dillo: > - I imagine the setUseMap() in open_img() is probably supposed to be > routed through DilloImage. > - Html_read_coords() was borrowed from 0.8.6 and modified a fair amount. > For one thing, the old code couldn't handle whitespace preceding a comma. > - I didn't really like that dReturn_if_fail so far down in open_area() > since coords is dynamically allocated now, but I left it there. Committed this patch and also scroll_motionNotify.dw2. Shape image-mapped links work so far. Coordinates are not yet being sent. If I missed something, please repost the patch. (I assume this is a work in progress). -- Cheers Jorge.-

April 26, 2008

Re: patch: Accept-Charset: utf-8,*;q=0.8

by jcid＠dillo.org

On Thu, Apr 17, 2008 at 04:57:48PM +0000, corvid wrote: > It is good for dillo to state its preference for UTF-8 > over ISO-8859-1. > > Also, the RFC says that not mentioning '*' puts dillo > in theoretical danger of receiving 406 Not Acceptable. > Committed, assuming: "Accept-Charset: utf-8,*;q=0.8\r\n" means dillo2 leaves the door open to also receive iso-8859-1. -- Cheers Jorge.- > --- dillo2/src/IO/http.c 2008-04-11 19:48:51.000000000 +0000 > +++ dillo2-cur/src/IO/http.c 2008-04-17 16:17:17.000000000 +0000 > @@ -236,7 +236,7 @@ Dstr *a_Http_make_query_str(const DilloU > query, > "POST %s HTTP/1.1\r\n" > "Connection: close\r\n" > - "Accept-Charset: utf-8, iso-8859-1\r\n" > + "Accept-Charset: utf-8,*;q=0.8\r\n" > "Accept-Encoding: gzip\r\n" > "Host: %s%s\r\n" > "%s" > @@ -258,7 +258,7 @@ Dstr *a_Http_make_query_str(const DilloU > "GET %s HTTP/1.1\r\n" > "%s" > "Connection: close\r\n" > - "Accept-Charset: utf-8, iso-8859-1\r\n" > + "Accept-Charset: utf-8,*;q=0.8\r\n" > "Accept-Encoding: gzip\r\n" > "Host: %s%s\r\n" > "%s"

April 26, 2008

patch: image loading on demand for complex button

by jcid＠dillo.org

Hi, Committed. I also changed Html_add_new_linkimage() to take a DilloUrl** parameter, to show it keeps the url. -- Cheers Jorge.-

April 26, 2008

Docs question: dw::core::ui::ListResource::SelectionMode::SELECTION_AT_MOST_ONE

by onepoint＠starurchin.org

On Sat, Apr 26, 2008 at 10:31:51AM +0200, Johannes Hofmann wrote: > On Sat, Apr 26, 2008 at 09:27:01AM +0100, Jeremy Henty wrote: > > > > The description of > > dw::core::ui::ListResource::SelectionMode::SELECTION_AT_MOST_ONE > > does not make sense. Should "The user may not the only selected > > item." read "The user may unselect the only selected item."? > > I guess so. Maybe the comment was copied from > SELECTION_EXACTLY_ONE_BY_USER and "unselect" was deleted instead of > "not"? That's my guess too. If someone comfirms this I'll make a patch. Regards, Jeremy Henty

April 26, 2008

Docs question: dw::core::ui::ListResource::SelectionMode::SELECTION_AT_MOST_ONE

by Johannes.Hofmann＠gmx.de

On Sat, Apr 26, 2008 at 09:27:01AM +0100, Jeremy Henty wrote: > > The description of > dw::core::ui::ListResource::SelectionMode::SELECTION_AT_MOST_ONE does > not make sense. Should "The user may not the only selected item." > read "The user may unselect the only selected item."? I guess so. Maybe the comment was copied from SELECTION_EXACTLY_ONE_BY_USER and "unselect" was deleted instead of "not"? Regards, Johannes

April 26, 2008

Docs question: dw::core::ui::ListResource::SelectionMode::SELECTION_AT_MOST_ONE

by onepoint＠starurchin.org

The description of dw::core::ui::ListResource::SelectionMode::SELECTION_AT_MOST_ONE does not make sense. Should "The user may not the only selected item." read "The user may unselect the only selected item."? Regards, Jeremy Henty

April 26, 2008

dillo-fltk on x86_64

by jcid＠dillo.org

On Fri, Apr 25, 2008 at 04:38:09PM +0200, Johannes Hofmann wrote: > On Fri, Apr 25, 2008 at 10:54:26AM +0200, Justus Winter wrote: > > -----BEGIN PGP SIGNED MESSAGE----- > > Hash: SHA1 > > > > Johannes Hofmann wrote: > > > object.cc:118: error: cast from ?void*? to ?int? loses precision > > > > > > I felt it was nonsense to check the size of void* at runtime and used > > > the preprocessor to choose which instruction to use based on the value > > > of SIZEOF_VOID_P. > > > > > >> I think the idea is that the compiler will optimize out unnecessary > > >> branches. And indeed the assembly code looks like this here: > > > > Ah, I see. But surely I can't be the only one having problems with this > > code? > > > > $ gcc -v > > Using built-in specs. > > Target: x86_64-linux-gnu > > Configured with: ../src/configure -v > > - --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr > > - --enable-shared --with-system-zlib --libexecdir=/usr/lib > > - --without-included-gettext --enable-threads=posix --enable-nls > > - --with-gxx-include-dir=/usr/include/c++/4.2 --program-suffix=-4.2 > > - --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc > > - --enable-mpfr --enable-checking=release --build=x86_64-linux-gnu > > - --host=x86_64-linux-gnu --target=x86_64-linux-gnu > > Thread model: posix > > gcc version 4.2.3 (Ubuntu 4.2.3-2ubuntu7) > > $ uname -a > > Linux thinkbox 2.6.24-15-generic #1 SMP Mon Apr 7 16:37:53 UTC 2008 > > x86_64 GNU/Linux > > > > And I would guess my compiler bails out at parsing the code and building > > an syntax tree way before it has a chance to optimize out any branches. > > Maybe your compiler is more permissive, either because it's a different > > version or you're on a different architecture where sizeof(int) == > > sizeof(void*) so there isn't any "loss of precision"? > > You seem to be the first one to try to compile dillo2 with 64bit. > So yes, we need to fix that compilation problem. It's just that > currently there is hardly any conditional compilation in dw-testbed > and it would be nice to keep it that way. > Do you think you can fix the problem without any preprocessor > conditionals? Perhaps with some sort of cast as in the callback case. Yes, that's right. Doesn't dlib's VOIDP2INT() work in this case? -- Cheers Jorge.- PS: Sorry for the lack of presence lately. I've been fully busy.

April 25, 2008

dillo-fltk on x86_64

by Johannes.Hofmann＠gmx.de

On Fri, Apr 25, 2008 at 08:13:45PM +0200, Justus Winter wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > It's hard to get anything past you guys... revised patches are attached. > > By the way, if you still think there's something wrong with them, please > adjust them accordingly (like checking the return value of snprintf, > reducing the size of buf (a 64 byte long char buffer should be enough > for the hexadecimal representation of 244 bit wide pointers plus '0x' > and the final 0, right? :) ). > > Cheers, > Justus > - -- > gpg key fingerprint: C82D 382A AB38 1A54 5290 19D6 A0F9 B035 686C 6996 > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.6 (GNU/Linux) > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org > > iD8DBQFIEh9ZoPmwNWhsaZYRAj50AJ9QWcxALBx1fuLIqEBAbNKsGn5PogCbBRRV > QjvTVKQJnI1yzOamX2KwOy8= > =TVic > -----END PGP SIGNATURE----- > diff -pru dillo2/src/dialog.cc dillo2-cur/src/dialog.cc > --- dillo2/src/dialog.cc 2008-04-11 14:51:24.000000000 +0200 > +++ dillo2-cur/src/dialog.cc 2008-04-24 00:19:39.000000000 +0200 > @@ -11,6 +11,7 @@ > > // UI dialogs > > +#include <inttypes.h> > #include <math.h> // for rint() > > #include <fltk/events.h> // for the unfortunate (temporary?) event key testing > @@ -246,7 +247,7 @@ static int choice5_answer; > > void choice5_cb(Widget *button, void *number) > { > - choice5_answer = (int)number; > + choice5_answer = (intptr_t)number; > _MSG("choice5_cb: %d\n", choice5_answer); > button->window()->make_exec_return(true); > } > diff -pru dw2/lout/object.cc dw2-cur/lout/object.cc > --- dw2/lout/object.cc 2007-10-26 14:17:43.000000000 +0200 > +++ dw2-cur/lout/object.cc 2008-04-25 19:01:34.000000000 +0200 > @@ -22,6 +22,7 @@ > > #include "object.hh" > #include <stdio.h> > +#include <inttypes.h> > > namespace object { > > @@ -114,28 +115,13 @@ bool Pointer::equals(Object *other) > > int Pointer::hashValue() > { > - if(sizeof (int) == sizeof (void*)) > - return (int)value; > - else if (2 * sizeof (int) == sizeof (void*)) > - return ((int*)value)[0] ^ ((int*)value)[1]; > - else { > - // unhandled case > - misc::assertNotReached (); > - return 0; > - } > + return (intptr_t)value; > } The xor-stuff in the 64bit case ensures a equal distribution of hash values. I'm not sure a simple cast to int is enough on all systems (well, it probabely is..). intptr_t v = (intptr_t) value; return (int) v ^ (v >> (sizeof int * 8)); for the 64bit case would be a more conservative fix - if it compiles :-) > > void Pointer::intoStringBuffer(misc::StringBuffer *sb) > { > char buf[64]; > - if(sizeof (int) == sizeof (void*)) > - sprintf(buf, "0x%x", (int)value); > - else if (sizeof (long) == sizeof (void*)) > - sprintf(buf, "0x%lx", (long)value); > - else { > - // unhandled case > - misc::assertNotReached (); > - } > + snprintf(buf, sizeof(buf), "0x%p", value); > sb->append(buf); > } Nice simplification! Johannes

April 25, 2008

dillo-fltk on x86_64

by joerg.sonnenberger＠web.de

On Fri, Apr 25, 2008 at 08:13:45PM +0200, Justus Winter wrote: > By the way, if you still think there's something wrong with them, please > adjust them accordingly (like checking the return value of snprintf, > reducing the size of buf (a 64 byte long char buffer should be enough > for the hexadecimal representation of 244 bit wide pointers plus '0x' > and the final 0, right? :) ). I am just a bystander myself :-) "%p" really is enough (includes 0x). snprintf because it doesn't match static scans for potentially unsafe functions. Joerg

April 25, 2008

dillo-fltk on x86_64

by 4winter＠informatik.uni-hamburg.de

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 It's hard to get anything past you guys... revised patches are attached. By the way, if you still think there's something wrong with them, please adjust them accordingly (like checking the return value of snprintf, reducing the size of buf (a 64 byte long char buffer should be enough for the hexadecimal representation of 244 bit wide pointers plus '0x' and the final 0, right? :) ). Cheers, Justus - -- gpg key fingerprint: C82D 382A AB38 1A54 5290 19D6 A0F9 B035 686C 6996 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFIEh9ZoPmwNWhsaZYRAj50AJ9QWcxALBx1fuLIqEBAbNKsGn5PogCbBRRV QjvTVKQJnI1yzOamX2KwOy8= =TVic -----END PGP SIGNATURE-----

April 25, 2008

dillo-fltk on x86_64

by joerg.sonnenberger＠web.de

On Fri, Apr 25, 2008 at 06:16:40PM +0200, Justus Winter wrote: > diff -pru dw2/lout/object.cc dw2-cur/lout/object.cc > --- dw2/lout/object.cc 2007-10-26 14:17:43.000000000 +0200 > +++ dw2-cur/lout/object.cc 2008-04-25 17:20:56.000000000 +0200 > @@ -22,6 +22,7 @@ > > #include "object.hh" > #include <stdio.h> > +#include <unistd.h> // for intptr_t inttypes.h > void Pointer::intoStringBuffer(misc::StringBuffer *sb) > { > char buf[64]; > - if(sizeof (int) == sizeof (void*)) > - sprintf(buf, "0x%x", (int)value); > - else if (sizeof (long) == sizeof (void*)) > - sprintf(buf, "0x%lx", (long)value); > - else { > - // unhandled case > - misc::assertNotReached (); > - } > + sprintf(buf, "0x%lx", (intptr_t)value); snprintf(buf, sizeof(buf), "%p", value) if you don't care about the concrete representation, typically this is using hex as well. If you really do: snprintf(buf, sizeof(buf), "0x%zu", (size_t)value); Joerg

April 25, 2008

dillo-fltk on x86_64

by 4winter＠informatik.uni-hamburg.de

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Johannes Hofmann wrote: > You seem to be the first one to try to compile dillo2 with 64bit. > So yes, we need to fix that compilation problem. It's just that > currently there is hardly any conditional compilation in dw-testbed > and it would be nice to keep it that way. > Do you think you can fix the problem without any preprocessor > conditionals? Perhaps with some sort of cast as in the callback case. Ah, I see where you are heading. Patch is attached. I was just compiling dillo with my patches on a 32 bit machine just to check whether I broke anything and I noticed that make tried to build the https dpi despite the fact that the ssl.h header file was missing (and configure was checking for that). I would suggest to either complain about missing dependencies or to disable the compilation of the https dpi in case there is no ssl library found. Justus - -- gpg key fingerprint: C82D 382A AB38 1A54 5290 19D6 A0F9 B035 686C 6996 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFIEgPnoPmwNWhsaZYRAm+nAKC4f9YHp2jwYjAhTwkh7uiX5Tie4wCfehOq OMZQ28n3I2R0u6eX+1V/f68= =2iR2 -----END PGP SIGNATURE-----

April 25, 2008

dillo-fltk on x86_64

by Johannes.Hofmann＠gmx.de

On Fri, Apr 25, 2008 at 10:54:26AM +0200, Justus Winter wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Johannes Hofmann wrote: > > object.cc:118: error: cast from ?void*? to ?int? loses precision > > > > I felt it was nonsense to check the size of void* at runtime and used > > the preprocessor to choose which instruction to use based on the value > > of SIZEOF_VOID_P. > > > >> I think the idea is that the compiler will optimize out unnecessary > >> branches. And indeed the assembly code looks like this here: > > Ah, I see. But surely I can't be the only one having problems with this > code? > > $ gcc -v > Using built-in specs. > Target: x86_64-linux-gnu > Configured with: ../src/configure -v > - --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr > - --enable-shared --with-system-zlib --libexecdir=/usr/lib > - --without-included-gettext --enable-threads=posix --enable-nls > - --with-gxx-include-dir=/usr/include/c++/4.2 --program-suffix=-4.2 > - --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc > - --enable-mpfr --enable-checking=release --build=x86_64-linux-gnu > - --host=x86_64-linux-gnu --target=x86_64-linux-gnu > Thread model: posix > gcc version 4.2.3 (Ubuntu 4.2.3-2ubuntu7) > $ uname -a > Linux thinkbox 2.6.24-15-generic #1 SMP Mon Apr 7 16:37:53 UTC 2008 > x86_64 GNU/Linux > > And I would guess my compiler bails out at parsing the code and building > an syntax tree way before it has a chance to optimize out any branches. > Maybe your compiler is more permissive, either because it's a different > version or you're on a different architecture where sizeof(int) == > sizeof(void*) so there isn't any "loss of precision"? You seem to be the first one to try to compile dillo2 with 64bit. So yes, we need to fix that compilation problem. It's just that currently there is hardly any conditional compilation in dw-testbed and it would be nice to keep it that way. Do you think you can fix the problem without any preprocessor conditionals? Perhaps with some sort of cast as in the callback case. Johannes

April 25, 2008

dillo-fltk on x86_64

by 4winter＠informatik.uni-hamburg.de

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Johannes Hofmann wrote: > object.cc:118: error: cast from ?void*? to ?int? loses precision > > I felt it was nonsense to check the size of void* at runtime and used > the preprocessor to choose which instruction to use based on the value > of SIZEOF_VOID_P. > >> I think the idea is that the compiler will optimize out unnecessary >> branches. And indeed the assembly code looks like this here: Ah, I see. But surely I can't be the only one having problems with this code? $ gcc -v Using built-in specs. Target: x86_64-linux-gnu Configured with: ../src/configure -v - --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr - --enable-shared --with-system-zlib --libexecdir=/usr/lib - --without-included-gettext --enable-threads=posix --enable-nls - --with-gxx-include-dir=/usr/include/c++/4.2 --program-suffix=-4.2 - --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc - --enable-mpfr --enable-checking=release --build=x86_64-linux-gnu - --host=x86_64-linux-gnu --target=x86_64-linux-gnu Thread model: posix gcc version 4.2.3 (Ubuntu 4.2.3-2ubuntu7) $ uname -a Linux thinkbox 2.6.24-15-generic #1 SMP Mon Apr 7 16:37:53 UTC 2008 x86_64 GNU/Linux And I would guess my compiler bails out at parsing the code and building an syntax tree way before it has a chance to optimize out any branches. Maybe your compiler is more permissive, either because it's a different version or you're on a different architecture where sizeof(int) == sizeof(void*) so there isn't any "loss of precision"? Justus - -- gpg key fingerprint: C82D 382A AB38 1A54 5290 19D6 A0F9 B035 686C 6996 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFIEZxCoPmwNWhsaZYRAhYmAJ4zATWlJpwFzwLlI0I3joMtmY1AOgCgmSWg /j07wxgS2ppgaV5swTCRubI= =MFTB -----END PGP SIGNATURE-----

April 25, 2008

dillo-fltk on x86_64

by Johannes.Hofmann＠gmx.de

Hi Justus, On Wed, Apr 23, 2008 at 11:53:24PM +0200, Justus Winter wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Hey@all :) > > I ran into some issues compiling dillo. I solved / worked around them, > patches are attached. Here are my findings and my interpretations (let > me know in case I am way off somewhere): > > dw2 > === > gcc-4.2 on linux/x86_64 complained about two casts in lout/object.cc: > > object.cc:118: error: cast from ?void*? to ?int? loses precision > > I felt it was nonsense to check the size of void* at runtime and used > the preprocessor to choose which instruction to use based on the value > of SIZEOF_VOID_P. I think the idea is that the compiler will optimize out unnecessary branches. And indeed the assembly code looks like this here: .globl _ZN6object7Pointer9hashValueEv .type _ZN6object7Pointer9hashValueEv, @function _ZN6object7Pointer9hashValueEv: .LFB70: .loc 1 115 0 .LVL1: pushl %ebp .LCFI2: movl %esp, %ebp .LCFI3: .loc 1 115 0 movl 8(%ebp), %eax movl 4(%eax), %eax .loc 1 126 0 leave ret .LFE70: .size _ZN6object7Pointer9hashValueEv, .-_ZN6object7Pointer9hashValueEv So, as far as I can see it really works. Cheers, Johannes > > dillo2 > ====== > There was another complaint by gcc: > > dialog.cc:249: error: cast from ?void*? to ?int? loses precision > > A parameter of type void* for a callback is used to carry a small > integer (most likely the number of the button pressed or something). I > solved this one by first casting to long and then to int. I saw this > somewhere on the net, don't know if this is too hacky. > > dillo2/dpi > ========== > downloads.cc failed to compile since gcc couldn't find the fltk includes > (I chose not to install them to /usr/local/lib), so I poked around in > dpi/Makefile.am and managed to include LIBFLTK_CXXFLAGS into cxxflags > (/me is an automake n00b). > > With my three patches applied dillo compiles and runs fine, however I > had to create ~/.dillo and manually start dpid. Did I miss something here? > > Cheers, > Justus > - -- > gpg key fingerprint: C82D 382A AB38 1A54 5290 19D6 A0F9 B035 686C 6996 > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.6 (GNU/Linux) > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org > > iD8DBQFID6/ToPmwNWhsaZYRApgwAJsENlC0vsniya14RBTU8yrXVVjVyACff2HD > GLM/iKxXf3UjBA6+GFOSE78= > =JuDE > -----END PGP SIGNATURE----- > diff -pru dw2/lout/object.cc dw2-cur/lout/object.cc > --- dw2/lout/object.cc 2007-10-26 14:17:43.000000000 +0200 > +++ dw2-cur/lout/object.cc 2008-04-23 23:13:31.000000000 +0200 > @@ -114,28 +114,21 @@ bool Pointer::equals(Object *other) > > int Pointer::hashValue() > { > - if(sizeof (int) == sizeof (void*)) > - return (int)value; > - else if (2 * sizeof (int) == sizeof (void*)) > - return ((int*)value)[0] ^ ((int*)value)[1]; > - else { > - // unhandled case > - misc::assertNotReached (); > - return 0; > - } > +#if SIZEOF_VOID_P == 4 > + return (int)value; > +#else > + return ((int*)value)[0] ^ ((int*)value)[1]; > +#endif > } > > void Pointer::intoStringBuffer(misc::StringBuffer *sb) > { > char buf[64]; > - if(sizeof (int) == sizeof (void*)) > - sprintf(buf, "0x%x", (int)value); > - else if (sizeof (long) == sizeof (void*)) > - sprintf(buf, "0x%lx", (long)value); > - else { > - // unhandled case > - misc::assertNotReached (); > - } > +#if SIZEOF_VOID_P == 4 > + sprintf(buf, "0x%x", (int)value); > +#else > + sprintf(buf, "0x%lx", (long)value); > +#endif > sb->append(buf); > } > > diff -pru dillo2/src/dialog.cc dillo2-cur/src/dialog.cc > --- dillo2/src/dialog.cc 2008-04-11 14:51:24.000000000 +0200 > +++ dillo2-cur/src/dialog.cc 2008-04-23 22:38:50.000000000 +0200 > @@ -246,7 +246,7 @@ static int choice5_answer; > > void choice5_cb(Widget *button, void *number) > { > - choice5_answer = (int)number; > + choice5_answer = (int)(long)number; > _MSG("choice5_cb: %d\n", choice5_answer); > button->window()->make_exec_return(true); > } > diff -pru dillo2/dpi/Makefile.am dillo2-cur/dpi/Makefile.am > --- dillo2/dpi/Makefile.am 2007-10-07 00:36:34.000000000 +0200 > +++ dillo2-cur/dpi/Makefile.am 2008-04-23 22:53:32.000000000 +0200 > @@ -1,3 +1,5 @@ > +AM_CXXFLAGS = @LIBFLTK_CXXFLAGS@ > + > bookmarksdir = $(libdir)/dillo/dpi/bookmarks > downloadsdir = $(libdir)/dillo/dpi/downloads > ftpdir = $(libdir)/dillo/dpi/ftp > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)dillo.org > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

April 24, 2008

[patch] introduce lout namespace (was: namespace problem)

by Johannes.Hofmann＠gmx.de

Hi, while trying to implement a fix to the namespace problem I came to the conclusion that the easiest and least intrusive way is to keep the existing namespaces in the lout directory and just wrap them in another namespace "lout". This fixes the name collision with signal. Cheers, Johannes

April 24, 2008

[patch] ignore SIGPIPE

by Johannes.Hofmann＠gmx.de

Hello, this patch avoids exits on SIGPIPE. Currently this is only observed on DragonFly, but dillo1 had this too. Cheers, Johannes

April 24, 2008

namespace problem

by corvid＠lavabit.com

Johannes wrote: > some time ago I already reported a compilation problem that > currently only exists on DragonFlyBSD. The namespace "signal" > in the lout library collides with a function declaration > in /usr/include/signal.h. > For some reason DragonFly happens to include signal.h indirectly. > But the same problem will appear on Linux too once we should need > signal.h somewhere. Just try to compile the following C++ file > (g++ -c <file>): > > #include <signal.h> > namespace signal { } > > > I'd like to resolve this issue before release. I see two options: > > * rename namespace "signal" to "loutsignal" - which is pretty > ugly. The concept of namespaces exists to avoid such stuff... > > * put all classes in the lout directory into a single namespace > "lout". > > At the moment I prefer the second option, but I don't know > Sebastian's reasoning behind this naming. > > Any opinions? I agree with you.

April 24, 2008

namespace problem

by Johannes.Hofmann＠gmx.de

Hi, some time ago I already reported a compilation problem that currently only exists on DragonFlyBSD. The namespace "signal" in the lout library collides with a function declaration in /usr/include/signal.h. For some reason DragonFly happens to include signal.h indirectly. But the same problem will appear on Linux too once we should need signal.h somewhere. Just try to compile the following C++ file (g++ -c <file>): #include <signal.h> namespace signal { } I'd like to resolve this issue before release. I see two options: * rename namespace "signal" to "loutsignal" - which is pretty ugly. The concept of namespaces exists to avoid such stuff... * put all classes in the lout directory into a single namespace "lout". At the moment I prefer the second option, but I don't know Sebastian's reasoning behind this naming. Any opinions? Cheers, Johannes

April 24, 2008

I figured out why charset handling has been all broken lately.

by Johannes.Hofmann＠gmx.de

On Thu, Apr 24, 2008 at 01:57:41AM +0000, corvid wrote: > The top of Nav_open_url has > > bool_t ForceReload = (URL_FLAGS(url) & > (URL_E2EReload + URL_ReloadFromCache)); > > When repushing URLs, URL_FLAGS contains URL_ReloadFromCache, > which is 0x100. And remember how Jorge changed bool_t from > int to unsigned char? I'd forgotten about it, too, which meant > I wasted some time looking in the wrong places for this bug. Ouch, this must have been fun to debug :-)

April 24, 2008

I figured out why charset handling has been all broken lately.

by corvid＠lavabit.com

The top of Nav_open_url has bool_t ForceReload = (URL_FLAGS(url) & (URL_E2EReload + URL_ReloadFromCache)); When repushing URLs, URL_FLAGS contains URL_ReloadFromCache, which is 0x100. And remember how Jorge changed bool_t from int to unsigned char? I'd forgotten about it, too, which meant I wasted some time looking in the wrong places for this bug.

April 24, 2008

dillo-fltk on x86_64

by corvid＠lavabit.com

[it seems like everybody on this list has a name starting with J] Justus wrote: > With my three patches applied dillo compiles and runs fine, however I > had to create ~/.dillo and manually start dpid. Did I miss something here? Was dillo unable to find dpid, or was it just not working right somehow? Looking in dillo2/src/IO/dpi.c, dpid has to be either in ~/.dillo/ or $PATH. I put it in my path.

April 24, 2008

dillo-fltk on x86_64

by 4winter＠informatik.uni-hamburg.de

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Joerg Sonnenberger wrote: > On Wed, Apr 23, 2008 at 11:53:24PM +0200, Justus Winter wrote: >> [...] >> somewhere on the net, don't know if this is too hacky. > Please cast to (u)intptr_t instead. Like this? Justus - -- gpg key fingerprint: C82D 382A AB38 1A54 5290 19D6 A0F9 B035 686C 6996 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFID7bfoPmwNWhsaZYRAuaeAJ4q16SFUnUIVnPhJlczP9Dft6WW1gCaA8+T ZoqvRZq/4X4Qoxjw/UrMuA0= =SxsP -----END PGP SIGNATURE-----

April 24, 2008

dillo-fltk on x86_64

by joerg.sonnenberger＠web.de

On Wed, Apr 23, 2008 at 11:53:24PM +0200, Justus Winter wrote: > dialog.cc:249: error: cast from ?void*? to ?int? loses precision > > A parameter of type void* for a callback is used to carry a small > integer (most likely the number of the button pressed or something). I > solved this one by first casting to long and then to int. I saw this > somewhere on the net, don't know if this is too hacky. Please cast to (u)intptr_t instead. Joerg

April 24, 2008

dillo-fltk on x86_64

by 4winter＠informatik.uni-hamburg.de

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hey@all :) I ran into some issues compiling dillo. I solved / worked around them, patches are attached. Here are my findings and my interpretations (let me know in case I am way off somewhere): dw2 === gcc-4.2 on linux/x86_64 complained about two casts in lout/object.cc: object.cc:118: error: cast from ?void*? to ?int? loses precision I felt it was nonsense to check the size of void* at runtime and used the preprocessor to choose which instruction to use based on the value of SIZEOF_VOID_P. dillo2 ====== There was another complaint by gcc: dialog.cc:249: error: cast from ?void*? to ?int? loses precision A parameter of type void* for a callback is used to carry a small integer (most likely the number of the button pressed or something). I solved this one by first casting to long and then to int. I saw this somewhere on the net, don't know if this is too hacky. dillo2/dpi ========== downloads.cc failed to compile since gcc couldn't find the fltk includes (I chose not to install them to /usr/local/lib), so I poked around in dpi/Makefile.am and managed to include LIBFLTK_CXXFLAGS into cxxflags (/me is an automake n00b). With my three patches applied dillo compiles and runs fine, however I had to create ~/.dillo and manually start dpid. Did I miss something here? Cheers, Justus - -- gpg key fingerprint: C82D 382A AB38 1A54 5290 19D6 A0F9 B035 686C 6996 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFID6/ToPmwNWhsaZYRApgwAJsENlC0vsniya14RBTU8yrXVVjVyACff2HD GLM/iKxXf3UjBA6+GFOSE78= =JuDE -----END PGP SIGNATURE-----

April 24, 2008

dillo-fltk exits on SIGPIPE

by onepoint＠starurchin.org

On Wed, Apr 23, 2008 at 05:24:01PM +0000, corvid wrote: > Johannes wrote: > > do you also see exits on SIGPIPE e.g. on: > > http://daily.daemonnews.org > > dillo 1 had signal(SIGPIPE, SIG_IGN); > > which dillo-fltk is missing. > > No, I just get: > > ** WARNING **: IO_write, closing with pending data not sent I see the same thing as corvid . (Details: Linux 2.6.25 , gcc 3.4.3 , glibc 2.3.4 .) Regards, Jeremy Henty

April 23, 2008

patch: motionNotify when scrolling (Re: patch: Re: [Dillo-dev] start on image maps (dw-part))

by corvid＠lavabit.com

Johannes wrote: > On Wed, Apr 23, 2008 at 06:08:27AM +0000, corvid wrote: > > Johannes wrote: > > > On Tue, Apr 22, 2008 at 02:05:43PM +0000, corvid wrote: > > > > Speaking of motionNotify, the other day I was looking into getting the > > > > link in the status bar to change when scrolling. I'd gotten as far as > > > > figuring out that maybe *checks notes* Layout::scrollPosChanged could call > > > > Layout::motionNotify, but then I got stuck because I didn't know where to > > > > get current cursor coordinates from. > > > > > > In fltk one can call get_mouse(int &x, int &y). But I'm not sure > > > how to wrap this properly. Perhaps adding a similar method to > > > Platform? What about different views, can they all have separate > > > pointer devices? > > > Just checked dillo1. It handles at least the scrolling case > > > properly. > > > > Ah, indeed. It turns out that old dillo sets viewport->mouse_[xy] in > > Dw_gtk_viewport_motion_notify() > > and then has a > > static void Dw_gtk_viewport_adj_changed (GtkAdjustment *adj, > > GtkDwViewport *viewport) > > { > > Dw_gtk_viewport_mouse_event (GTK_WIDGET (viewport), > > viewport->mouse_x, viewport->mouse_y, NULL); > > } > > > > Attached is a patch similar to this. > > > > It works for scrolling and when I close a window that had been > > obscuring the viewport (it gets ENTER and FOCUS. I chose ENTER). > > It does not work when I page around with my window manager because the only > > event the viewport handler sees is KEYUP, and I didn't like the idea > > of using KEYUP for this. > > Nice! But there is still other cases, like going back with > <Backspace> such that the cursor ends up over a link. > Or incremental rendering such that the cursor ends up over a link ( > (to reproduce go to a slow page, move the cursor over a link and > press <Ctrl>-r to reload). > > I'm not sure how to handle these cases where the movement is > initiated by the layout rather than the view. I ignored it at the time because I figured it was probably hard to deal with. It also incorrectly shows links when text searching causes scrolling. I have this case fixed in my copy now. And it could be made to deal with moving into scrollbars, although that's probably for a separate patch at some point (with cursor resetting as well). > I'd like to have a general mechanism like > Layout::canvasMousePosChanged () that can be called in all these > cases. I'll at least try to figure out something...

April 23, 2008

dillo-fltk exits on SIGPIPE

by corvid＠lavabit.com

Johannes wrote: > do you also see exits on SIGPIPE e.g. on: > http://daily.daemonnews.org > dillo 1 had signal(SIGPIPE, SIG_IGN); > which dillo-fltk is missing. No, I just get: ** WARNING **: IO_write, closing with pending data not sent

April 23, 2008

patch: motionNotify when scrolling (Re: patch: Re: [Dillo-dev] start on image maps (dw-part))

by Johannes.Hofmann＠gmx.de

On Wed, Apr 23, 2008 at 06:08:27AM +0000, corvid wrote: > Johannes wrote: > > On Tue, Apr 22, 2008 at 02:05:43PM +0000, corvid wrote: > > > Speaking of motionNotify, the other day I was looking into getting the > > > link in the status bar to change when scrolling. I'd gotten as far as > > > figuring out that maybe *checks notes* Layout::scrollPosChanged could call > > > Layout::motionNotify, but then I got stuck because I didn't know where to > > > get current cursor coordinates from. > > > > In fltk one can call get_mouse(int &x, int &y). But I'm not sure > > how to wrap this properly. Perhaps adding a similar method to > > Platform? What about different views, can they all have separate > > pointer devices? > > Just checked dillo1. It handles at least the scrolling case > > properly. > > Ah, indeed. It turns out that old dillo sets viewport->mouse_[xy] in > Dw_gtk_viewport_motion_notify() > and then has a > static void Dw_gtk_viewport_adj_changed (GtkAdjustment *adj, > GtkDwViewport *viewport) > { > Dw_gtk_viewport_mouse_event (GTK_WIDGET (viewport), > viewport->mouse_x, viewport->mouse_y, NULL); > } > > Attached is a patch similar to this. > > It works for scrolling and when I close a window that had been > obscuring the viewport (it gets ENTER and FOCUS. I chose ENTER). > It does not work when I page around with my window manager because the only > event the viewport handler sees is KEYUP, and I didn't like the idea > of using KEYUP for this. Nice! But there is still other cases, like going back with <Backspace> such that the cursor ends up over a link. Or incremental rendering such that the cursor ends up over a link ( (to reproduce go to a slow page, move the cursor over a link and press <Ctrl>-r to reload). I'm not sure how to handle these cases where the movement is initiated by the layout rather than the view. I'd like to have a general mechanism like Layout::canvasMousePosChanged () that can be called in all these cases. Johannes

April 23, 2008

dillo-fltk exits on SIGPIPE

by Johannes.Hofmann＠gmx.de

Hi, do you also see exits on SIGPIPE e.g. on: http://daily.daemonnews.org dillo 1 had signal(SIGPIPE, SIG_IGN); which dillo-fltk is missing. Cheers, Johannes

April 23, 2008

patch: motionNotify when scrolling (Re: patch: Re: [Dillo-dev] start on image maps (dw-part))

by corvid＠lavabit.com

Johannes wrote: > On Tue, Apr 22, 2008 at 02:05:43PM +0000, corvid wrote: > > Speaking of motionNotify, the other day I was looking into getting the > > link in the status bar to change when scrolling. I'd gotten as far as > > figuring out that maybe *checks notes* Layout::scrollPosChanged could call > > Layout::motionNotify, but then I got stuck because I didn't know where to > > get current cursor coordinates from. > > In fltk one can call get_mouse(int &x, int &y). But I'm not sure > how to wrap this properly. Perhaps adding a similar method to > Platform? What about different views, can they all have separate > pointer devices? > Just checked dillo1. It handles at least the scrolling case > properly. Ah, indeed. It turns out that old dillo sets viewport->mouse_[xy] in Dw_gtk_viewport_motion_notify() and then has a static void Dw_gtk_viewport_adj_changed (GtkAdjustment *adj, GtkDwViewport *viewport) { Dw_gtk_viewport_mouse_event (GTK_WIDGET (viewport), viewport->mouse_x, viewport->mouse_y, NULL); } Attached is a patch similar to this. It works for scrolling and when I close a window that had been obscuring the viewport (it gets ENTER and FOCUS. I chose ENTER). It does not work when I page around with my window manager because the only event the viewport handler sees is KEYUP, and I didn't like the idea of using KEYUP for this.

April 23, 2008

dillo seems to close file descriptors twice

by Johannes.Hofmann＠gmx.de

Hi, I just noticed, that dillo seems to close file descriptors twice via IO_close_fd, which causes problems when other threads run in parallel for name server queries. Here are the two call stacks via which IO_close_fd is called for each fd: (gdb) b IO_close_fd Breakpoint 1 at 0x8070781: file IO.c, line 137. (gdb) r dillo.org Starting program: /home/hofmann/projects/dillo/plain/dillo2-hg/src/dillo-fltk dillo.org dillo_dns_init: Here we go! (threaded) Enabling cookies as from cookiesrc... Nav_open_url: new url='http://dillo.org' Dns_server [0]: dillo.org is 0x28559680 Connecting to 134.102.206.165 Nav_open_url: new url='http://www.dillo.org/' Breakpoint 1, IO_close_fd (io=0x28550a00, CloseCode=2) at IO.c:137 137 fprintf(stderr,"====> begin IO close (%d)\n", io->FD); Current language: auto; currently c (gdb) bt #0 IO_close_fd (io=0x28550a00, CloseCode=2) at IO.c:137 #1 0x0807094e in a_IO_ccc (Op=4, Branch=1, Dir=2, Info=0x285509e0, Data1=0x0, Data2=0x0) at IO.c:392 #2 0x0805633e in a_Chain_bcb (Op=4, Info=0x28550a00, Data1=0x0, Data2=0x0) at chain.c:98 #3 0x0806ea14 in a_Http_ccc (Op=4, Branch=1, Dir=2, Info=0x2854df60, Data1=0x0, Data2=0x0) at http.c:522 #4 0x0805633e in a_Chain_bcb (Op=4, Info=0x28550a00, Data1=0x0, Data2=0x0) at chain.c:98 #5 0x0805a514 in a_Capi_ccc (Op=4, Branch=1, Dir=2, Info=0x2854df40, Data1=0x0, Data2=0x0) at capi.c:491 #6 0x0805a39c in a_Capi_ccc (Op=4, Branch=2, Dir=1, Info=0x285509a0, Data1=0x0, Data2=0x0) at capi.c:601 #7 0x0805630a in a_Chain_fcb (Op=4, Info=0x28550a00, Data1=0x0, Data2=0x0) at chain.c:86 #8 0x0806ffd1 in a_Dpi_ccc (Op=4, Branch=2, Dir=1, Info=0x28550bc0, Data1=0x0, Data2=0x0) at dpi.c:671 #9 0x0805630a in a_Chain_fcb (Op=4, Info=0x28550a00, Data1=0x0, Data2=0x0) at chain.c:86 #10 0x08070891 in a_IO_ccc (Op=4, Branch=2, Dir=1, Info=0x28550c00, Data1=0x28550c20, Data2=0x0) at IO.c :410 #11 0x08070b64 in IO_callback (fd=<value optimized out>, io=0x28550c20) at IO.c:201 #12 0x08070beb in IO_fd_read_cb (fd=7, data=0x2) at IO.c:277 #13 0x080bcfe5 in fltk::wait () #14 0x080bd195 in fltk::run () #15 0x0804eadb in main (argc=0, argv=0x0) at dillo.cc:110 (gdb) c Continuing. ====> begin IO close (7) Breakpoint 1, IO_close_fd (io=0x28550c20, CloseCode=2) at IO.c:137 137 fprintf(stderr,"====> begin IO close (%d)\n", io->FD); (gdb) bt #0 IO_close_fd (io=0x28550c20, CloseCode=2) at IO.c:137 #1 0x0807089e in a_IO_ccc (Op=4, Branch=2, Dir=1, Info=0x28550c00, Data1=0x28550c20, Data2=0x0) at IO.c:411 #2 0x08070b64 in IO_callback (fd=<value optimized out>, io=0x28550c20) at IO.c:201 #3 0x08070beb in IO_fd_read_cb (fd=7, data=0x2) at IO.c:277 #4 0x080bcfe5 in fltk::wait () #5 0x080bd195 in fltk::run () #6 0x0804eadb in main (argc=0, argv=0x0) at dillo.cc:110 (gdb) c Continuing. ====> begin IO close (7) A line like fprintf(stderr,"====> begin IO close (%d)\n", io->FD); at the beginning of IO_close_fd() also shows the problem. Cheers, Johannes

April 22, 2008

[patch] phrase search

by Johannes.Hofmann＠gmx.de

Hi, attached is a patch that make phrase search work. I'm not 100% sure about the CharIterator::prev() change. CharIterator::next() returned \0 between words, prev() didn't. So something was wrong. I decided to go with current next() behaviour and made prev() return \0 as word separator too. Also the current implementation only works if one enters exactly one blank between words in the search dialog. Should we collapse multiple blanks into one automatically? Cheers, Johannes

April 22, 2008

patch: Re: [Dillo-dev] start on image maps (dw-part)

by Johannes.Hofmann＠gmx.de

On Tue, Apr 22, 2008 at 02:05:43PM +0000, corvid wrote: > Johannes wrote: > > On Tue, Apr 22, 2008 at 04:50:32AM +0000, corvid wrote: > > > dillo: > > > - I imagine the setUseMap() in open_img() is probably supposed to be > > > routed through DilloImage. > > > - Html_read_coords() was borrowed from 0.8.6 and modified a fair amount. > > > For one thing, the old code couldn't handle whitespace preceding a comma. > > > - I didn't really like that dReturn_if_fail so far down in open_area() > > > since coords is dynamically allocated now, but I left it there. > > > > > > What about deleting coords earlier? I think they are no longer > > needed once the shape has been constructed. > > That's true. I had just reached a point where the code was already tested > and I didn't want to mess with anything for fear of introducing some error > at the last moment ("this doesn't work at all! did you even compile it?" :)) > > > Regarding your comment in Image::enterNotifyImpl(). I noticed that > > too, but enterNotifyImpl() simply notifies about the enter > > event, so no coordinates are needed. > > Don't you think that implementing map aware Image::motionNotifyImpl() > > is enough? > > You're probably right. I wasn't sure whether it would get a motionNotify > when it first entered the image. > > Speaking of motionNotify, the other day I was looking into getting the > link in the status bar to change when scrolling. I'd gotten as far as > figuring out that maybe *checks notes* Layout::scrollPosChanged could call > Layout::motionNotify, but then I got stuck because I didn't know where to > get current cursor coordinates from. > In fltk one can call get_mouse(int &x, int &y). But I'm not sure how to wrap this properly. Perhaps adding a similar method to Platform? What about different views, can they all have separate pointer devices? Just checked dillo1. It handles at least the scrolling case properly.

April 22, 2008

patch: Re: [Dillo-dev] start on image maps (dw-part)

by corvid＠lavabit.com

Johannes wrote: > On Tue, Apr 22, 2008 at 04:50:32AM +0000, corvid wrote: > > dillo: > > - I imagine the setUseMap() in open_img() is probably supposed to be > > routed through DilloImage. > > - Html_read_coords() was borrowed from 0.8.6 and modified a fair amount. > > For one thing, the old code couldn't handle whitespace preceding a comma. > > - I didn't really like that dReturn_if_fail so far down in open_area() > > since coords is dynamically allocated now, but I left it there. > > > What about deleting coords earlier? I think they are no longer > needed once the shape has been constructed. That's true. I had just reached a point where the code was already tested and I didn't want to mess with anything for fear of introducing some error at the last moment ("this doesn't work at all! did you even compile it?" :)) > Regarding your comment in Image::enterNotifyImpl(). I noticed that > too, but enterNotifyImpl() simply notifies about the enter > event, so no coordinates are needed. > Don't you think that implementing map aware Image::motionNotifyImpl() > is enough? You're probably right. I wasn't sure whether it would get a motionNotify when it first entered the image. Speaking of motionNotify, the other day I was looking into getting the link in the status bar to change when scrolling. I'd gotten as far as figuring out that maybe *checks notes* Layout::scrollPosChanged could call Layout::motionNotify, but then I got stuck because I didn't know where to get current cursor coordinates from.

April 22, 2008

patch: Re: [Dillo-dev] start on image maps (dw-part)

by Johannes.Hofmann＠gmx.de

On Tue, Apr 22, 2008 at 04:50:32AM +0000, corvid wrote: > dw: I added motionNotifyImpl() and currLink Wow, that was fast! Works fine so far :-) > > dillo: > - I imagine the setUseMap() in open_img() is probably supposed to be > routed through DilloImage. > - Html_read_coords() was borrowed from 0.8.6 and modified a fair amount. > For one thing, the old code couldn't handle whitespace preceding a comma. > - I didn't really like that dReturn_if_fail so far down in open_area() > since coords is dynamically allocated now, but I left it there. What about deleting coords earlier? I think they are no longer needed once the shape has been constructed. Regarding your comment in Image::enterNotifyImpl(). I noticed that too, but enterNotifyImpl() simply notifies about the enter event, so no coordinates are needed. Don't you think that implementing map aware Image::motionNotifyImpl() is enough? Cheers, Johannes > > diff -pur dw2/dw/image.cc dw2-cur/dw/image.cc > --- dw2/dw/image.cc 2008-03-13 14:56:16.000000000 +0000 > +++ dw2-cur/dw/image.cc 2008-04-22 04:16:21.000000000 +0000 > @@ -25,12 +25,49 @@ > > namespace dw { > > +ImageMapsList::ImageMap::ImageMap () > +{ > + shapesAndLinks = new container::typed::List <ShapeAndLink> (true); > +} > + > +ImageMapsList::ImageMap::~ImageMap () > +{ > + delete shapesAndLinks; > +} > + > +void ImageMapsList::ImageMap::add (core::Shape *shape, int link) { > + ShapeAndLink *shapeAndLink = new ShapeAndLink (); > + shapeAndLink->shape = shape; > + shapeAndLink->link = link; > + shapesAndLinks->append (shapeAndLink); > +} > + > +int ImageMapsList::ImageMap::link (int x, int y) { > + container::typed::Iterator <ShapeAndLink> it; > + int link = -1; > + > + for (it = shapesAndLinks->iterator (); it.hasNext (); ) { > + ShapeAndLink *shapeAndLink = it.getNext (); > + > + if (shapeAndLink->shape->isPointWithin (x, y)) { > + link = shapeAndLink->link; > + break; > + } > + } > + > + return link; > +} > + > ImageMapsList::ImageMapsList () > { > + imageMaps = new container::typed::HashTable <object::Object, ImageMap> > + (true, true); > + currentMap = NULL; > } > > ImageMapsList::~ImageMapsList () > { > + delete imageMaps; > } > > /** > @@ -38,20 +75,34 @@ ImageMapsList::~ImageMapsList () > * > * This has to be called before dw::ImageMapsList::addShapeToCurrentMap. > * "key" is owned by the image map list, so a copy should be passed, when > - * nessary. > + * necessary. > */ > void ImageMapsList::startNewMap (object::Object *key) > { > + currentMap = new ImageMap (); > + imageMaps->put (key, currentMap); > } > > /** > * \brief Add a shape to the current map- > * > * "shape" is owned by the image map list, so a copy should be passed, when > - * nessary. > + * necessary. > */ > void ImageMapsList::addShapeToCurrentMap (core::Shape *shape, int link) > { > + currentMap->add (shape, link); > +} > + > +int ImageMapsList::link (object::Object *key, int x, int y) > +{ > + int link = -1; > + ImageMap *map = imageMaps->get (key); > + > + if (map) > + link = map->link (x, y); > + > + return link; > } > > // ---------------------------------------------------------------------- > @@ -65,6 +116,9 @@ Image::Image(const char *altText) > altTextWidth = -1; // not yet calculated > buffer = NULL; > clicking = false; > + currLink = -1; > + mapList = NULL; > + mapKey = NULL; > } > > Image::~Image() > @@ -139,10 +193,11 @@ void Image::sizeAllocateImpl (core::Allo > > void Image::enterNotifyImpl (core::EventCrossing *event) > { > - int link = getStyle()->x_link; > + // BUG: this is wrong for image maps, but the cursor position is unknown. > + currLink = getStyle()->x_link; > > - if (link != -1) { > - (void) emitLinkEnter (link, -1, -1, -1); > + if (currLink != -1) { > + (void) emitLinkEnter (currLink, -1, -1, -1); > } > } > > @@ -150,18 +205,36 @@ void Image::leaveNotifyImpl (core::Event > { > clicking = false; > > - if (getStyle()->x_link != -1) { > + if (currLink != -1) { > + currLink = -1; > (void) emitLinkEnter (-1, -1, -1, -1); > } > } > > +bool Image::motionNotifyImpl (core::EventMotion *event) > +{ > + if (mapList) { > + int newLink = mapList->link (mapKey, event->xWidget, event->yWidget); > + if (newLink != currLink) { > + currLink = newLink; > + clicking = false; > + setCursor(newLink == -1 ? core::style::CURSOR_DEFAULT : > + core::style::CURSOR_POINTER); > + (void) emitLinkEnter (newLink, -1, -1, -1); > + } > + } > + return true; > +} > + > bool Image::buttonPressImpl (core::EventButton *event) > { > bool ret = false; > + currLink = mapList ? mapList->link (mapKey, event->xWidget, event->yWidget): > + getStyle()->x_link; > if (event->button == 3){ > - (void)emitLinkPress(getStyle()->x_link, getStyle()->x_img, -1,-1,event); > + (void)emitLinkPress(currLink, getStyle()->x_img, -1,-1,event); > ret = true; > - } else if (event->button == 1 || getStyle()->x_link != -1){ > + } else if (event->button == 1 || currLink != -1){ > clicking = true; > ret = true; > } > @@ -170,9 +243,11 @@ bool Image::buttonPressImpl (core::Event > > bool Image::buttonReleaseImpl (core::EventButton *event) > { > + currLink = mapList ? mapList->link (mapKey, event->xWidget, event->yWidget): > + getStyle()->x_link; > if (clicking) { > clicking = false; > - emitLinkClick (getStyle()->x_link, getStyle()->x_img, -1, -1, event); > + emitLinkClick (currLink, getStyle()->x_img, -1, -1, event); > return true; > } > return false; > @@ -290,8 +365,10 @@ void Image::setIsMap () > * is owned by the image, if it is used by the caller afterwards, a copy > * should be passed. > */ > -void setUseMap (ImageMapsList *list, object::Object *key) > +void Image::setUseMap (ImageMapsList *list, object::Object *key) > { > + mapList = list; > + mapKey = key; > } > > } // namespace dw > diff -pur dw2/dw/image.hh dw2-cur/dw/image.hh > --- dw2/dw/image.hh 2008-02-08 18:06:56.000000000 +0000 > +++ dw2-cur/dw/image.hh 2008-04-21 23:39:03.000000000 +0000 > @@ -22,12 +22,36 @@ namespace dw { > */ > class ImageMapsList > { > +private: > + class ImageMap: public object::Object { > + private: > + class ShapeAndLink: public object::Object { > + public: > + core::Shape *shape; > + int link; > + > + ~ShapeAndLink () { if (shape) delete shape; }; > + }; > + > + container::typed::List <ShapeAndLink> *shapesAndLinks; > + public: > + ImageMap (); > + ~ImageMap (); > + > + void add (core::Shape *shape, int link); > + int link (int x, int y); > + }; > + > + container::typed::HashTable <object::Object, ImageMap> *imageMaps; > + ImageMap *currentMap; > + > public: > ImageMapsList (); > ~ImageMapsList (); > > void startNewMap (object::Object *key); > void addShapeToCurrentMap (core::Shape *shape, int link); > + int link (object::Object *key, int x, int y); > }; > > /** > @@ -92,6 +116,9 @@ private: > core::Imgbuf *buffer; > int altTextWidth; > bool clicking; > + int currLink; > + ImageMapsList *mapList; > + Object *mapKey; > > protected: > void sizeRequestImpl (core::Requisition *requisition); > @@ -103,7 +130,7 @@ protected: > bool buttonReleaseImpl (core::EventButton *event); > void enterNotifyImpl (core::EventCrossing *event); > void leaveNotifyImpl (core::EventCrossing *event); > - //bool motionNotifyImpl (core::EventMotion *event); > + bool motionNotifyImpl (core::EventMotion *event); > > //core::Iterator *iterator (Content::Type mask, bool atEnd); > > --- dillo2/src/html.cc 2008-04-17 22:18:33.000000000 +0000 > +++ dillo2-cur/src/html.cc 2008-04-22 04:39:08.000000000 +0000 > @@ -323,7 +323,7 @@ public: //BUG: for now everything is pu > misc::SimpleVector<DilloHtmlForm> *forms; > misc::SimpleVector<DilloUrl*> *links; > misc::SimpleVector<DilloLinkImage*> *images; > - //DwImageMapList maps; > + ImageMapsList maps; > > int32_t link_color; > int32_t visited_color; > @@ -2905,7 +2905,6 @@ static void Html_tag_open_img(DilloHtml > if (load_now) > Html_load_image(html->bw, url, Image); > > -#if 0 > /* Image maps */ > if (Html_get_attr(html, tag, tagsize, "ismap")) { > /* BUG: if several ISMAP images follow each other without > @@ -2914,17 +2913,17 @@ static void Html_tag_open_img(DilloHtml > // a_Dw_image_set_ismap (Image->dw); > _MSG(" Html_tag_open_img: server-side map (ISMAP)\n"); > } else if (S_TOP(html)->style->x_link != -1 && > - usemap_url == NULL) > + usemap_url == NULL) { > /* For simple links, we have to suppress the "image_pressed" signal. > * This is overridden for USEMAP images. */ > // a_Dw_widget_set_button_sensitive (IM2DW(Image->dw), FALSE); > + } > > if (usemap_url) { > -// a_Dw_image_set_usemap (Image->dw, &html->maps, usemap_url); > + ((::dw::Image*)Image->dw)->setUseMap(&html->maps, > + new ::object::String(usemap_url->url_string->str)); > a_Url_free (usemap_url); > } > -#endif > - > html->connectSignals((Widget*)Image->dw); > } > > @@ -2943,7 +2942,7 @@ static void Html_tag_open_map(DilloHtml > if ((attrbuf = Html_get_attr(html, tag, tagsize, "name"))) { > hash_name = dStrconcat("#", attrbuf, NULL); > url = Html_url_new(html, hash_name, NULL, 0, 0, 0, 0); > - //a_Dw_image_map_list_add_map (&html->maps, url); > + html->maps.startNewMap(new ::object::String(url->url_string->str)); > a_Url_free (url); > dFree(hash_name); > } > @@ -2961,56 +2960,111 @@ static void Html_tag_close_map(DilloHtml > } > > /* > + * Read coords in a string, returning a vector of ints. > + */ > +static > +misc::SimpleVector<int> *Html_read_coords(DilloHtml *html, const char *str) > +{ > + int i, coord; > + const char *tail = str; > + char *newtail = NULL; > + misc::SimpleVector<int> *coords = new misc::SimpleVector<int> (4); > + > + i = 0; > + while (1) { > + coord = strtol(tail, &newtail, 10); > + if (coord == 0 && newtail == tail) > + break; > + coords->increase(); > + coords->set(coords->size() - 1, coord); > + while (isspace(*newtail)) > + newtail++; > + if (!*newtail) > + break; > + if (*newtail != ',') { > + MSG_HTML("usemap coords MUST be separated by commas.\n"); > + } > + tail = newtail + 1; > + } > + > + return coords; > +} > + > +/* > * <AREA> > */ > static void Html_tag_open_area(DilloHtml *html, const char *tag, int tagsize) > { > -// // AL > -// /* todo: point must be a dynamic array */ > -// GdkPoint point[1024]; > -// DilloUrl* url; > -// const char *attrbuf; > -// int type = DW_IMAGE_MAP_SHAPE_RECT; > -// int nbpoints, link = -1; > -// > -// if ((attrbuf = Html_get_attr(html, tag, tagsize, "shape"))) { > -// if (dStrcasecmp(attrbuf, "rect") == 0) > -// type = DW_IMAGE_MAP_SHAPE_RECT; > -// else if (dStrcasecmp(attrbuf, "circle") == 0) > -// type = DW_IMAGE_MAP_SHAPE_CIRCLE; > -// else if (dStrncasecmp(attrbuf, "poly", 4) == 0) > -// type = DW_IMAGE_MAP_SHAPE_POLY; > -// else > -// type = DW_IMAGE_MAP_SHAPE_RECT; > -// } > -// /* todo: add support for coords in % */ > -// if ((attrbuf = Html_get_attr(html, tag, tagsize, "coords"))) { > -// /* Is this a valid poly ? > -// * rect = x0,y0,x1,y1 => 2 > -// * circle = x,y,r => 2 > -// * poly = x0,y0,x1,y1,x2,y2 minimum => 3 */ > -// nbpoints = Html_read_coords(html, attrbuf, point); > -// } else > -// return; > -// > -// if (Html_get_attr(html, tag, tagsize, "nohref")) { > -// link = -1; > -// _MSG("nohref"); > -// } > -// > -// if ((attrbuf = Html_get_attr(html, tag, tagsize, "href"))) { > -// url = Html_url_new(html, attrbuf, NULL, 0, 0, 0, 0); > -// dReturn_if_fail ( url != NULL ); > -// if ((attrbuf = Html_get_attr(html, tag, tagsize, "alt"))) > -// a_Url_set_alt(url, attrbuf); > -// > -// link = Html_set_new_link(html, &url); > -// } > -// > -// a_Dw_image_map_list_add_shape(&html->maps, type, link, > -// point, nbpoints); > -} > + misc::SimpleVector<int> *coords; > + DilloUrl* url; > + const char *attrbuf; > + int link = -1; > + Shape *shape = NULL; > + > + if (!(html->InFlags & IN_MAP)) { > + MSG_HTML("<area> element not inside <map>\n"); > + return; > + } > + > + /* todo: add support for coords in % */ > + if ((attrbuf = Html_get_attr(html, tag, tagsize, "coords"))) { > + coords = Html_read_coords(html, attrbuf); > + } else > + return; > + > + attrbuf = Html_get_attr(html, tag, tagsize, "shape"); > > + if (!attrbuf || !*attrbuf || !dStrcasecmp(attrbuf, "rect")) { > + /* the default shape is a rectangle */ > + if (coords->size() != 4) > + MSG_HTML("<area> rectangle must have four coordinate values\n"); > + if (coords->size() >= 4) > + shape = new Rectangle(coords->get(0), > + coords->get(1), > + coords->get(2) - coords->get(0), > + coords->get(3) - coords->get(1)); > + } else if (dStrcasecmp(attrbuf, "default") == 0) { > + /* "Specifies the entire region." "default" is not the default shape. */ > + MSG("<area> shape=default not implemented.\n"); > + } else if (dStrcasecmp(attrbuf, "circle") == 0) { > + if (coords->size() != 3) > + MSG_HTML("<area> circle must have three coordinate values\n"); > + if (coords->size() >= 3) > + shape = new Circle(coords->get(0), coords->get(1), coords->get(2)); > + } else if (dStrncasecmp(attrbuf, "poly", 4) == 0) { > + Polygon *poly; > + int i; > + if (coords->size() % 2) > + MSG_HTML("<area> polygon with odd number of coordinates\n"); > + shape = poly = new Polygon(); > + for (i = 0; i < (coords->size() / 2); i++) > + poly->addPoint(coords->get(2*i), coords->get(2*i + 1)); > + if (i) { > + /* be sure to close it */ > + poly->addPoint(coords->get(0), coords->get(1)); > + } > + } else { > + MSG_HTML("<area> unknown shape: \"%s\"\n", attrbuf); > + } > + > + if (shape) { > + if (Html_get_attr(html, tag, tagsize, "nohref")) { > + link = -1; > + _MSG("nohref"); > + } > + if ((attrbuf = Html_get_attr(html, tag, tagsize, "href"))) { > + url = Html_url_new(html, attrbuf, NULL, 0, 0, 0, 0); > + dReturn_if_fail ( url != NULL ); > + if ((attrbuf = Html_get_attr(html, tag, tagsize, "alt"))) > + a_Url_set_alt(url, attrbuf); > + > + link = Html_set_new_link(html, &url); > + } > + html->maps.addShapeToCurrentMap(shape, link); > + } > + if (coords) > + delete(coords); > +} > > /* > * Test and extract the link from a javascript instruction. > @@ -3064,7 +3118,8 @@ static void Html_tag_open_a(DilloHtml *h > const char *attrbuf; > > /* todo: add support for MAP with A HREF */ > - Html_tag_open_area(html, tag, tagsize); > + if (html->InFlags & IN_MAP) > + Html_tag_open_area(html, tag, tagsize); > > if ((attrbuf = Html_get_attr(html, tag, tagsize, "href"))) { > /* if it's a javascript link, extract the reference. */ > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)dillo.org > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

April 22, 2008

patch: Re: [Dillo-dev] start on image maps (dw-part)

by corvid＠lavabit.com

dw: I added motionNotifyImpl() and currLink dillo: - I imagine the setUseMap() in open_img() is probably supposed to be routed through DilloImage. - Html_read_coords() was borrowed from 0.8.6 and modified a fair amount. For one thing, the old code couldn't handle whitespace preceding a comma. - I didn't really like that dReturn_if_fail so far down in open_area() since coords is dynamically allocated now, but I left it there.

April 22, 2008

start on image maps (dw-part)

by corvid＠lavabit.com

Johannes wrote: > Here comes the dw-part of client side image maps. I could need some > help to hook this up in html.cc so I can start testing it. > Also the linkEmitter stuff in image.cc needs to be looked at by > someone who knows how this works :-) Okay, I recognize my cue here :) I now have the dillo side working with it in a look-my-one-testcase-works! sense, but still have to go through and look at the spec more closely and make it robust and all that...

April 22, 2008

start on image maps (dw-part)

by Johannes.Hofmann＠gmx.de

Hi - again, it went smoother than expected. The design was well thought out and documented by Sebastian in image.hh. Here comes the dw-part of client side image maps. I could need some help to hook this up in html.cc so I can start testing it. Also the linkEmitter stuff in image.cc needs to be looked at by someone who knows how this works :-) Cheers, Johannes

April 21, 2008

start on image maps (dw-part)

by Johannes.Hofmann＠gmx.de

Hi, just to let you know, I just started with client side image maps (the dw-part). Below is an initial implementation of ImageMapsList. This is not yet ready at all, but perhaps someone might want have a look. Cheers, Johannes diff -r 877bbc03146b -r ebc6de688732 dw/image.cc --- a/dw/image.cc Thu Apr 17 22:14:42 2008 +0200 +++ b/dw/image.cc Mon Apr 21 21:03:51 2008 +0200 @@ -25,12 +25,44 @@ namespace dw { +ImageMapsList::ImageMap::ImageMap () +{ + shapesAndLinks = new container::typed::List <ShapeAndLink> (true); +} + +void ImageMapsList::ImageMap::add (core::Shape *shape, int link) { + ShapeAndLink *shapeAndLink = new ShapeAndLink (); + shapeAndLink->shape = shape; + shapeAndLink->link = link; + shapesAndLinks->append (shapeAndLink); +} + +int ImageMapsList::ImageMap::link (int x, int y) { + container::typed::Iterator <ShapeAndLink> it; + int link = -1; + + for (it = shapesAndLinks->iterator (); it.hasNext (); ) { + ShapeAndLink *shapeAndLink = it.getNext (); + + if (shapeAndLink->shape->isPointWithin (x, y)) { + link = shapeAndLink->link; + break; + } + } + + return link; +} + ImageMapsList::ImageMapsList () { + imageMaps = new container::typed::HashTable <object::Object, ImageMap> + (true, true); + currentMap = NULL; } ImageMapsList::~ImageMapsList () { + delete imageMaps; } /** @@ -42,6 +74,8 @@ ImageMapsList::~ImageMapsList () */ void ImageMapsList::startNewMap (object::Object *key) { + currentMap = new ImageMap (); + imageMaps->put (key, currentMap); } /** @@ -52,6 +86,7 @@ void ImageMapsList::startNewMap (object: */ void ImageMapsList::addShapeToCurrentMap (core::Shape *shape, int link) { + currentMap->add (shape, link); } // ---------------------------------------------------------------------- diff -r 877bbc03146b -r ebc6de688732 dw/image.hh --- a/dw/image.hh Thu Apr 17 22:14:42 2008 +0200 +++ b/dw/image.hh Mon Apr 21 21:03:51 2008 +0200 @@ -22,6 +22,27 @@ namespace dw { */ class ImageMapsList { +private: + class ImageMap: public object::Object { + private: + class ShapeAndLink: public object::Object { + public: + core::Shape *shape; + int link; + }; + + container::typed::List <ShapeAndLink> *shapesAndLinks; + public: + ImageMap (); + ~ImageMap (); + + void add (core::Shape *shape, int link); + int link (int x, int y); + }; + + container::typed::HashTable <object::Object, ImageMap> *imageMaps; + ImageMap *currentMap; + public: ImageMapsList (); ~ImageMapsList ();

April 21, 2008

Future of dillo2

by Johannes.Hofmann＠gmx.de

On Mon, Apr 21, 2008 at 06:32:52PM +0000, corvid wrote: > Johannes wrote: > > What is still missing for an official release apart from image maps? > > For one thing, I think text search needs to work for phrases. Yes, and <Esc> should consistently close dialogs... But that's just a minor issue. > > > I think, if we can then manage to get CSS support in, we will get > > many new users. I personally don't need TABS. > > Yes, if I look around on the web for discussion about dillo, it's mostly > "it's fast, but it's useless because it can't do CSS." > > > > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)dillo.org > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

April 21, 2008

Future of dillo2

by corvid＠lavabit.com

Johannes wrote: > What is still missing for an official release apart from image maps? For one thing, I think text search needs to work for phrases. > I think, if we can then manage to get CSS support in, we will get > many new users. I personally don't need TABS. Yes, if I look around on the web for discussion about dillo, it's mostly "it's fast, but it's useless because it can't do CSS."

April 21, 2008

Future of dillo2

by Johannes.Hofmann＠gmx.de

On Mon, Apr 21, 2008 at 03:39:50PM +0000, corvid wrote: > I think the very first thing is to update the main dillo.org > page so that visitors will know that dillo shows signs of life. > > (or, wait, second. After all, there are patches that need reviewing :) > I agree. We should update the front page and make it a bit more optimistic :-). What is still missing for an official release apart from image maps? A problematic thing is that there are no official fltk2 packages for many distributions - or has that changed recently? I think, if we can then manage to get CSS support in, we will get many new users. I personally don't need TABS. Cheers, Johannes

April 21, 2008

Future of dillo2

by corvid＠lavabit.com

I think the very first thing is to update the main dillo.org page so that visitors will know that dillo shows signs of life. (or, wait, second. After all, there are patches that need reviewing :)

April 21, 2008

Future of dillo2

by jcid＠dillo.org

Hi there, This question: > What do you think of reviving use of the bug tracker > for the various little things that are easy to forget about? brings about a bigger topic: the future of dillo2. The goals of the project are: 1.- The democratization of internet information access 2.- Personal security and privacy 3.- High software efficiency I believe the key to achieving them are: a.- A larger development team. b.- A user community finding it useful. The vitality and development pace of the project are highly related to a). Point b), has been strong in the past; this is: judging from the received email feedback: http://www.dillo.org/emails.txt and from some surveys like: > On Sat, Aug 25, 2007 at 03:28:55AM +0200, Diego . wrote: > > DesktopLinux.com has published the results of its anual (desktop)linux poll > > The interesting thing is in the 3rd question: Which web browsers do you > > frequently use on your Linux desktop(s)? > > > > > http://www.desktoplinux.com/cgi-bin/survey/survey.cgi?view=archive&id=08132… > > > > The interesting thing is that a frozen project have enough users to win > > over 3 fully developed browsers :) (optimistic without cure) Point a) is key because it directly relates to the pace with which we pursue the moving target of Web browsing. Point b) is very important because if we end up with a browser that only a few people are willing to use, there's no point in it besides personal motivations. So: * Objective 1, is the result of a) and b). * Objective 2, needs the work of a). * Objective 3, is mainly achieved! How do we do it? i. - Increase the development team by adding 6+ new developers. ii.- Getting more involved with other projects. We could: * Attract new developers with a dillo2 release, leveraging the excellent documentation that we have. * Planning for CSS, floating objects and TABS. (this are important features to a nice browsing experience) * Coordinate with FLTK2, DSL (Damn small linux) and other lightweight distros, Debian installer team, MINIX3, etc. I don't want to miss the opportunity to thank the team for the excellent work during these months. Without you dillo2 wouldn't be so close to a release. Now, we need to plan, grow the number of developers, and bring dillo2 closer to its goals. These are just my views on the subject. Please share your thoughts, ideas and plans in this thread, so we can agree on a plan for the future. -- Cheers Jorge.-

April 20, 2008

Good news from fltk!

by jcid＠dillo.org

On Thu, Apr 17, 2008 at 05:28:34PM +0200, Johannes Hofmann wrote: > On Thu, Apr 17, 2008 at 08:53:23AM -0400, Jorge Arellano Cid wrote: > > On Tue, Apr 15, 2008 at 09:18:23PM +0200, Johannes Hofmann wrote: > > > Hi Jorge, > > > > > > On Tue, Apr 15, 2008 at 02:38:35PM -0400, Jorge Arellano Cid wrote: > > > > Hi Johannes, > > > > > > > > On Tue, Apr 08, 2008 at 05:01:41PM +0200, Johannes Hofmann wrote: > > > > > Hi Jeremy, > > > > > > > > > > On Tue, Apr 08, 2008 at 07:35:25AM +0100, Jeremy Henty wrote: > > > > > > > > > > > > On Sat, Apr 05, 2008 at 05:01:52PM +0200, Johannes Hofmann wrote: > > > > > > > > > > > > > Attached is a patch that enables double buffering for partial screen > > > > > > > redraws (this is where the flickering is most annoying). You will > > > > > > > need at least version r6079 of fltk2 to test. > > > > > > > > > > > > OK, I've upgraded to the latest FLTK2 snapshot (r6087) and your patch > > > > > > (fixed version). Looks OK so far. Any tests I should run? > > > > > > > > > > Mostly I would be interested whether it still feels fast. And any > > > > > regressions you observe, of course... > > > > > > > > I found something that looks like a bug in double buffering > > > > (it doesn't happen with the previous code). > > > > > > > > If you: > > > > > > > > - ./dillo-fltk about:splash > > > > - scroll down 1 or 2 inches. > > > > - browse to another URL. > > > > - press right mouse button over Back button and return to > > > > the first page. > > > > > > > > You'll end looking to the page through a window artifact in the > > > > control panel. i.e. The page rendering seems to start from below > > > > the control PANEL. > > > > > > > > Please give it a look. > > > > > > Patch 1 should fix the problem. > > > > Good! > > > > Committed. > > > > > > > > The second patch removes the push_clip() / pop_clip() pair that is no > > > longer necessary with double buffering (we only copy the needed > > > rectangle from the backBuffer anyway). > > > It might result in artifacts when running with > > > --disable-doublebuffer however. So I'm not sure if you want to > > > commit that part. > > > > I'd commit bracketed as: > > > > #ifdef NO_DOUBLEBUFFER > > push_clip (viewRect); > > #endif > > > > [Drawing code here...] > > > > > > #ifdef NO_DOUBLEBUFFER > > push_clip (viewRect); > > #endif > > > > > > Would it be OK? > > Yes, of course. Committed. -- Cheers Jorge.-

April 19, 2008

Collapsing whitespace

by Johannes.Hofmann＠gmx.de

On Thu, Apr 17, 2008 at 04:18:52PM -0400, Jorge Arellano Cid wrote: > Hi, > > Just submitted a patch I wanted to make long ago. It deals with > collapsing whitespace. Here's one example: > > http://www.w3.org/TR/REC-html40/intro/sgmltut.html#h-3.2.1 > > BTW, I also changed the bool_t to "unsigned char". Please test > whether it compiles cleanly. Compiles fine here (no warnings). Cheers, Johannes

April 17, 2008

Collapsing whitespace

by jcid＠dillo.org

Hi, Just submitted a patch I wanted to make long ago. It deals with collapsing whitespace. Here's one example: http://www.w3.org/TR/REC-html40/intro/sgmltut.html#h-3.2.1 BTW, I also changed the bool_t to "unsigned char". Please test whether it compiles cleanly. -- Cheers Jorge.-

April 17, 2008

Good news from fltk!

by Johannes.Hofmann＠gmx.de

On Thu, Apr 17, 2008 at 08:53:23AM -0400, Jorge Arellano Cid wrote: > On Tue, Apr 15, 2008 at 09:18:23PM +0200, Johannes Hofmann wrote: > > Hi Jorge, > > > > On Tue, Apr 15, 2008 at 02:38:35PM -0400, Jorge Arellano Cid wrote: > > > Hi Johannes, > > > > > > On Tue, Apr 08, 2008 at 05:01:41PM +0200, Johannes Hofmann wrote: > > > > Hi Jeremy, > > > > > > > > On Tue, Apr 08, 2008 at 07:35:25AM +0100, Jeremy Henty wrote: > > > > > > > > > > On Sat, Apr 05, 2008 at 05:01:52PM +0200, Johannes Hofmann wrote: > > > > > > > > > > > Attached is a patch that enables double buffering for partial screen > > > > > > redraws (this is where the flickering is most annoying). You will > > > > > > need at least version r6079 of fltk2 to test. > > > > > > > > > > OK, I've upgraded to the latest FLTK2 snapshot (r6087) and your patch > > > > > (fixed version). Looks OK so far. Any tests I should run? > > > > > > > > Mostly I would be interested whether it still feels fast. And any > > > > regressions you observe, of course... > > > > > > I found something that looks like a bug in double buffering > > > (it doesn't happen with the previous code). > > > > > > If you: > > > > > > - ./dillo-fltk about:splash > > > - scroll down 1 or 2 inches. > > > - browse to another URL. > > > - press right mouse button over Back button and return to > > > the first page. > > > > > > You'll end looking to the page through a window artifact in the > > > control panel. i.e. The page rendering seems to start from below > > > the control PANEL. > > > > > > Please give it a look. > > > > Patch 1 should fix the problem. > > Good! > > Committed. > > > > > The second patch removes the push_clip() / pop_clip() pair that is no > > longer necessary with double buffering (we only copy the needed > > rectangle from the backBuffer anyway). > > It might result in artifacts when running with > > --disable-doublebuffer however. So I'm not sure if you want to > > commit that part. > > I'd commit bracketed as: > > #ifdef NO_DOUBLEBUFFER > push_clip (viewRect); > #endif > > [Drawing code here...] > > > #ifdef NO_DOUBLEBUFFER > push_clip (viewRect); > #endif > > > Would it be OK? Yes, of course. Cheers, Johannes

April 17, 2008

patch: image loading on demand for complex button

by corvid＠lavabit.com

(Jorge: Okay. That gives me an opportunity to put this in the priority queue instead.) I was able to get the menus to work for buttons and image inputs, so image loading can be conditional now. My usual disclaimer applies regarding the dw2 side that I did something that made it work, but it may not be the right way.

April 17, 2008