- Dillo-dev - lists.mailman3.com

[patch] make ComplexButton work
by Johannes.Hofmann＠gmx.de April 14, 2008

April 14, 2008

Hi, this patch fixes ComplexButton - at least it works here now :-) The patch includes the ComplexButton destructor proposed by place and enables the ComplexButton code in dw-ui-test. It requires my last FltkViewBase::draw() patch. Cheers, Johannes

3 2

[patch] cleanup FltkViewBase::draw
by Johannes.Hofmann＠gmx.de April 13, 2008

April 13, 2008

Hi, here comes a cleanup of FltkViewBase::draw(). It had grown too complicated... This patch also fixes two issues with nested views as they will exist with ComplexButtons. Cheers, Johannes

2 1

Re: patch: reset input
by jcid＠dillo.org April 13, 2008

April 13, 2008

Hi, Committed -- Cheers Jorge.-

1 0

Re: patch: ISINDEX
by jcid＠dillo.org April 13, 2008

April 13, 2008

On Sun, Apr 13, 2008 at 02:33:00AM +0000, corvid wrote: > Yeah, so very important... > > An isindex page: http://www.math.ncu.edu.tw/~shann/bcc16/7/html/isindex.cgi > Committed! Mmmm, ISINDEX, an old method that brings me back good memories. -- Cheers Jorge.-

1 0

[PATCH]: Fixing https step 1: Have a basic dpi dialog window working again
by Christian.Kellermann＠nefkom.net April 11, 2008

April 11, 2008

Skipped content of type multipart/mixed

4 9

Re: patch: url encode, append input
by jcid＠dillo.org April 9, 2008

April 9, 2008

Hi, On Mon, Apr 07, 2008 at 02:26:14PM +0000, corvid wrote: > a_Url_encode_hex_str() needed to accept a Dstr* because it is not > illegal to use url encoding on a file. Maybe a situation that'll > never happen, but then again, it's easy to leave off enctype. In that case the behaviour is not specified. i.e. (from http://www.ietf.org/rfc/rfc1867.txt) 5.8 File transfer with ENCTYPE=x-www-form-urlencoded If a form contains <INPUT TYPE=file> elements but does not contain an ENCTYPE in the enclosing <FORM>, the behavior is not specified. It is probably inappropriate to attempt to URN-encode large quantities of data to servers that don't expect it. > (However, Firefox -- as if it's any authority on anything, but still -- > doesn't send file contents for URL encoded forms. It just sends > the filename.) Probably is not a bad idea to follow this lead or investigate a bit further on what IE, Safari or Opera do, and then decide. At least, I'd feel more comfortable with a file-size limit for both GET&POST, thus avoiding Dillo to exit because it can't allocate enough memory for sending a huge file. > Html_append_input() becomes a few functions (I'd never felt good > about sending a boundary arg for url encoding anyway). OK. -- Cheers Jorge.-

2 2

Re: patch: urldecode base64 data uri
by jcid＠dillo.org April 8, 2008

April 8, 2008

On Sun, Apr 06, 2008 at 07:01:52PM +0000, corvid wrote: > Jorge wrote: > > On Sun, Apr 06, 2008 at 05:07:30AM +0000, corvid wrote: > > > I took a better look at the RFC and it looks like I am wrong. > > > > > > I naively assumed that since it's been on the acid site for however > > > many years, somebody would have complained if it wasn't right, > > > and I took relatively little care in rfc-checking. > > > > > > On the other hand, I am coming to learn that RFCs are > > > not perfectly perfect things. > > > > > > The relevant RFC text: > > > The appearance of ";base64" means that the data > > > is encoded as base64. Without ";base64", the data (as a sequence of > > > octets) is represented using ASCII encoding for octets inside the > > > range of safe URL characters and using the standard %xx hex encoding > > > of URLs for octets outside that range. > > > > > > http://www.webstandards.org/action/acid2/guide/ says of the square: > > > Also, there is a 64px by 64px red box in the background (represented > > > by the PNG image in the data url, not reprinted in full). The red > > > box is not visible as the background-attachment is set to 'fixed' > > > which puts the red box outside of view. > > > > > > (as opposed to saying that it's supposed to break or something) > > > > Which in what regards to the patch, means? > > > > a) keep > > b) revert > > - To me, a strict reading of the RFC says revert. > > - I see that http://developer.mozilla.org/en/docs/The_data_URL_scheme > gives their base64 example as > "data:text/plain;base64,SGVsbG8sIFdvcmxkIQ%3D%3D" > > - At http://simonwillison.net/2003/Aug/11/selfContained/ > Simon Proctor claimed that Mozilla didn't like the URL encoding, > and Ian Hickson asserted that it was necessary. > > - Ian Hickson would appear to be the guy who wrote the "data: URI kitchen" > (http://software.hixie.ch/utilities/cgi/data/data) which is apparently > the main datauri-maker that people use, as well as being the guy who wrote > the acid2 test. > > On one hand, this means that dillo will encounter the URL encoding. > > On the other hand, if Hickson has any actual persuasive argument for > his viewpoint, I have not found it. OK, reverted. -- Cheers Jorge.-

1 0

Re: patch: escape for display
by jcid＠dillo.org April 7, 2008

April 7, 2008

On Sun, Apr 06, 2008 at 11:08:13PM +0000, corvid wrote: > > I ponder having a: > > > > const char *dStr_printable(dStr *in, int maxlen) > > > > that returns a pointer to an internal static dStr. It has > > the advantage of minimal interface overhead. e.g. > > > > - MSG_WARN(" \"%s\"\n", io->Buf->str); > > + MSG_WARN(" \"%s\"\n", dStr_printable(io->Buf, 2048)); > > > > of course it's not MT-safe, but we don't need it now. > > > > Implementing a MT-safe version is easy, but involves more > > calling overhead: > > > > dStr *dStr_printable(dStr *in, int maxlen) > > > > - MSG_WARN(" \"%s\"\n", io->Buf->str); > > + Dstr *printable = dStr_printable(io->Buf, 2048)); > > + MSG_WARN(" \"%s\"\n", printable->str)); > > + dStr_free(printable, 1); > > > > and disabling the message is not as clean as prepending an "_" > > to the macro. > > > > I'd go with the first alternative. > > Attached. > > I wasn't too sure about representation. Text has \x0D where ^M would > be much less surprising, but \x is easier to read for arbitrary bytes. > > It's funny that I had been calling truncation a bug and now I'm > truncating intentionally, but there is only so much a person > wants to see... Committed. -- Cheers Jorge.-

1 0

Re: patch: dStr_memmem
by jcid＠dillo.org April 6, 2008

April 6, 2008

Hi, Committed with a minor modification: /* * Return a pointer to the first occurrence of needle in haystack. */ char *dStr_memmem(Dstr *haystack, Dstr *needle) { int i; if (needle && haystack) { if (needle->len == 0) return haystack->str; for (i = 0; i <= (haystack->len - needle->len); i++) { - if (!memcmp(haystack->str + i, needle->str, needle->len)) + if (haystack->str[i] == needle->str[0] && + !memcmp(haystack->str + i, needle->str, needle->len)) return haystack->str + i; } } return NULL; } The idea is to avoid a 3 parameters function call per each checked character. Maybe it's even better to implement it without a function call (like dStristr()), but I haven't done any profiling so I'm not sure. It looks like an improvement though. ;-) -- Cheers Jorge.-

1 0

patch: FltkViewport::adjustScrollbarValues()
by corvid＠lavabit.com April 5, 2008

April 5, 2008

You know how the edges of pages like to hide under the scrollbars? This makes them stop doing that.

3 2

patch names
by jcid＠dillo.org April 2, 2008

April 2, 2008

Hi, Please submit your patches in this format: diff -pru dillo2 dillo2-cur > Patch-Name-Here.dillo2 diff -pru dw2 dw2-cur > Patch-Name-Here.dw2 -- Cheers Jorge.-

1 0

(place->corvid) popup menus
by corvid＠lavabit.com April 2, 2008

April 2, 2008

Got back to looking at why popup menus are offset by the height of the control panel, and // Make the popup a child of the calling UI object ((Group *)bw->ui)->add(pm); caught my eye. I thought perhaps if I made them children of Main instead, they would work. But first I tried commenting it out completely -- and now everything seems to work fine. The popups even remember the previous item chosen, which would allow the removal of click-to-load for images. Does anybody remember whether the add() call was for some reason that I haven't noticed? (Jorge cleared the moderation bit for me, so I think you will get this mail!)

3 6

From the BLFS project: [theoldfellow@gmail.com: Dillo - going, going....]
by onepoint＠starurchin.org March 31, 2008

March 31, 2008

The Beyond Linux From Scratch project is removing Dillo Classic because they don't want to list unsupported GTK1 applications (in fact they are looking to ditch GTK1 completely). They seem pretty keen on Dillo-FLTK though! Jeremy Henty ----- Forwarded message from TheOldFellow <theoldfellow(a)gmail.com> ----- From: TheOldFellow <theoldfellow(a)gmail.com> To: blfs-dev(a)linuxfromscratch.org Subject: Dillo - going, going.... Date: Mon, 31 Mar 2008 11:14:42 +0100 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.1.1 Well no one screamed that it was their favourite web browser, so I'll comment it out of the book later today. As an aside, I built Dillo2, still very alpha, with FLTK2, in Beta. The result is quite good. Lightning fast, and some nice features as a browser to build first and read BLFS with while you build the GTK2 and Firefox ziggurat. I'll put a wiki page together for it later too. R. -- http://linuxfromscratch.org/mailman/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page ----- End forwarded message -----

1 0

[patch] scroll cleanup
by Johannes.Hofmann＠gmx.de March 31, 2008

March 31, 2008

Hello, as promised here comes my attempt to cleanup the scrolling code a bit. scrollTo () is now the real method and scroll () is just a helper. I think that is more natural than the other way round. I also moved the call to updateCanvasWidgets () out of the draw () method again as I think draw () should not modify things if possible. I hope I have not reintroduced the widget scrolling bug place has just fixed. Can you verify this? Cheers, Johannes

3 2

Re: patch: Cookies_parse_one()
by jcid＠dillo.org March 29, 2008

March 29, 2008

On Thu, Mar 27, 2008 at 05:27:18PM +0000, place wrote: > I had to turn on cookies to try something, and the very first cookie I > saw threw the dpi into an infinite loop. > "TRK%5FLastLoginID=; expires=Fri, 27-Mar-2009 04:00:00 GMT; path=/" > > Instead of returning immediately on error, it eats its broken cookie up now. > And I added some dFree(attr)s. Good, thanks for the fixes; it's much simpler to debug functions that have a single return point. Committed. > > Oh, and the "catched" in Cookies_parse_string() should be "caught". > Should've put that in the patch, but I forgot. Committed. -- Cheers Jorge.-

1 0

Re: a_Url_cmp()
by jcid＠dillo.org March 29, 2008

March 29, 2008

On Sat, Mar 29, 2008 at 04:25:42AM +0000, place wrote: > 1. I happened to run into a preexisting bug in a_Url_cmp(). > > I hooked up the dialog code as the others had done for https, and the > first URL I tried was a redirect that goes > http://something -> https://something. The urls are identical except for > the scheme. It broke because a_Url_cmp() has > > (st = URL_STR_FIELD_I_CMP(A->scheme, B->scheme) == 0))) > instead of > (st = URL_STR_FIELD_I_CMP(A->scheme, B->scheme)) == 0)) Committed. > 2. The mail I tried to send some days back from my new account(*) also > happened to be about a_Url_cmp(). When I was playing with file inputs, > I generated the URL file:///something, with file:/something already in > cache. Cache did not find it because the authority of one was NULL and > the authority of the other was "". URL_STR_FIELD_I_CMP thinks those are > different things. Which is possible. Knowing how weird the URL spec gets, > the code might reflect a genuine difference, but sounds more like an error. Yes, current URL handling follows the spec. The problem is that the rest of dillo is using URLs like file:/something freely, when they should be file:///something. It should be easy to switch the file server dpi to generate "file:///"-prefixed URLS, and the input location to also normalize file:/ prefixed ones. But, if they appear in an external html page, it may be better to make the URL code normalize it (or check what other browsers do). > That I should run into these two issues at the very same time that I'm > trying to change a_Url_cmp() for url->data is a strange coincidence. Peer reviewing is always an asset. > > * And it receives list mail just fine. Andreas seemed to think that > as long as I'm subscribed, I shouldn't have any moderation problems. > Strange. Out of my control, anyway. I gave a look at the list settings. Please let me know your new email address to find whether I can do something to enable it. BTW, with the new patch for "missing widgets", when I first went to http://lists.auriga.wearlab.de/cgi-bin/mailman/admin/dillo-dev the Password input widget was missing! (it worked the next tries). -- Cheers Jorge.-

1 0

patch: widget scrolling
by place＠gobigwest.com March 29, 2008

March 29, 2008

I've had lots of trouble with widgets disappearing because my machine is too slow to keep up. But today I had the good fortune to happen to stumble upon updateCanvasWidgets()... Johannes, are there any unintended consequences to this fix?

3 3

patch: URL data as a Dstr
by place＠gobigwest.com March 29, 2008

March 29, 2008

This is part one in a series for file inputs. Parts two and three are written. Parts four and five are contemplated. Maybe a part six if I feel like it. Part three is the one that makes it at least appear to work, though I'll need help in testing at that point. HTTPS note: If https does remain a dpi, somebody will have to decide what they want to do with Capi_dpi_build_cmd() if http_query can contain NULLs.

2 1

ComplexButton crashing
by place＠gobigwest.com March 26, 2008

March 26, 2008

For you dw people... I am working on getting ComplexButton to work (image inputs), and it would segfault when I'd close the bw. In FltkComplexButtonResource::createNewWidget, the button's child is a view. When the button is destroyed, since the button is a Group, its children get destroyed. Later on, the layout is being destroyed, and it deletes TopLevel. The toplevel widget destructor calls layout->removeWidget(), which tries to iterate through the views. To make the problem go away, I added: fltkcomplexbutton.hh: ~ComplexButton() {remove_all();} but I don't know any of this code well enough to know what _should_ be going on.

2 4

removeIdle: *** [unknown] This should not happen! *** Aborted
by place＠gobigwest.com March 26, 2008

March 26, 2008

I think I mentioned this problem some time ago, but playing with ComplexButton makes it much worse (when meta charset causes a repush). The backtrace shows that it's unhappy because IdleFunc doesn't have an equals(). To make the problem go away, I changed the remove in FltkPlatform::removeIdle() to a removeRef, but, again, I don't know this code well enough to know what should be going on. #0 0x40344c81 in kill () from /lib/libc.so.6 #1 0x401b04a1 in pthread_kill () from /lib/libpthread.so.0 #2 0x401b087b in raise () from /lib/libpthread.so.0 #3 0x403448f8 in raise () from /lib/libc.so.6 #4 0x40345f00 in abort () from /lib/libc.so.6 #5 0x0809e054 in misc::assertNotReached () at misc.hh:67 #6 0x080ad6f1 in object::Object::equals (this=0x81ab118, other=0x81ab118) at object.cc:49 #7 0x080aa182 in container::untyped::List::remove0 (this=0x81c1b90, element=0x81ab118, compare=true, doNotDeleteAtAll=false) at container.cc:254 #8 0x080891c7 in container::untyped::List::remove (this=0x81c1b90, element=0x81ab118) at ../lout/container.hh:169 #9 0x080891eb in container::typed::List<dw::fltk::FltkPlatform::IdleFunc>::remo ve (this=0x81c1960, element=0x81ab118) at ../lout/container.hh:376 #10 0x08086968 in dw::fltk::FltkPlatform::removeIdle (this=0x81c1b68, idleId=1) at fltkplatform.cc:319 #11 0x0809feaa in ~Layout (this=0x81c1bf8) at layout.cc:117

3 3

Re: cache entry status
by jcid＠dillo.org March 26, 2008

March 26, 2008

On Sun, Mar 23, 2008 at 05:29:00PM +0000, place wrote: > This is what I've ended up with. I suspect you'll regard it as overengineered... A bit too complex, yes. Although most of it stems from a not so clear design isolation between cache, dicache, capi and the rest. BTW, I suspect the dicache may have obsolete parts. > I couldn't bring myself to call it is_cached when it returned various flags, > so it's entry_status. > > I didn't know what to do about testing for Aborted. Aborted is not yet implemented. I committed a modified version (hopefully simpler). > English: I was looking at some docs the other day, and I started to notice > that you use "there're" sometimes... It's perfectly normal in speech, but it > looks odd when written. Committed. -- Cheers Jorge.-

1 0

Re: patch: concatenate Dstrs
by jcid＠dillo.org March 24, 2008

March 24, 2008

Hi, On Mon, Mar 17, 2008 at 11:35:05PM +0000, place wrote: > I made a dStr_dstrcat(). > What's the main advantage of it, over dStr_append_l() ? I see the convenience and clarity of passing two parameters instead of three, but on the other hand, keeping APIs reduced to a functional minimum, helps to remember and to choose the right function call. There may be a point I don't yet see... -- Cheers Jorge.-

2 5

https plugin status
by Christian.Kellermann＠nefkom.net March 24, 2008

March 24, 2008

Dear list, is the https plugin supposed to work? Whenever I select a https URL dpid gets started but nothing happens whatsoever. I do have SSL enabled and all. I am aware that there is some work needed and that https support is considered as very basic. But what is supposed to be working atm? It is easier to fix bugs if you know what it should look like... Thanks, Christian -- You may use my gpg key for replies: pub 1024D/47F79788 2005/02/02 Christian Kellermann (C-Keen)

4 12

missing occasional messages on dillo-dev
by place＠gobigwest.com March 21, 2008

March 21, 2008

I've been missing the occasional message lately. I do not have any spam filtering. Does whoever admins the list have any insight?

3 5

multiple-scan images consume a lot of CPU
by Johannes.Hofmann＠gmx.de March 20, 2008

March 20, 2008

Hi, I really like the multiple-scan image feature added to dillo recently, but it uses quite some CPU and makes it drag slow when going back and forth on pages with a lot of images. So as the "TODO" comment in jpeg.c already suggests, we need some way to switch off multiple-scan when the image is readily available either from cache, from disk, or from a fast network connection. I think some sort of rate limiting would be best that restricts rescans to - say - once a second. What do you think? Cheers, Johannes

3 7

Re: patch: cookies string leak
by jcid＠dillo.org March 20, 2008

March 20, 2008

On Fri, Feb 01, 2008 at 06:26:56PM +0000, place wrote: > Also, what would you think of me either > > - stuffing the "Cookie2: $Version=\"1\"\r\n" header into a_Cookies_get(url) OK. Basically the same way referer is handled. > or > - adding a function to http.c to accomplish the same thing? > ...with a_Cookies_get() changed to show a distinction between > don't-want-cookies and don't-have-cookies. > > I almost never have any cookies enabled, so I'd prefer not to send > the Cookie2 header all of the time when I don't want their cookies. No problem. Leak patch committed. -- Cheers Jorge.-

4 7

[patch] don't allocate tagnames on stack
by Johannes.Hofmann＠gmx.de March 20, 2008

March 20, 2008

Hi, here is another patch that avoids some malloc/free calls. Cheers, Johannes diff --git a/src/html.cc b/src/html.cc --- a/src/html.cc +++ b/src/html.cc @@ -194,7 +194,7 @@ struct _DilloLinkImage { }; struct _DilloHtmlState { - char *tag_name; + const char *tag_name; dw::core::style::Style *style, *table_cell_style; DilloHtmlParseMode parse_mode; DilloHtmlTableMode table_mode; @@ -815,7 +815,7 @@ DilloHtml::DilloHtml(BrowserWindow *p_bw stack = new misc::SimpleVector <DilloHtmlState> (16); stack->increase(); - stack->getRef(0)->tag_name = dStrdup("none"); + stack->getRef(0)->tag_name = "none"; stack->getRef(0)->style = NULL; stack->getRef(0)->table_cell_style = NULL; stack->getRef(0)->parse_mode = DILLO_HTML_PARSE_MODE_INIT; @@ -1014,7 +1014,6 @@ void DilloHtml::closeParser(int ClientKe Html_tag_cleanup_at_close(this, stack->getRef(si)->tag_idx); } } - dFree(stack->getRef(0)->tag_name); /* "none" */ (stack->getRef(0)->style)->unref (); /* template style */ delete (stack); @@ -1596,18 +1595,14 @@ static void Html_eventually_pop_dw(Dillo */ static void Html_push_tag(DilloHtml *html, int tag_idx) { - char *tagstr; int n_items; - - /* Save the element's name (no parameters) into tagstr. */ - tagstr = dStrdup(Tags[tag_idx].name); n_items = html->stack->size (); html->stack->increase (); /* We'll copy the former stack item and just change the tag and its index * instead of copying all fields except for tag. --Jcid */ *html->stack->getRef(n_items) = *html->stack->getRef(n_items - 1); - html->stack->getRef(n_items)->tag_name = tagstr; + html->stack->getRef(n_items)->tag_name = Tags[tag_idx].name; html->stack->getRef(n_items)->tag_idx = tag_idx; /* proper memory management, may be unref'd later */ (S_TOP(html)->style)->ref (); @@ -1635,7 +1630,6 @@ static void Html_real_pop_tag(DilloHtml (S_TOP(html)->style)->unref (); if (S_TOP(html)->table_cell_style) (S_TOP(html)->table_cell_style)->unref (); - dFree(S_TOP(html)->tag_name); hand_over_break = S_TOP(html)->hand_over_break; html->stack->setSize (html->stack->size() - 1); Html_eventually_pop_dw(html, hand_over_break); @@ -5582,7 +5576,7 @@ static int Html_write_raw(DilloHtml *htm DILLO_HTML_PARSE_MODE_VERBATIM) { /* Non HTML code here, let's skip until closing tag */ do { - char *tag = S_TOP(html)->tag_name; + const char *tag = S_TOP(html)->tag_name; buf_index += strcspn(buf + buf_index, "<"); if (buf_index + (int)strlen(tag) + 3 > bufsize) { buf_index = bufsize;

2 3

[jcid@dillo.org: Re: [Dillo-dev] Re: patch: concatenate Dstrs]
by jcid＠dillo.org March 19, 2008

March 19, 2008

-- Cheers Jorge.-

1 0

[patch] further reduce redraws from resizing tables
by Johannes.Hofmann＠gmx.de March 18, 2008

March 18, 2008

Hi, below is another patch to reduce the redraws caused by resizing tables. A new method Layout::queueDrawExcept(), that requests the drawing of a rectangle except another rectangle is added. It is then used in widget.cc to redraw the area that was previously occupied by a widget, but is no longer occupied after a resize or move. This makes it possible to redraw less when a table resizes. All in all it should reduce the flicker a bit when loading table based pages. Cheers, Johannes diff --git a/dw/layout.cc b/dw/layout.cc --- a/dw/layout.cc +++ b/dw/layout.cc @@ -610,11 +610,36 @@ void Layout::queueDraw (int x, int y, in area.width = width; area.height = height; + if (area.isEmpty ()) return; + for (container::typed::Iterator <View> it = views->iterator (); it.hasNext (); ) { View *view = it.getNext (); view->queueDraw (&area); } +} + +void Layout::queueDrawExcept (int x, int y, int width, int height, + int ex, int ey, int ewidth, int eheight) { + + if (x == ex && y == ey && width == ewidth && height == eheight) + return; + + // queueDraw() the four rectangles within rectangle (x, y, width, height) + // around rectangle (ex, ey, ewidth, eheight). + // Some or all of these may be empty. + + // upper left corner of the intersection rectangle + int ix1 = misc::max (x, ex); + int iy1 = misc::max (y, ey); + // lower right corner of the intersection rectangle + int ix2 = misc::min (x + width, ex + ewidth); + int iy2 = misc::min (y + height, ey + eheight); + + queueDraw (x, y, width, iy1 - y); + queueDraw (x, iy2, width, y + height - iy2); + queueDraw (x, iy1, ix1 - x, iy2 - iy1); + queueDraw (ix2, iy1, x + width - ix2, iy2 - iy1); } void Layout::queueResize (bool asap) diff --git a/dw/layout.hh b/dw/layout.hh --- a/dw/layout.hh +++ b/dw/layout.hh @@ -133,6 +133,8 @@ private: void updateCursor (); void updateBgColor (); void queueDraw (int x, int y, int width, int height); + void queueDrawExcept (int x, int y, int width, int height, + int ex, int ey, int ewidth, int eheight); void queueResize (bool asap); void removeWidget (); diff --git a/dw/table.cc b/dw/table.cc --- a/dw/table.cc +++ b/dw/table.cc @@ -61,6 +61,7 @@ Table::Table(bool limitTextWidth) hasColPercent = 0; colPercents = new misc::SimpleVector <float> (8); + redrawX = 0; redrawY = 0; } @@ -191,10 +192,11 @@ void Table::sizeAllocateImpl (core::Allo void Table::resizeDrawImpl () { + queueDrawArea (redrawX, 0, allocation.width - redrawX, getHeight ()); queueDrawArea (0, redrawY, allocation.width, getHeight () - redrawY); + redrawX = allocation.width; redrawY = getHeight (); } - void Table::setWidth (int width) { diff --git a/dw/table.hh b/dw/table.hh --- a/dw/table.hh +++ b/dw/table.hh @@ -378,7 +378,7 @@ private: int numRows, numCols, curRow, curCol; misc::SimpleVector<Child*> *children; - int redrawY; + int redrawX, redrawY; /** * \brief The extremes of all columns. @@ -437,11 +437,7 @@ private: void setCumHeight (int row, int value) { if (value != cumHeight->get (row)) { - if (row > 0) { - redrawY = misc::min ( redrawY, cumHeight->get (row - 1) ); - } else { - redrawY = 0; - } + redrawY = misc::min ( redrawY, value ); cumHeight->set (row, value); } } @@ -449,7 +445,7 @@ private: inline void setColWidth (int col, int value) { if (value != colWidths->get (col)) { - redrawY = 0; + redrawX = misc::min (redrawX, value); colWidths->set (col, value); } } diff --git a/dw/types.hh b/dw/types.hh --- a/dw/types.hh +++ b/dw/types.hh @@ -71,6 +71,7 @@ public: bool intersectsWith (Rectangle *otherRect, Rectangle *dest); bool isSubsetOf (Rectangle *otherRect); bool isPointWithin (int x, int y); + bool isEmpty () { return width <= 0 || height <= 0; }; }; /** diff --git a/dw/widget.cc b/dw/widget.cc --- a/dw/widget.cc +++ b/dw/widget.cc @@ -418,6 +418,18 @@ void Widget::sizeAllocate (Allocation *a // widget->allocation.x, widget->allocation.y, // widget->allocation.width, widget->allocation.ascent, // widget->allocation.descent); + + if (wasAllocated ()) { + layout->queueDrawExcept ( + this->allocation.x, + this->allocation.y, + this->allocation.width, + this->allocation.ascent + this->allocation.descent, + allocation->x, + allocation->y, + allocation->width, + allocation->ascent + allocation->descent); + } sizeAllocateImpl (allocation);

2 4

saving files under recent fltk snapshots?
by place＠gobigwest.com March 18, 2008

March 18, 2008

I moved to snapshot 6066 (I'd been on 5990) the other day, and now I notice that dillo is unresponsive after I save a file. Seen in the 6059 announcement (http://fltk.org/articles.php?L791) "+ Changed the modal event loop of file_chooser() and dir_chooser() to use a new exec() method that delegates to Window::exec() internally. This exec() method should handle unpleasant side effects with other modal windows when closing the file_chooser dialog window. + Updated FileChooser.fl to reflect modifications made in the cxx/h files. Please do not edit these files directly (except the include header) Thanks." If anybody's tried a recent snapshot: Does it work for you?

3 2

[patch] don't restart scanning from start in Html_parse_entities ()
by Johannes.Hofmann＠gmx.de March 18, 2008

March 18, 2008

Hi, below is a small optinization to Html_parse_entities (). Cheers, Johannes diff -r bd486ec2a522 src/html.cc --- a/src/html.cc Sat Mar 15 19:41:01 2008 +0100 +++ b/src/html.cc Sat Mar 15 20:23:03 2008 +0100 @@ -1397,13 +1397,14 @@ static char * { const char *esc_set = "&\xE2\xC2"; char *new_str, buf[4]; - int i, j, k, n, isocode, entsize; + int i, j, k, n, s, isocode, entsize; new_str = dStrndup(token, toksize); - if (new_str[strcspn(new_str, esc_set)] == 0) + s = strcspn(new_str, esc_set); + if (new_str[s] == 0) return new_str; - for (i = j = 0; i < toksize; i++) { + for (i = j = s; i < toksize; i++) { if (token[i] == '&' && (isocode = Html_parse_entity(html, token+i, toksize-i, &entsize)) >= 0) {

3 3

patch: multipart/form-data CRLF
by place＠gobigwest.com March 17, 2008

March 17, 2008

Happened to notice in the RFC that multipart types must use CRLF between body parts. PS It was a bit annoying to figure out that http.c needed to be changed, which suggests that it would have been better for me to store the boundary string in DilloUrl somewhere after all.

2 1

patch: meta charset changes decoder
by place＠gobigwest.com March 16, 2008

March 16, 2008

This is no sort of proper fix whatsoever, but I was tired of seeing the "would set charset" message. It's actually surprisingly useful for remote files, since they're generally still at the javascript-and-css point at the end of the first packet.

3 9

libiconv fix for OpenBSD
by Christian.Kellermann＠nefkom.net March 16, 2008

March 16, 2008

Dear List, let me again thank you for your great efforts! One minor thing I stumbled upon today's update: My System has the following iconv signature: size_t iconv (iconv_t cd, const char* * inbuf, size_t * inbytesleft, char* * outbuf, size_t * outbytesleft); I therefore need something like the following to make dillo compile (an work) again: Index: src/html.cc =================================================================== RCS file: /sfhome/cvs/dillo/dillo2/src/html.cc,v retrieving revision 1.48 diff -b -u -p -r1.48 html.cc --- src/html.cc 13 Mar 2008 14:58:44 -0000 1.48 +++ src/html.cc 13 Mar 2008 21:43:26 -0000 @@ -3844,7 +3844,8 @@ static Dstr *Html_encode_text(iconv_t en int rc = 0; Dstr *output; const int bufsize = 128; - char *buffer, *inPtr, *outPtr; + const char *inPtr; + char *buffer, *outPtr; size_t inLeft, outRoom; bool bad_chars = false; I hope this does not break other systems. Kind regards, Christian -- You may use my gpg key for replies: pub 1024D/47F79788 2005/02/02 Christian Kellermann (C-Keen)

2 7

[PATCH]: a_Dpiapi_dialog should call a_Dialog_choice3 with 3 parameters
by onepoint＠starurchin.org March 15, 2008

March 15, 2008

a_Dpiapi_dialog() calls a_Dialog_choice3() with 2 parameters instead of 3. This causes the dialog to pop up a third button with a garbage label, and valgrind reports 'Conditional jump or move depends on uninitialised value(s)' from inside FLTK. Patch attached. This bug slipped through because dpiapi.c does not include dialog.hh to get the prototype of a_Dialog_choice3() . I'm not sure how to fix this: should a C source file be including a C++ header? If not, how else can dpiapi.c get the prototype? Regards, Jeremy Henty

2 3

[PATCH]: send the https dpi plugin debug messages to the right place
by onepoint＠starurchin.org March 15, 2008

March 15, 2008

The https DPI plugin sends its debug messages to stdin. This is wrong because the DPI daemon dups the plugin's stdin to the DPI socket. This patch redirects the debug messages to stderr. Jeremy Henty

1 0

Re: patch: reorder headers in query string
by jcid＠dillo.org March 13, 2008

March 13, 2008

On Thu, Mar 13, 2008 at 04:42:04PM +0000, place wrote: > > It'd be good to keep the suggested ordering then. > > Attached. Committed. -- Cheers Jorge.-

1 0

[patch] reduce malloc/free use a bit
by Johannes.Hofmann＠gmx.de March 13, 2008

March 13, 2008

Hi, the patch below reduces the use of malloc/free a bit. For loading http://www.w3.org/TR/xslt for example it reduces the number of calls to dMalloc() from 76735 to 50478 (according to gprof). I have removed the SPCBuf member of html, as it seems not to be used. Please correct me if I'm wrong or it is intended to be used for in the future. Cheers, Johannes diff --git a/src/html.cc b/src/html.cc --- a/src/html.cc +++ b/src/html.cc @@ -295,8 +295,6 @@ public: //BUG: for now everything is pu Dstr *Stash; bool_t StashSpace; - - char *SPCBuf; /* Buffer for white space */ int pre_column; /* current column, used in PRE tags with tabs */ bool_t PreFirstChar; /* used to skip the first CR or CRLF in PRE tags */ @@ -823,8 +821,6 @@ DilloHtml::DilloHtml(BrowserWindow *p_bw Stash = dStr_new(""); StashSpace = FALSE; - SPCBuf = NULL; - pre_column = 0; PreFirstChar = FALSE; PrevWasCR = FALSE; @@ -1011,7 +1007,6 @@ void DilloHtml::closeParser(int ClientKe delete (stack); dStr_free(Stash, TRUE); - dFree(SPCBuf); dStr_free(attr_data, TRUE); /* Fit the UTF-8 buffer */ @@ -1430,9 +1425,7 @@ static void Html_process_space(DilloHtml html->SPCPending = FALSE; } else if (parse_mode == DILLO_HTML_PARSE_MODE_VERBATIM) { - char *Pword = dStrndup(space, spacesize); - dStr_append(html->Stash, Pword); - dFree(Pword); + dStr_append_l(html->Stash, space, spacesize); html->SPCPending = FALSE; } else if (parse_mode == DILLO_HTML_PARSE_MODE_PRE) { @@ -1475,8 +1468,6 @@ static void Html_process_space(DilloHtml /* SGML_SPCDEL ignores white space inmediately after an open tag */ html->SPCPending = FALSE; } else { - dFree(html->SPCBuf); - html->SPCBuf = dStrndup(space, spacesize); html->SPCPending = TRUE; } @@ -1510,9 +1501,7 @@ static void Html_process_word(DilloHtml } else if (parse_mode == DILLO_HTML_PARSE_MODE_VERBATIM) { /* word goes in untouched, it is not processed here. */ - Pword = dStrndup(word, size); - dStr_append(html->Stash, Pword); - dFree(Pword); + dStr_append_l(html->Stash, word, size); } if (parse_mode == DILLO_HTML_PARSE_MODE_STASH ||

2 1

Re: patch: reorder headers in query string
by jcid＠dillo.org March 13, 2008

March 13, 2008

On Wed, Mar 12, 2008 at 03:51:24PM +0000, place wrote: > My idea of what seems like a good ordering, for what that's worth :) > When I watch the headers, I always wonder why I didn't put Accept-Encoding > next to Accept-Charset, for one thing... AFAIR headers are ordered as they appear in the RFC. I'm not sure whether this is relevant, please check. -- Cheers Jorge.-

2 2

Re: patch: reorder headers in query string
by jcid＠dillo.org March 13, 2008

March 13, 2008

On Wed, Mar 12, 2008 at 03:51:24PM +0000, place wrote: > [...] > BTW, I sent a User-Agent patch long ago and never heard anything. > I could send another... I seem to remember that you finally didn't think of it as a very helpful idea, but don't find any email saying so... -- Cheers Jorge.-

3 2

Re: patch: rm ^F shortcut from menu.cc
by jcid＠dillo.org March 12, 2008

March 12, 2008

Committed. -- Cheers Jorge.-

1 0

[patch] allow drag scrolling on images without link
by Johannes.Hofmann＠gmx.de March 11, 2008

March 11, 2008

Hi, the patch below allows drag scrolling on images that don't have a link. Cheers, Johannes diff -r 2d5370131f9f dw/image.cc --- a/dw/image.cc Sat Mar 08 16:56:13 2008 +0100 +++ b/dw/image.cc Mon Mar 10 22:06:20 2008 +0100 @@ -157,12 +157,15 @@ void Image::leaveNotifyImpl (core::Event bool Image::buttonPressImpl (core::EventButton *event) { - if (event->button == 3){ + if (event->button == 3) { (void)emitLinkPress(getStyle()->x_link, getStyle()->x_img, -1,-1,event); + return true; + } else if (getStyle()->x_link != -1) { + clicking = true; + return true; } else { - clicking = true; + return false; } - return true; } bool Image::buttonReleaseImpl (core::EventButton *event) @@ -170,8 +173,10 @@ bool Image::buttonReleaseImpl (core::Eve if (clicking) { clicking = false; emitLinkClick (getStyle()->x_link, getStyle()->x_img, -1, -1, event); + return true; + } else { + return false; } - return true; } void Image::draw (core::View *view, core::Rectangle *area)

2 3

From the FLTK devs: [dejan.lekic@gmail.com: Re: [fltk.development] This year GSOC]
by onepoint＠starurchin.org March 8, 2008

March 8, 2008

Just to make sure no-one misses this, some love from the FLTK guys! Jeremy Henty ----- Forwarded message from Dejan Lekic <dejan.lekic(a)gmail.com> ----- From: Dejan Lekic <dejan.lekic(a)gmail.com> To: fltk-dev(a)easysw.com Subject: Re: [fltk.development] This year GSOC Date: Thu, 28 Feb 2008 08:25:55 -0800 Personally, the thing I most anticipate and would like to see improved, which is related to FLTK, is the Dillo port to FLTK2. Seriously, if Dillo2 could be done as a library, and provide a Group widget which is directly embeddable into any FLTK2 application, that would be IMHO a huuuuuge thing. So, I hope someone would help Dillo guys either via GSoC, or other way(s). More information: http://www.dillo.org . Get the fresh FLTK2 port of Dillo from CVS: :pserver:anonymous@auriga.wearlab.de:/sfhome/cvs/dillo Kind regards _______________________________________________ fltk-dev mailing list fltk-dev(a)easysw.com http://lists.easysw.com/mailman/listinfo/fltk-dev ----- End forwarded message -----

3 2

patch: entities in options
by place＠gobigwest.com March 7, 2008

March 7, 2008

I was getting crashes on the dFree(tok) in Html_parse_entity() on a page that I whittled down to: <html> <head> <title></title> </head> <body> <form> <select> <option>&Someword </select> </form> </body> </html> It turns out that strchr(":_.-", '\0') finds the null terminator in the string. diff -pur dillo2/src/html.cc dillo2-cur/src/html.cc --- dillo2/src/html.cc 2008-03-06 14:58:56.000000000 +0000 +++ dillo2-cur/src/html.cc 2008-03-07 05:46:52.000000000 +0000 @@ -1350,7 +1350,7 @@ static int Html_parse_entity(DilloHtml * } else if (isalpha(*s)) { /* character entity reference */ - while (isalnum(*++s) || strchr(":_.-", *s)); + while (*++s && (isalnum(*s) || strchr(":_.-", *s))); c = *s; *s = 0;

2 1

patch: form data character encoding
by place＠gobigwest.com March 6, 2008

March 6, 2008

It seems to be working well. For example, you can go to www.google.gr and paste in ????????. Instead of 2530 hits of gibberish, you now get 57,400,000 of Greek. I ran it through various tests, but of course it'll get better testing from those of you who routinely use ?'s and ?'s and so on. It's an annoyance that fltk won't allow normal X character composing. I don't want to learn their special rules, so I have to paste anything non-ascii from an xterm.

3 3

[patch] simplify Region::addRectangle ()
by Johannes.Hofmann＠gmx.de March 6, 2008

March 6, 2008

Hi, the patch below simplifies Region::addRectangle () quite a bit. It now simply tries to minimize the sum of the areas of all rectangles in the Region while still covering all rectangles that have been added with addRectangle (). For example if we have Thereby the total area that is actually redrawn is reduced and the code gets much simpler. However it may now happen that small parts of the screen are drawn that were not requested to be drawn. This patch does not reduce any flickering. Cheers, Johannes diff --git a/dw/types.cc b/dw/types.cc --- a/dw/types.cc +++ b/dw/types.cc @@ -240,40 +240,22 @@ void Region::addRectangle (Rectangle *rP for (it = rectangleList->iterator (); it.hasNext (); ) { Rectangle *ownRect = it.getNext (); - /* check if r an ownRect can be combined vertically */ - if (r->x == ownRect->x && r->width == ownRect->width) { - int combinedHeight = - misc::max(r->y + r->height, ownRect->y + ownRect->height) - - misc::min(r->y, ownRect->y); + int combinedHeight = + misc::max(r->y + r->height, ownRect->y + ownRect->height) - + misc::min(r->y, ownRect->y); + int combinedWidth = + misc::max(r->x + r->width, ownRect->x + ownRect->width) - + misc::min(r->x, ownRect->x); - if (combinedHeight <= r->height + ownRect->height) { + if (combinedWidth * combinedHeight <= + ownRect->width * ownRect->height + r->width * r->height) { + + r->x = misc::min(r->x, ownRect->x); r->y = misc::min(r->y, ownRect->y); + r->width = combinedWidth; r->height = combinedHeight; + rectangleList->removeRef (ownRect); - } - - /* check if r an ownRect can be combined horizontally */ - } else if (r->y == ownRect->y && r->height == ownRect->height) { - int combinedWidth = - misc::max(r->x + r->width, ownRect->x + ownRect->width) - - misc::min(r->x, ownRect->x); - - if (combinedWidth <= r->width + ownRect->width) { - r->x = misc::min(r->x, ownRect->x); - r->width = combinedWidth; - rectangleList->removeRef (ownRect); - } - } - } - - for (it = rectangleList->iterator (); it.hasNext (); ) { - Rectangle *ownRect = it.getNext (); - - if (r->isSubsetOf (ownRect)) { - delete r; - return; - } else if (ownRect->isSubsetOf (r)) { - rectangleList->removeRef (ownRect); } } diff --git a/dw/types.hh b/dw/types.hh --- a/dw/types.hh +++ b/dw/types.hh @@ -121,6 +121,8 @@ public: * \brief dw::core::Shape implementation for a point set. * Currently represented as a set of rectangles not containing * each other. + * It is guaranteed that the rectangles returned by rectangles () + * cover all rectangles that were added with addRectangle (). */ class Region: public Shape {

2 3

patch: choose charset for form submission
by place＠gobigwest.com March 4, 2008

March 4, 2008

It picks a charset, but doesn't actually do any translation. I have to decide whether to distort the charset decoder to handle encoding. It's nice to have all of the iconv stuff in one place, but it's not nice to have something that's shaped to decode dbufs reused for just any purpose...

2 3

two warnings in table.cc
by Johannes.Hofmann＠gmx.de March 3, 2008

March 3, 2008

Hi, here are two more warnings like this: table.cc: In member function 'void dw::Table::forceCalcColumnExtremes()': table.cc:778: warning: 'wMin' may be used uninitialized in this function table.cc: In member function 'void dw::Table::forceCalcCellSizes()': table.cc:483: warning: 'totalWidth' may be used uninitialized in this function Cheers, Johannes

2 1

segfault in Html_submit_form2()
by Johannes.Hofmann＠gmx.de March 3, 2008

March 3, 2008

Hi, after updating to latest CVS, I got the following segfault when submitting a simple form: Program terminated with signal 11, Segmentation fault. #0 0x0805de09 in a_Html_form_event_handler (data=0x28794400, form_receiver=0x28835620, v_resource=0x28841000) at html.cc:4006 4006 input->name, val->str); (gdb) bt #0 0x0805de09 in a_Html_form_event_handler (data=0x28794400, form_receiver=0x28835620, v_resource=0x28841000) at html.cc:4006 #1 0x0805b301 in form::Form::activate (this=0x28835620, resource=0x28841000) at form.cc:100 #2 0x0808e6f7 in dw::core::ui::Resource::ActivateEmitter::emitToReceiver ( this=0x28841008, receiver=0x28835628, signalNo=0, argc=2, argv=0xbfbff15c) at ui.cc:101 #3 0x08093886 in loutsignal::Emitter::emitVoid (this=0x28841008, signalNo=0, argc=2, argv=0xbfbff15c) at signal.cc:81 #4 0x0808e727 in dw::core::ui::Resource::ActivateEmitter::emitActivate (this=0x28841008, resource=0x28841000) at ui.cc:109 #5 0x080aa945 in fltk::Input::handle_key () #6 0x080aadde in fltk::Input::handle () #7 0x080ab0d4 in fltk::Input::handle () #8 0x080ceddb in fltk::Widget::send () #9 0x080b67e4 in fltk::handle () #10 0x080b9bfb in fltk::handle () #11 0x080bb16b in do_queued_events () #12 0x080bb3ad in fltk::wait () #13 0x080bb55d in fltk::run () I think the problem is, that boundary only gets initialized if form->enc == DILLO_HTML_ENC_MULTIPART. Cheers, Johannes

3 8

dw::Table valgrind-friendliness
by Johannes.Hofmann＠gmx.de March 3, 2008

March 3, 2008

On Sun, Mar 02, 2008 at 03:45:09PM +0000, Jeremy Henty wrote: > On Sun, Mar 02, 2008 at 04:14:00PM +0100, Johannes Hofmann wrote: > > > I think your proposed fix is fine. It's just that I don't like the > > wrapper methods too much in the first place and now we need even > > more code to support it... > > I'm not particularly attached to my proposed fix, my real concern is > being valgrind clean because anything that makes valgrind harder to > use is bad news. My patch was just the simplest way I could see to > achieve that. If there's a better way to do it then that's great! > ok, here is my proposal. It reduces the additional code in table.cc a bit. Thanks to Jeremy for testing with valgrind. Johannes diff -r 4582dc80e696 dw/table.cc --- a/dw/table.cc Sun Mar 02 13:40:23 2008 +0100 +++ b/dw/table.cc Sun Mar 02 21:21:17 2008 +0100 @@ -516,8 +516,8 @@ void Table::forceCalcCellSizes () printf(" totalWidth2 = %d curCol=%d\n", totalWidth,curCol); #endif - colWidths->setSize (numCols); - cumHeight->setSize (numRows + 1); + colWidths->setSize (numCols, 0); + cumHeight->setSize (numRows + 1, 0); rowSpanCells->setSize (0); baseline->setSize (numRows); #ifdef DBG @@ -857,7 +857,7 @@ void Table::apportion2 (int totalWidth, if (!maxAutoWidth) // no LEN_AUTO cols! return; - colWidths->setSize (colExtremes->size ()); + colWidths->setSize (colExtremes->size (), 0); if (!forceTotalWidth && maxAutoWidth < availAutoWidth) { // Enough space for the maximum table, don't widen past max. diff -r 4582dc80e696 lout/misc.hh --- a/lout/misc.hh Sun Mar 02 13:40:23 2008 +0100 +++ b/lout/misc.hh Sun Mar 02 21:21:17 2008 +0100 @@ -161,6 +161,18 @@ public: inline void setSize(int newSize) { this->num = newSize; this->resize (); } /** + * \brief Set the size explicitely and initialize new values. + * + * May be necessary before called before misc::SimpleVector::set. + */ + inline void setSize (int newSize, T t) { + int oldSize = this->num; + setSize (newSize); + for (int i = oldSize; i < newSize; i++) + set (i, t); + } + + /** * \brief Return the reference of one element. * * \sa misc::SimpleVector::get

2 1