- Dillo-dev - lists.mailman3.com

[patch] improve scroll performance of dillo-fltk
by Johannes Hofmann Oct. 16, 2007

Oct. 16, 2007

Hi, below is an initial patch that improves scrolling performance of dillo-fltk by copying screen data instead of rerendering it. It's based on Scroll.cxx from fltk. The difference is noticeable mostly when scrolling large images especially within a remote X11 session. The newly introduced scrollDX / scrollDY could probabely be combined with the existing oldScrollX / oldScrollY variables. Regards, Johannes diff --git a/dw-testbed-0.0.43j/dw/fltkviewbase.cc b/dw-testbed-0.0.43j/dw/fltkviewbase.cc --- a/dw-testbed-0.0.43j/dw/fltkviewbase.cc +++ b/dw-testbed-0.0.43j/dw/fltkviewbase.cc @@ -54,18 +54,16 @@ void FltkViewBase::draw () Group::draw (); - if (damage () & DAMAGE_EXPOSE) { - setcolor (bgColor); - ::fltk::Rectangle rect (0, 0, w(), h()); - fillrect (rect); - - core::Rectangle area; - area.x = translateViewXToCanvasX (0); - area.y = translateViewYToCanvasY (0); - area.width = translateViewXToCanvasX (0 + w ()) - 0; - area.height = translateViewYToCanvasY (0 + h ()) - 0; - theLayout->expose (this, &area); - } + setcolor (bgColor); + ::fltk::Rectangle rect (0, 0, w(), h()); + fillrect (rect); + + core::Rectangle area; + area.x = translateViewXToCanvasX (0); + area.y = translateViewYToCanvasY (0); + area.width = translateViewXToCanvasX (0 + w ()) - 0; + area.height = translateViewYToCanvasY (0 + h ()) - 0; + theLayout->expose (this, &area); } core::ButtonState getDwButtonState () diff --git a/dw-testbed-0.0.43j/dw/fltkviewport.cc b/dw-testbed-0.0.43j/dw/fltkviewport.cc --- a/dw-testbed-0.0.43j/dw/fltkviewport.cc +++ b/dw-testbed-0.0.43j/dw/fltkviewport.cc @@ -131,8 +131,8 @@ void FltkViewport::hscrollbarChanged () { int oldScrollX = scrollX; scrollX = hscrollbar->value (); - /** \bug Inefficient */ - redraw (DAMAGE_EXPOSE); + scrollDX = scrollX - oldScrollX; + redraw (DAMAGE_SCROLL); updateCanvasWidgets (oldScrollX, scrollY); theLayout->scrollPosChanged (this, scrollX, scrollY); } @@ -141,8 +141,8 @@ void FltkViewport::vscrollbarChanged () { int oldScrollY = scrollY; scrollY = vscrollbar->value (); - /** \bug Inefficient */ - redraw (DAMAGE_EXPOSE); + scrollDY = scrollY - oldScrollY; + redraw (DAMAGE_SCROLL); updateCanvasWidgets (scrollX, oldScrollY); theLayout->scrollPosChanged (this, scrollX, scrollY); } @@ -163,6 +163,25 @@ void FltkViewport::layout () { theLayout->viewportSizeChanged (this, w(), h()); adjustScrollbarsAndGadgetsAllocation (); +} + +void FltkViewport::draw_area (void *data, const Rectangle& cr ) +{ + FltkViewport *vp = (FltkViewport*) data; + push_clip(cr); + + vp->FltkWidgetView::draw (); + + //draw_child (*hscrollbar); + //draw_child (*vscrollbar); + + for(Iterator <TypedPointer < ::fltk::Widget> > it = vp->gadgets->iterator (); + it.hasNext (); ) { + ::fltk::Widget *widget = it.getNext()->getTypedValue (); + vp->draw_child (*widget); + } + + pop_clip(); } void FltkViewport::draw () @@ -170,20 +189,16 @@ void FltkViewport::draw () int hdiff = vscrollbar->visible () ? SCROLLBAR_THICKNESS : 0; int vdiff = hscrollbar->visible () ? SCROLLBAR_THICKNESS : 0; Rectangle cr (0, 0, w () - hdiff, h () - vdiff); - push_clip(cr); - - FltkWidgetView::draw (); - - //draw_child (*hscrollbar); - //draw_child (*vscrollbar); - - for(Iterator <TypedPointer < ::fltk::Widget> > it = gadgets->iterator (); - it.hasNext (); ) { - ::fltk::Widget *widget = it.getNext()->getTypedValue (); - draw_child (*widget); - } - - pop_clip(); + int d = damage(); + + if (d == DAMAGE_SCROLL) { + scrollrect(cr, -scrollDX, -scrollDY, draw_area, this); + } else { + draw_area(this, cr); + } + + scrollDX = 0; + scrollDY = 0; } int FltkViewport::handle (int event) @@ -205,8 +220,9 @@ int FltkViewport::handle (int event) case PageUpKey: oldScrollY = scrollY; scrollY -= vscrollbar->pagesize (); + scrollDY = scrollY - oldScrollY; adjustScrollbarValues (); - redraw (DAMAGE_EXPOSE); + redraw (DAMAGE_SCROLL); updateCanvasWidgets (scrollX, oldScrollY); theLayout->scrollPosChanged (this, scrollX, scrollY); return 1; @@ -214,8 +230,9 @@ int FltkViewport::handle (int event) case PageDownKey: oldScrollY = scrollY; scrollY += vscrollbar->pagesize (); + scrollDY = scrollY - oldScrollY; adjustScrollbarValues (); - redraw (DAMAGE_EXPOSE); + redraw (DAMAGE_SCROLL); updateCanvasWidgets (scrollX, oldScrollY); theLayout->scrollPosChanged (this, scrollX, scrollY); return 1; @@ -254,12 +271,13 @@ void FltkViewport::scrollTo (int x, int void FltkViewport::scrollTo (int x, int y) { int oldScrollX = scrollX; - //int oldScrollY = scrollY; + int oldScrollY = scrollY; scrollX = x; scrollY = y; + scrollDX = scrollX - oldScrollX; + scrollDY = scrollY - oldScrollY; adjustScrollbarValues (); - /** \bug Inefficient */ - redraw (DAMAGE_EXPOSE); + redraw (DAMAGE_SCROLL); updateCanvasWidgets (oldScrollX, scrollY); } diff --git a/dw-testbed-0.0.43j/dw/fltkviewport.hh b/dw-testbed-0.0.43j/dw/fltkviewport.hh --- a/dw-testbed-0.0.43j/dw/fltkviewport.hh +++ b/dw-testbed-0.0.43j/dw/fltkviewport.hh @@ -20,6 +20,7 @@ private: enum { SCROLLBAR_THICKNESS = 15 }; int scrollX, scrollY; + int scrollDX, scrollDY; ::fltk::Scrollbar *vscrollbar, *hscrollbar; @@ -35,6 +36,7 @@ private: static void vscrollbarCallback (Widget *vscrollbar, void *viewportPtr); void updateCanvasWidgets (int oldScrollX, int oldScrollY); + static void draw_area (void *data, const Rectangle& cr); protected: int translateViewXToCanvasX (int x);

6 11

Fwd: Re: [Dillo-dev] New CVS directions page
by 4winter＠informatik.uni-hamburg.de Oct. 16, 2007

Oct. 16, 2007

On Fri, 12 Oct 2007 17:41:41 -0400, dillo-dev-bounces(a)dillo.org wrote: > Please let me know if this time the directions work! :-P I would suggest the following changes: - find dw2-cur -name CVS -exec rm \{\} \; - find dillo2-cur -name CVS -exec rm \{\} \; + find dw2-cur dillo2-cur -name CVS | xargs rm -R - cd dw2-cur; ./autogen.sh; ./configure; make + cd dw2-cur; ./autogen.sh && ./configure && make cd .. - cd dillo2-cur; ./autogen.sh; ./configure; make + cd dillo2-cur; ./autogen.sh && ./configure && make Hummel Hummel, Justus

3 2

Re: character entity references produce garbage
by matthias.franz＠ujf-grenoble.fr Oct. 15, 2007

Oct. 15, 2007

On Tue, Oct 09, 2007 at 11:08:21PM +0200, Johannes Hofmann wrote: > I can now reproduce this on a debian system without libxft-dev > installed. > Do you still see this after installing libxft-dev? No. Now it's gone, even if I comment out "freetype" and "type1" in my xorg.conf. (I understand that Xft has something to do with font rasterizing.) But it should work without Xft as well, shouldn't it? -- Matthias Franz

2 3

New CVS and newwest FLTK2 release
by bogus＠does.not.exist.com Oct. 14, 2007

Oct. 14, 2007

Hi there, I just updated the CVS so it can use the latest stable FLTK2. Get FLTK2 from www.fltk.org (r5941), or from here: wget http://www.dillo.org/dillo2/fltk-2.0.x-r5941.tar.bz2 You'll have to configure, compile and install this new version, and to rebuild the whole dw2 and dillo2. That way we stay more current. -- Cheers Jorge.-

1 0

Re: [patch] improve scroll performance of dillo-fltk
by Johannes.Hofmann＠gmx.de Oct. 14, 2007

Oct. 14, 2007

Hi Matthias, I just made a xtrace (http://packages.debian.org/unstable/x11/xtrace) when scrolling the http://www.w3.org/TR/xslt page with patched dillo (result below). I think this is pretty good already. Just the newly exposed glyphs get rendered. Each word is sent to the X-Server seperately. This might be an area for improvement. Could you try the same on your system, so that we find out, whether the patch does not work for you or whether scrolling is still too CPU consuming even with the working patch? Here is what I did to get the trace: xtrace > /tmp/xtrace.out export DISPLAY=:9 dillo-fltk http://www.w3.org/TR/xslt Then scroll using the triangle of the scrollbar for a while and stop dillo. The resulting file is huge but I am only interested in the repeating sections that result from the scrolling and start with CopyArea. Gruss, Johannes 000:<:c474: 16: Request(56): ChangeGC gc=0x01c00009 values={foreground=0x00000000} 000:<:c475: 28: Request(62): CopyArea src-drawable=0x01c00008 dst-drawable=0x01c00008 gc=0x01c00009 src-x=0 src-y=93 dst-x=0 dst-y=73 width=765 height=467 000:>:c475: Event NoExposure(14) drawable=0x01c00008 minor-opcode=0x0000 major-opcode=0x3e 000:<:c476: 20: Request(59): SetClipRectangles ordering=YXBanded(0x03) gc=0x01c00009 clip-x-origin=0 clip-y-origin=0 rectangles ={x=0 y=540 w=765 h=20}; 000:<:c477: 20: RENDERRequest(154): RenderSetPictureClipRectangles picture=0x01c00036 xOrigin=0 yOrigin=0 rectangles={x=0 y=540 w=765 h=20}; 000:<:c478: 20: Request(59): SetClipRectangles ordering=YXBanded(0x03) gc=0x01c00009 clip-x-origin=0 clip-y-origin=0 rectangles ={x=0 y=540 w=765 h=20}; 000:<:c479: 16: Request(56): ChangeGC gc=0x01c00009 values={foreground=0x00e0e0e0} 000:<:c47a: 20: Request(70): PolyFillRectangle drawable=0x01c00008 gc=0x01c00009 rectangles={x=0 y=0 w=780 h=580}; 000:<:c47b: 20: Request(59): SetClipRectangles ordering=YXBanded(0x03) gc=0x01c00009 clip-x-origin=0 clip-y-origin=0 rectangles ={x=0 y=540 w=765 h=20}; 000:<:c47c: 16: Request(56): ChangeGC gc=0x01c00009 values={foreground=0x00dcd1ba} 000:<:c47d: 20: Request(70): PolyFillRectangle drawable=0x01c00008 gc=0x01c00009 rectangles={x=0 y=540 w=765 h=20}; 000:<:c47e: 60: RENDERRequest(154): RenderCompositeGlyphs8 op=Over(0x03) src=0x01c0000f dst=0x01c00036 maskFormat=0x00000026 glyphset=0x01c00063 xSrc=0 ySrc=0 glyphcmds={deltax=5 deltay=530 glyphs=0x1f,0x5b,0x56,0x4f,0x1d,0x44,0x5 3,0x53,0x4f,0x5c,0x10,0x57,0x48,0x50,0x53,0x4f,0x44,0x57,0x48,0x56,0x12,0x21; }; 000:<:c47f: 40: RENDERRequest(154): RenderCompositeGlyphs8 op=Over(0x03) src=0x01c0000f dst=0x01c00036 maskFormat=0x00000026 glyphset=0x01c00037 xSrc=0 ySrc=0 glyphcmds={deltax=5 deltay=554 glyphs=0x5a,0x4b,0x48,0x51; }; 000:<:c480: 40: RENDERRequest(154): RenderCompositeGlyphs8 op=Over(0x03) src=0x01c0000f dst=0x01c00036 maskFormat=0x00000026 glyphset=0x01c00037 xSrc=0 ySrc=0 glyphcmds={deltax=38 deltay=554 glyphs=0x4c,0x57; }; 000:<:c481: 44: RENDERRequest(154): RenderCompositeGlyphs8 op=Over(0x03) src=0x01c0000f dst=0x01c00036 maskFormat=0x00000026 glyphset=0x01c00037 xSrc=0 ySrc=0 glyphcmds={deltax=47 deltay=554 glyphs=0x5a,0x44,0x51,0x57,0x56; }; 000:<:c482: 40: RENDERRequest(154): RenderCompositeGlyphs8 op=Over(0x03) src=0x01c0000f dst=0x01c00036 maskFormat=0x00000026 glyphset=0x01c00037 xSrc=0 ySrc=0 glyphcmds={deltax=82 deltay=554 glyphs=0x57,0x52; }; 000:<:c483: 40: RENDERRequest(154): RenderCompositeGlyphs8 op=Over(0x03) src=0x01c0000f dst=0x01c00036 maskFormat=0x00000026 glyphset=0x01c00037 xSrc=0 ySrc=0 glyphcmds={deltax=95 deltay=554 glyphs=0x46,0x52,0x53,0x5c; }; 000:<:c484: 40: RENDERRequest(154): RenderCompositeGlyphs8 op=Over(0x03) src=0x01c0000f dst=0x01c00036 maskFormat=0x00000026 glyphset=0x01c00037 xSrc=0 ySrc=0 glyphcmds={deltax=124 deltay=554 glyphs=0x57,0x4b,0x48; }; 000:<:c485: 44: RENDERRequest(154): RenderCompositeGlyphs8 op=Over(0x03) src=0x01c0000f dst=0x01c00036 maskFormat=0x00000026 glyphset=0x01c00063 xSrc=0 ySrc=0 glyphcmds={deltax=144 deltay=554 glyphs=0x5b,0x50,0x4f,0x1d,0x4f,0x44,0 x51,0x4a; }; 000:<:c486: 48: RENDERRequest(154): RenderCompositeGlyphs8 op=Over(0x03) src=0x01c0000f dst=0x01c00036 maskFormat=0x00000026 glyphset=0x01c00037 xSrc=0 ySrc=0 glyphcmds={deltax=203 deltay=554 glyphs=0x44,0x57,0x57,0x55,0x4c,0x45,0 x58,0x57,0x48,0x11; };

3 8

two minor bugs
by matthias.franz＠ujf-grenoble.fr Oct. 12, 2007

Oct. 12, 2007

Hi, here are two minor bugs: - If a page is too long to fit inside the dillo window, you get a scrollbar at the right border. Sometimes this scrollbar gets lost when you enlarge the window (by dragging the lower right corner or by clicking on the "full screen" button) although the page still doesn't fit. This seems to depend on the page and doesn't happen very often. For an example, try http://www-fourier.ujf-grenoble.fr/~franz/ . - When opening a new page or when moving through the history list, dillo remembers the screen position although positions on different pages should not be related. PS: I have to specify the cvs repository as given on the dillo web page, namely "-d:pserver:anonymous@auriga.wearlab.de:/sfhome/cvs/dillo". The empty password does not work for jcid(a)auriga.wearlab.de. (This is probably not surprising.) Cheers, -- Matthias Franz

2 1

fix for links within lists
by jcid＠dillo.org Oct. 12, 2007

Oct. 12, 2007

Hi, On Mon, Oct 08, 2007 at 03:18:10PM +0000, place wrote: > BTW, are you still opposed to the idea of click-to-load-images? > I'm on dialup, so one of the first things I had to do was port > my old hacks from my gtk version. I am/was not opposed. I thought a good solution was to have a small tools icon (near bug meter) where you could toggle images on/off, my_colors on/off, wide_rendering on/off etc. Now, being in no-images mode and being able to request a single one instead of all at once looks like a good idea. Of course you'd also have the option of turning images on, and have all requested for that page. As most of the images don't specify a size, a place holder must be provided (as the broken image link in other browser). From there, a right click menu could offer to download that image only. > Also, do you have any thoughts on the proper solution for pages using > character sets that aren't utf-8 or a subset thereof? I made something > that reads the charset from Content-Type in the header or meta tags > and then, in Html->write, runs the buffers through iconv. (Pages are > mostly readable, but I think I'm either losing partial characters at > buffer boundaries or losing partial tags between Html->write_raw() > calls or something...) Basically that. It's not simple though. For instance an http page may specify the charset in Content-Type, but when saved not give any clue in its meta tags. Or have only meta but not Content-Type as served, or give no clue at all, etc. The main idea is to keep the page as is in the cache (so it can be saved verbatim) and to pass it trough a filter to make the conversion to utf-8 inside Dillo. If the iconv backpack adds too much to Dillo's size, the task can be delegated to a dpi, and a small subset with the main conversions be kept inside Dillo. -- Cheers Jorge.-

1 0

fix for links within lists
by place Oct. 12, 2007

Oct. 12, 2007

Hello all, I've hacked up my html.cc too much to provide a proper patch, but it's just one line. If you add: Html_connect_signals(html, list_item); to Html_tag_open_li() (after the item_style->unref(); seemed like a nice place), then links inside lists will work.

4 5

Errata and comments
by bogus＠does.not.exist.com Oct. 11, 2007

Oct. 11, 2007

Hi, Errata: -./autogen.sh -make +./autogen.sh +./configure +make Comments: In the old laptop (Pentium I, 233Mhz) scrolling is much better with the patch. This is, without patch, the CPU is hogged by pressing the scroll arrow and holding it down. It even keeps scrolling after releasing the button (keyb buffer). The patched version uses near 80% of the CPU (not 100%) and stops when releasing. In the same laptop, the over-link-quick-switch-from-arrow-to-hand (i.e. Get a directory listing and move the mouse across the links steadily) rises CPU usage to near 60%. Thre's a bug somewhere... -- Cheers Jorge.-

1 0

character entity references produce garbage
by Matthias Franz Oct. 9, 2007

Oct. 9, 2007

Hi, I've observed that in dillo-fltk character entity references produce garbage after the word they are contained in. Here is an example: <html> <title>character entity references produce garbage</title> no artefact <br> one ärtefact <br> two ärtéfacts <br> three ärtéfâcts </html> Since I'm currently very busy with other (less interesting, but more important) things, so I can only contribute to Dillo by reporting bugs and testing solutions right now. I hope that this will change sometime so that I can again write patches myself. Cheers, -- Matthias Franz

2 2