- Dillo-dev - lists.mailman3.com

[patch] simplify Region::addRectangle ()

by Johannes.Hofmann＠gmx.de

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 {

March 5, 2008

patch: choose charset for form submission

by jcid＠dillo.org

On Tue, Mar 04, 2008 at 03:02:36PM +0000, place wrote: > Jorge wrote: > > On Tue, Mar 04, 2008 at 06:47:22AM +0000, place wrote: > > > It picks a charset, but doesn't actually do any translation. > > > > Committed with minor changes. > > But if you dFree(first) ahead of time, won't that be bad for > html->formNew(method, action, enc, charset);? Ooops, yes. Reversed to original. -- Cheers Jorge.-

March 4, 2008

patch: choose charset for form submission

by place＠gobigwest.com

Jorge wrote: > On Tue, Mar 04, 2008 at 06:47:22AM +0000, place wrote: > > It picks a charset, but doesn't actually do any translation. > > Committed with minor changes. But if you dFree(first) ahead of time, won't that be bad for html->formNew(method, action, enc, charset);?

March 4, 2008

patch: choose charset for form submission

by jcid＠dillo.org

Hi, On Tue, Mar 04, 2008 at 06:47:22AM +0000, place wrote: > It picks a charset, but doesn't actually do any translation. Committed with minor changes. > 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... I'm all for clarity. If you need to add a "encode.c" source file, go ahead. If a simple function is enough, let it be. If distortion comes in, something is wrong. :-) -- Cheers Jorge.-

March 4, 2008

patch: choose charset for form submission

by place＠gobigwest.com

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...

March 4, 2008

two warnings in table.cc

by jcid＠dillo.org

On Mon, Mar 03, 2008 at 07:03:57PM +0100, Johannes Hofmann wrote: > 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 One bug, one false positive. Fixes committed. These warnings are really helpful. -- Cheers Jorge.-

March 3, 2008

two warnings in table.cc

by Johannes.Hofmann＠gmx.de

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

March 3, 2008

patch: Re: [Dillo-dev] segfault in Html_submit_form2()

by place＠gobigwest.com

Jorge wrote: > The question is, do you want me to commit the API change too? It doesn't matter to me.

March 3, 2008

segfault in Html_submit_form2()

by jcid＠dillo.org

On Mon, Mar 03, 2008 at 05:48:47PM +0000, place wrote: > Johannes wrote: > > It was crashing on every form submit I tried (e.g. www.google.com) > > Hmm. Too bad I'm still on old Linux. > (I looked at DragonflyBSD some months ago, by the way, and was disappointed > that I couldn't install from a file on the hard drive. I don't even have a > CD writer.) > > > I also got a compiler warning: > > > > html.cc:3945: warning: 'boundary' may be used uninitialized in this function > > I wasn't getting a warning, but this brings up something I've been meaning > to ask: Jorge, what do you think of -Werror? So far as I can recall, the > only warning on the dillo2/ side currently is Html_input_image. > It would save me the trouble of monitoring compilation... I use: make|grep : quite handy! -- Cheers Jorge.-

March 3, 2008

segfault in Html_submit_form2()

by jcid＠dillo.org

On Mon, Mar 03, 2008 at 06:14:29PM +0100, Johannes Hofmann wrote: > Hi Jorge, > > On Mon, Mar 03, 2008 at 02:04:25PM -0300, Jorge Arellano Cid wrote: > > Hi Johannes, > > > > On Mon, Mar 03, 2008 at 05:16:51PM +0100, Johannes Hofmann wrote: > > > Hi, > > > > > > after updating to latest CVS, I got the following segfault when > > > submitting a simple form: > > > > > [...] > > > I think the problem is, that boundary only gets initialized if > > > form->enc == DILLO_HTML_ENC_MULTIPART. > > > > It doesn't segfault for me. Anyway I committed a small fix. > > Please test and post the URL that was triggering the bug. > > Yes, that fixes it. Good! > It was crashing on every form submit I tried (e.g. www.google.com) > I also got a compiler warning: > > html.cc:3945: warning: 'boundary' may be used uninitialized in this function Funny how it worked OK here for google, linuxpackages and our bug track engine. Even more, I don't get a compiler warning with: gcc version 4.1.2 20061115 (prerelease) (Debian 4.1.1-21) -- Cheers Jorge.-

March 3, 2008