October 2007 - Dillo-dev - lists.mailman3.com

Re: [Dillo-dev] Re: [patch] improve scroll performance of dillo-fltk

by Johannes Hofmann

On Tue, Oct 09, 2007 at 07:29:46PM +0200, Matthias Franz wrote: > On Tue, Oct 09, 2007 at 05:25:09PM +0200, Johannes Hofmann wrote: > > On Mon, Oct 08, 2007 at 10:23:22PM +0200, Matthias Franz wrote: > > > Fine! Only using the arrow keys is quite slow and consumes all CPU time > > > on my machine. In contrast, srolling with the old Dillo was quick and > > > produced almost no CPU load. > > > > It is slow, because the default linesize (the amount a scrollbar > > scrolls when pushing on the arrow is 1. I could change that, but > > what would be a reasonable value? > > Apart from that it should not consume all CPU time. It doesn't > > here. On which html page do you test? > > It occurs on any page where you can scroll. > > > Is it in a remote X11 session? > > no > > > It might perhaps depend on the keyboard repeat rate. > > I think my keyboard rate is normal. > > > Does it also happen, when you keep the arrow on the scrollbar > > pressed? > > Yes. It happens as well when you move the scrollbar with the mouse > (while pressing the left mouse button). Here it gets down to 10% idle when keeping the arrow pressed with vanilla dillo-fltk. With my patch it stays at 99% idle. This is on a Pentium-M forced down to 600MHz. > > Today I noticed that other features of dillo-fltk are also slower > than before. For example, I get approximately a 50% CPU load just > by moving the pointer repeatedly back and forth over a link so > that the pointer constantly changes from the "arrow" shape to the > "hand" shape and back. When I do this with the old dillo the CPU > load remains around zero. (I have an AMD Athlon prcessor running > at 660 MHz.) I don't know whether this is a problem with dillo, > fltk or just with my machine (Debian Etch). It might have to do with your X11 installation or Xft configuration. Do you see antialiased fonts? > > Do other people observe this problem as well? > > Cheers, > -- > Matthias Franz > > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)dillo.org > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

Oct. 9, 2007

Re: [patch] improve scroll performance of dillo-fltk

by Matthias Franz

On Tue, Oct 09, 2007 at 05:25:09PM +0200, Johannes Hofmann wrote: > On Mon, Oct 08, 2007 at 10:23:22PM +0200, Matthias Franz wrote: > > Fine! Only using the arrow keys is quite slow and consumes all CPU time > > on my machine. In contrast, srolling with the old Dillo was quick and > > produced almost no CPU load. > > It is slow, because the default linesize (the amount a scrollbar > scrolls when pushing on the arrow is 1. I could change that, but > what would be a reasonable value? > Apart from that it should not consume all CPU time. It doesn't > here. On which html page do you test? It occurs on any page where you can scroll. > Is it in a remote X11 session? no > It might perhaps depend on the keyboard repeat rate. I think my keyboard rate is normal. > Does it also happen, when you keep the arrow on the scrollbar > pressed? Yes. It happens as well when you move the scrollbar with the mouse (while pressing the left mouse button). Today I noticed that other features of dillo-fltk are also slower than before. For example, I get approximately a 50% CPU load just by moving the pointer repeatedly back and forth over a link so that the pointer constantly changes from the "arrow" shape to the "hand" shape and back. When I do this with the old dillo the CPU load remains around zero. (I have an AMD Athlon prcessor running at 660 MHz.) I don't know whether this is a problem with dillo, fltk or just with my machine (Debian Etch). Do other people observe this problem as well? Cheers, -- Matthias Franz

Oct. 9, 2007

Re: fix for links within lists

by Matthias Franz

On Mon, Oct 08, 2007 at 09:42:53PM +0000, place wrote: > this seems to fix the problem for me: Yes, that seems to work. Thanks! -- Matthias Franz

Oct. 9, 2007

Re: [Dillo-dev] Re: [patch] improve scroll performance of dillo-fltk

by Johannes Hofmann

On Mon, Oct 08, 2007 at 10:23:22PM +0200, Matthias Franz wrote: > On Mon, Oct 08, 2007 at 08:01:14PM +0200, Johannes Hofmann wrote: > > * Hotkey bindings for arrow keys, Home- and EndKey. > > Fine! Only using the arrow keys is quite slow and consumes all CPU time > on my machine. In contrast, srolling with the old Dillo was quick and > produced almost no CPU load. It is slow, because the default linesize (the amount a scrollbar scrolls when pushing on the arrow is 1. I could change that, but what would be a reasonable value? Apart from that it should not consume all CPU time. It doesn't here. On which html page do you test? Is it in a remote X11 session? It might perhaps depend on the keyboard repeat rate. Does it also happen, when you keep the arrow on the scrollbar pressed? > > A question: Would it be difficult to add mouse wheel support as well? > On my machine that does not work. (Or is thia a configuration issue > regarding FLTK?) No it's just some missing code. Johannes > > Thanks in advance, > -- > Matthias Franz > > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)dillo.org > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

Oct. 9, 2007

Re: [Dillo-dev] fix for links within lists

by place

> On Sat, Oct 06, 2007 at 02:51:50PM +0000, place wrote: > > 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. > > Unfortunately, I have to report this patch improves the situation > substiantially, but does not solve it completely. It seems that the > status line at the bottom is not always updated. When you move the > pointer over a link and then, without clicking, move the pointer > _upwards_ so that it leaves the link area, the link URL remains in > the status line. (Moving in other directions is ok.) Moreover, when > you move the pointer across several links, the status line sometimes > remains empty even if the pointer is over a link. > > Cheers, > -- > Matthias Franz I think when the pointer leaves by going up, it's getting enter/leave events instead of motion events, due to the link going right to the top of the textblock. I'm not positive about that, but this seems to fix the problem for me: --- textblock.cc 2007-10-08 21:27:10.000000000 +0000 +++ textblock.cc.new 2007-10-08 21:27:52.000000000 +0000 @@ -483,10 +483,12 @@ void Textblock::enterNotifyImpl (core::EventCrossing *event) { + hoverLink = -1; } void Textblock::leaveNotifyImpl (core::EventCrossing *event) { + (void) emitLinkEnter (-1, -1, -1); } /**

Oct. 8, 2007

Re: [patch] improve scroll performance of dillo-fltk

by Matthias Franz

On Mon, Oct 08, 2007 at 08:01:14PM +0200, Johannes Hofmann wrote: > * Hotkey bindings for arrow keys, Home- and EndKey. Fine! Only using the arrow keys is quite slow and consumes all CPU time on my machine. In contrast, srolling with the old Dillo was quick and produced almost no CPU load. A question: Would it be difficult to add mouse wheel support as well? On my machine that does not work. (Or is thia a configuration issue regarding FLTK?) Thanks in advance, -- Matthias Franz

Oct. 8, 2007

Re: [Dillo-dev] fix for links within lists

by Matthias Franz

Dear all, first of all I want to express my gratitude to Jorge and Sebastian for pushing Dillo forward despite the numerous difficulties. Thanks a lot!!! For the record: Compilation on Debian Etch worked well. I had to use the "--x-includes" and "--x-libraries" options when configuring FLTK, and the test glpuzzle did not compile. On Sat, Oct 06, 2007 at 02:51:50PM +0000, place wrote: > 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. Unfortunately, I have to report this patch improves the situation substiantially, but does not solve it completely. It seems that the status line at the bottom is not always updated. When you move the pointer over a link and then, without clicking, move the pointer _upwards_ so that it leaves the link area, the link URL remains in the status line. (Moving in other directions is ok.) Moreover, when you move the pointer across several links, the status line sometimes remains empty even if the pointer is over a link. Cheers, -- Matthias Franz

Oct. 8, 2007

another patch: allows clicking on images in links

by place

Hello again, First, on the dw side: --- image.hh 2007-10-08 17:30:00.000000000 +0000 +++ image.hh.new 2007-10-08 17:36:38.000000000 +0000 @@ -91,6 +91,7 @@ char *altText; core::Imgbuf *buffer; int altTextWidth; + bool clicking; protected: void sizeRequestImpl (core::Requisition *requisition); @@ -98,8 +99,9 @@ void draw (core::View *view, core::Rectangle *area); - //bool buttonPressImpl (core::EventButton *event); - //bool buttonReleaseImpl (core::EventButton *event); + bool buttonPressImpl (core::EventButton *event); + bool buttonReleaseImpl (core::EventButton *event); + void leaveNotifyImpl (core::EventCrossing *event); //bool motionNotifyImpl (core::EventMotion *event); //core::Iterator *iterator (Content::Type mask, bool atEnd); --- image.cc 2007-10-08 16:50:47.000000000 +0000 +++ image.cc.new 2007-10-08 17:36:55.000000000 +0000 @@ -64,6 +64,7 @@ this->altText = altText ? strdup (altText) : NULL; altTextWidth = -1; // not yet calculated buffer = NULL; + clicking = false; } Image::~Image() @@ -125,6 +126,30 @@ } } +void Image::leaveNotifyImpl (core::EventCrossing *event) +{ + clicking = false; +} + +bool Image::buttonPressImpl (core::EventButton *event) +{ + clicking = true; + return true; +} + +bool Image::buttonReleaseImpl (core::EventButton *event) +{ + int idx; + if (clicking) { + clicking = false; + idx = getStyle()->x_link; + if (idx != -1) { + emitLinkClick (idx, -1, -1, event); + } + } + return true; +} + void Image::draw (core::View *view, core::Rectangle *area) { int dx, dy; And then on the dillo side: --- html.cc 2007-10-08 18:01:47.000000000 +0000 +++ html.cc.new 2007-10-08 18:04:00.000000000 +0000 @@ -2423,8 +2423,9 @@ /* Add a new image widget to this page */ Image = a_Image_new(0, 0, alt_ptr, S_TOP(html)->current_bg_color); if (add) { - Html_add_widget(html, (Widget*)Image->dw, - width_ptr, height_ptr, style_attrs); + Widget *w = (Widget*)Image->dw; + Html_add_widget(html, w, width_ptr, height_ptr, style_attrs); + Html_connect_signals(html, w); } dFree(width_ptr);

Oct. 8, 2007

Re: [patch] improve scroll performance of dillo-fltk

by Johannes Hofmann

Hello, here is a new version of dillo-fltk scroll performance improvements. This patch is against vanilla dillo-fltk. New in this patch: * Hotkey bindings for arrow keys, Home- and EndKey. This only works when the focus is on the display area. * Only unclipped area is exposed which improves performance on large pages (e.g. http://www.w3.org/TR/xslt) * Limit scrolling to reasonable values. 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 @@ -50,22 +50,24 @@ FltkViewBase::~FltkViewBase () void FltkViewBase::draw () { - /** \bug Somehow, the area, which is to be redrawn, should be regarded. */ - 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); - } + ::fltk::Rectangle rect (x(), y(), w(), h()); + + /* fltk-clipping seems not to use widget coordinates */ + ::fltk::intersect_with_clip(rect); + rect.x(rect.x() - x()); + rect.y(rect.y() - y()); + + setcolor (bgColor); + fillrect (rect); + + core::Rectangle area; + area.x = translateViewXToCanvasX (rect.x()); + area.y = translateViewYToCanvasY (rect.y()); + area.width = rect.w(); + area.height = rect.h(); + theLayout->expose (this, &area); } core::ButtonState getDwButtonState () @@ -222,7 +224,16 @@ void FltkViewBase::queueDraw (core::Rect void FltkViewBase::queueDraw (core::Rectangle *area) { /** \bug Inefficient */ + + push_clip( + translateCanvasXToViewX (area->x), + translateCanvasYToViewY (area->y), + area->width, + area->height); + redraw (DAMAGE_EXPOSE); + + pop_clip(); } void FltkViewBase::queueDrawTotal () 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 @@ -129,22 +129,12 @@ void FltkViewport::adjustScrollbarValues void FltkViewport::hscrollbarChanged () { - int oldScrollX = scrollX; - scrollX = hscrollbar->value (); - /** \bug Inefficient */ - redraw (DAMAGE_EXPOSE); - updateCanvasWidgets (oldScrollX, scrollY); - theLayout->scrollPosChanged (this, scrollX, scrollY); + scroll (hscrollbar->value () - scrollX, 0); } void FltkViewport::vscrollbarChanged () { - int oldScrollY = scrollY; - scrollY = vscrollbar->value (); - /** \bug Inefficient */ - redraw (DAMAGE_EXPOSE); - updateCanvasWidgets (scrollX, oldScrollY); - theLayout->scrollPosChanged (this, scrollX, scrollY); + scroll (0, vscrollbar->value () - scrollY); } void FltkViewport::vscrollbarCallback (Widget *vscrollbar, void *viewportPtr) @@ -163,6 +153,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,26 +179,20 @@ 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) { - int oldScrollY; - switch(event) { case ::fltk::FOCUS: /** \bug Draw focus box. */ @@ -200,24 +203,37 @@ int FltkViewport::handle (int event) return 1; case ::fltk::SHORTCUT: - /** \bug Checks for scrollX and scrollY? */ switch (::fltk::event_key()) { case PageUpKey: - oldScrollY = scrollY; - scrollY -= vscrollbar->pagesize (); - adjustScrollbarValues (); - redraw (DAMAGE_EXPOSE); - updateCanvasWidgets (scrollX, oldScrollY); - theLayout->scrollPosChanged (this, scrollX, scrollY); + scroll (0, -vscrollbar->pagesize ()); return 1; case PageDownKey: - oldScrollY = scrollY; - scrollY += vscrollbar->pagesize (); - adjustScrollbarValues (); - redraw (DAMAGE_EXPOSE); - updateCanvasWidgets (scrollX, oldScrollY); - theLayout->scrollPosChanged (this, scrollX, scrollY); + scroll (0, vscrollbar->pagesize ()); + return 1; + + case DownKey: + scroll (0, (int) vscrollbar->linesize ()); + return 1; + + case UpKey: + scroll (0, (int) -vscrollbar->linesize ()); + return 1; + + case RightKey: + scroll ((int) hscrollbar->linesize (), 0); + return 1; + + case LeftKey: + scroll ((int) -hscrollbar->linesize (), 0); + return 1; + + case HomeKey: + scrollTo (0, 0); + return 1; + + case EndKey: + scrollTo (canvasWidth, canvasHeight); /* gets adjusted in scroll() */ return 1; } @@ -251,16 +267,46 @@ int FltkViewport::getVScrollbarThickness return SCROLLBAR_THICKNESS; } +void FltkViewport::scroll (int dx, int dy) +{ + int hdiff = vscrollbar->visible () ? SCROLLBAR_THICKNESS : 0; + int vdiff = hscrollbar->visible () ? SCROLLBAR_THICKNESS : 0; + int oldScrollX = scrollX; + int oldScrollY = scrollY; + + if (dx == 0 && dy == 0) { + return; + } + + scrollX += dx; + scrollY += dy; + + if (scrollX > canvasWidth - w() + hdiff) { + scrollX = canvasWidth - w() + hdiff; + } + if (scrollX < 0) { + scrollX = 0; + } + + if (scrollY > canvasHeight - h() + vdiff) { + scrollY = canvasHeight - h() + vdiff; + } + if (scrollY < 0) { + scrollY = 0; + } + + scrollDX = scrollX - oldScrollX; + scrollDY = scrollY - oldScrollY; + + adjustScrollbarValues (); + redraw (DAMAGE_SCROLL); + updateCanvasWidgets (oldScrollX, oldScrollY); + theLayout->scrollPosChanged (this, scrollX, scrollY); +} + void FltkViewport::scrollTo (int x, int y) { - int oldScrollX = scrollX; - //int oldScrollY = scrollY; - scrollX = x; - scrollY = y; - adjustScrollbarValues (); - /** \bug Inefficient */ - redraw (DAMAGE_EXPOSE); - updateCanvasWidgets (oldScrollX, scrollY); + scroll (x - scrollX, y - scrollY); } void FltkViewport::setViewportSize (int width, int height, 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); @@ -55,6 +57,7 @@ public: bool usesViewport (); int getHScrollbarThickness (); int getVScrollbarThickness (); + void scroll(int dx, int dy); void scrollTo (int x, int y); void setViewportSize (int width, int height, int hScrollbarThickness, int vScrollbarThickness);

Oct. 8, 2007

Re: [Dillo-dev] fix for links within lists

by None

On Sat, Oct 06, 2007 at 02:51:50PM +0000, place wrote: > 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. I'll set up a cvs repository ASAP, and start adding the patches there. Please be patient, and thanks you all for the patches, keep the stream flowing! Good patches is what makes a project thrive. BTW, place, what's your name? Or do you want to be credited as "place" in the changelog? ;) -- Cheers Jorge.-

Oct. 8, 2007