- Dillo-dev - lists.mailman3.com

[patch] allow drag scrolling on images without link

by Johannes.Hofmann＠gmx.de

On Tue, Mar 11, 2008 at 06:15:24PM -0400, Jorge Arellano Cid wrote: > Hi, > > On Mon, Mar 10, 2008 at 10:09:29PM +0100, Johannes Hofmann wrote: > > Hi, > > > > the patch below allows drag scrolling on images that don't have a > > link. > > Oh, I committed a patch fix to let click-to-load over unloaded images > to work again (i.e. from img-off mode). Good point. Thanks, Johannes

March 12, 2008

[patch] allow drag scrolling on images without link

by jcid＠dillo.org

Hi, On Mon, Mar 10, 2008 at 10:09:29PM +0100, Johannes Hofmann wrote: > Hi, > > the patch below allows drag scrolling on images that don't have a > link. Oh, I committed a patch fix to let click-to-load over unloaded images to work again (i.e. from img-off mode). -- Cheers Jorge.-

March 11, 2008

patch: meta charset changes decoder

by jcid＠dillo.org

Hi, On Fri, Mar 07, 2008 at 04:21:16PM +0000, place wrote: > Jorge wrote: > > On Fri, Mar 07, 2008 at 06:17:17AM +0000, place wrote: > > > 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. > > > > You mean, the decoder injection usually happens in the javascript-and-css > > section, right? > > > > Please post some test-case URLs. > > Ummm, okay. > I'll search for ?????????????????? and see what comes up, > looking for pages where meta is setting it to something other than utf-8. OK, committed as is. I tried to make a "clean" switch by re-starting parsing all over again, but it needs more work (prototype works but unstable). > http://www.nbu.bg/ works. > http://www.biforum.org/ works. > http://bgstudent.8m.com/ works. > http://www.newobjects.com/dict.asp works. > http://www.mastylo.net/ fails that content-type testing in misc.c. > http://bultext.tripod.com/ works. (tripod's still around?) > http://textove.com/ works. > http://bgstories.athost.net/ works. > http://www.bglekar.com/ works even though it sets charset to ISO-8859-1! > (it's all entities) > > Getting bored, but I'll keep going until one breaks by having body text in > the first packet. > > http://www.bds-bg.org/ works. > http://www.kursove-neg.com/ works. > http://avast.110mb.com/ fails that content-type testing in misc.c. > http://esperanto.vnvsoft.com/ works. > http://www.dfbulgaria.org/ works. > http://www.bghelsinki.org/ works. > http://www.bcnl.org/ works. > http://www.angelfire.com/ca/canbul/Bcacb.html works. > http://www.ibl.bas.bg/ works. > http://bgjedi.com/ breaks. So no Bulgarian jedi for dillo yet. Thanks for the examples. > And of course the titles are all broken, but my window manager can only > understand latin1 anyway. Oh, titles and local files work here (with the unstable prototype). -- Cheers Jorge.-

March 11, 2008

[patch] allow drag scrolling on images without link

by jcid＠dillo.org

On Mon, Mar 10, 2008 at 10:09:29PM +0100, Johannes Hofmann wrote: > Hi, > > the patch below allows drag scrolling on images that don't have a > link. Committed. -- Cheers Jorge.-

March 11, 2008

[patch] further reduce redraws from resizing tables

by Johannes.Hofmann＠gmx.de

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);

March 11, 2008

[patch] allow drag scrolling on images without link

by Johannes.Hofmann＠gmx.de

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)

March 10, 2008

From the FLTK devs: [dejan.lekic@gmail.com: Re: [fltk.development] This year GSOC]

by jcid＠dillo.org

Hi Jeremy, On Thu, Feb 28, 2008 at 05:32:55PM +0000, Jeremy Henty wrote: > > Just to make sure no-one misses this, some love from the FLTK guys! > > Jeremy Henty I've tried several times to contact Dejan (at his gmail and nu6 addresses with no luck. Do your emails get answers from those addresses? and if so, would you mind asking him to whitelist me or something? -- Cheers Jorge.- > > > ----- 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 -----

March 8, 2008

patch: meta charset changes decoder

by place＠gobigwest.com

Jorge wrote: > On Fri, Mar 07, 2008 at 06:17:17AM +0000, place wrote: > > 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. > > You mean, the decoder injection usually happens in the javascript-and-css > section, right? > > Please post some test-case URLs. Ummm, okay. I'll search for ????????? and see what comes up, looking for pages where meta is setting it to something other than utf-8. http://www.nbu.bg/ works. http://www.biforum.org/ works. http://bgstudent.8m.com/ works. http://www.newobjects.com/dict.asp works. http://www.mastylo.net/ fails that content-type testing in misc.c. http://bultext.tripod.com/ works. (tripod's still around?) http://textove.com/ works. http://bgstories.athost.net/ works. http://www.bglekar.com/ works even though it sets charset to ISO-8859-1! (it's all entities) Getting bored, but I'll keep going until one breaks by having body text in the first packet. http://www.bds-bg.org/ works. http://www.kursove-neg.com/ works. http://avast.110mb.com/ fails that content-type testing in misc.c. http://esperanto.vnvsoft.com/ works. http://www.dfbulgaria.org/ works. http://www.bghelsinki.org/ works. http://www.bcnl.org/ works. http://www.angelfire.com/ca/canbul/Bcacb.html works. http://www.ibl.bas.bg/ works. http://bgjedi.com/ breaks. So no Bulgarian jedi for dillo yet. And of course the titles are all broken, but my window manager can only understand latin1 anyway.

March 7, 2008

patch: meta charset changes decoder

by jcid＠dillo.org

On Fri, Mar 07, 2008 at 06:17:17AM +0000, place wrote: > 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. You mean, the decoder injection usually happens in the javascript-and-css section, right? Please post some test-case URLs. -- Cheers Jorge.-

March 7, 2008

patch: entities in options

by jcid＠dillo.org

On Fri, Mar 07, 2008 at 06:15:33AM +0000, place wrote: > 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. Good!, committed. -- Cheers Jorge.-

March 7, 2008