- Dillo-dev - lists.mailman3.com

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

Re: patch: boundary for multipart/form-data submission with zero parts
by jcid＠dillo.org March 3, 2008

March 3, 2008

Hi, On Sun, Mar 02, 2008 at 07:05:08PM +0000, place wrote: > Looking again at rfc 2046, I notice that an empty boundary string is not legal. > > As for what to do in the body in that case, it's conceivable that a lifetime > of digging through RFCs would yield a definitive answer for a weird > corner case, but it's far from being worth the trouble... > (Firefox sends a body consisting of an ending boundary line "--[boundary]--") Committed. -- Cheers Jorge.-

1 0

patch: multipart/form-data encoding for form submission
by jcid＠dillo.org March 3, 2008

March 3, 2008

Hi, On Sun, Mar 02, 2008 at 09:20:53PM +0000, place wrote: > > For: > > > > > + // BUG: strstr stops at NULL. Cannot use for file inputs. > > > + success = !strstr(DataStr->str, boundary->str); > > > > please use memcmp(). > > How about if I make a separate patch for that at some point with > a Dstr_memmem() or something like that? OK. > > Some basic testing would be welcomed, but the main probe will > > be done by usage when committed. > > I added some comments, > changed the size of my dList_new() because the old value -- a holdover > from when I thought I'd do it differently -- could mislead the unwary, > and moved the dStr_free(boundary) down a little, > but this version should have no functional changes from the > version sent to the list yesterday. Committed. -- Cheers Jorge.-

1 0

dw::Table valgrind-friendliness
by onepoint＠starurchin.org March 2, 2008

March 2, 2008

Dillo has been neglecting its valgrind cleanliness recently and it turns out the culprit is dw::Table, which resizes its internal vectors without initialising any new values that appear. If you valgrind dillo and immediately close the splash window, valgrind reports 121 "Conditional jump or move depends on uninitialised value" errors! This patch reduces that number to 2! Regards, Jeremy Henty

3 7