- Dillo-dev - lists.mailman3.com

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