- Dillo-dev - lists.mailman3.com

[patch]: take 2: FtlkListResource
by onepoint＠starurchin.org May 1, 2008

May 1, 2008

Since Johannes' criticisms were (IIRC) mostly about my patch's complexity I hope he will look at a new patch that sticks to my original approach but is a lot simpler. I realised that if the user_data() of the Menu Widget items stored the index of the Item instead of the Item itself then FltkListResource could store the selections by index in a misc::SimpleVector<bool>. This means there is no need to wrap bools in object::Object pointers and no need to add instance methods to Items to make them Hashable. Most of the scaffolding of the previous patch just disappears (the line count decreases by a third). I don't want to dismiss Johannes' alternative suggestion out of hand, but I still think my approach has a lot going for it and I'd like people to have a chance to criticise my best shot at it. Comments are welcome! Jeremy Henty

2 1

[patch]: FtlkListResource select callbacks
by onepoint＠starurchin.org May 1, 2008

May 1, 2008

This is a first cut at making FltkListResource work properly. The resource maintains a hash of its items' selected status, the MultiBrowser widget gets a callback that updates the hash and isSelected() looks up the hash for the answer. It's the same technique I used for FltkOptionMenuResource , where the FLTK widgets are linked to their resources by user_data() and callback arguments. I added equals() and hashValue() methods to Items so they could be hash keys, and implemented an object::Object wrapper class for boolean values to be the hash values. The wrapper class is inside FltkListResource , though it could easily move to lout::object IMHO. The patch also enables the ListResource widget in test/dw-ui-test . Unfortunately it's still a little buggy. Specifying multiple selected items initially doesn't work right: they are all selected in the resource but only one is selected on the FLTK widget. Things also go out of sync when you select a group item: any previously selected item is unselected in the widget but not in the resource. I'll look into these further. Comments are welcome! Regards, Jeremy Henty

2 2

[patch] ignore SIGPIPE
by Johannes.Hofmann＠gmx.de April 30, 2008

April 30, 2008

Hello, this patch avoids exits on SIGPIPE. Currently this is only observed on DragonFly, but dillo1 had this too. Cheers, Johannes

2 1

[patch] cleanup iterator fix
by Johannes.Hofmann＠gmx.de April 30, 2008

April 30, 2008

Hi, now I noticed, that there is a more elegant way to create an iterator that is winded forward until its end. This restores symmetry between DeepIterator::next() and DeepIterator::prev(). Cheers, Johannes

2 1

[patch] two more tiny memory leaks
by Johannes.Hofmann＠gmx.de April 30, 2008

April 30, 2008

Hi, two more small leaks in dw2 found by valgrind. Cheers, Johannes

2 1

start on image maps (dw-part)
by Johannes.Hofmann＠gmx.de April 30, 2008

April 30, 2008

Hi, just to let you know, I just started with client side image maps (the dw-part). Below is an initial implementation of ImageMapsList. This is not yet ready at all, but perhaps someone might want have a look. Cheers, Johannes diff -r 877bbc03146b -r ebc6de688732 dw/image.cc --- a/dw/image.cc Thu Apr 17 22:14:42 2008 +0200 +++ b/dw/image.cc Mon Apr 21 21:03:51 2008 +0200 @@ -25,12 +25,44 @@ namespace dw { +ImageMapsList::ImageMap::ImageMap () +{ + shapesAndLinks = new container::typed::List <ShapeAndLink> (true); +} + +void ImageMapsList::ImageMap::add (core::Shape *shape, int link) { + ShapeAndLink *shapeAndLink = new ShapeAndLink (); + shapeAndLink->shape = shape; + shapeAndLink->link = link; + shapesAndLinks->append (shapeAndLink); +} + +int ImageMapsList::ImageMap::link (int x, int y) { + container::typed::Iterator <ShapeAndLink> it; + int link = -1; + + for (it = shapesAndLinks->iterator (); it.hasNext (); ) { + ShapeAndLink *shapeAndLink = it.getNext (); + + if (shapeAndLink->shape->isPointWithin (x, y)) { + link = shapeAndLink->link; + break; + } + } + + return link; +} + ImageMapsList::ImageMapsList () { + imageMaps = new container::typed::HashTable <object::Object, ImageMap> + (true, true); + currentMap = NULL; } ImageMapsList::~ImageMapsList () { + delete imageMaps; } /** @@ -42,6 +74,8 @@ ImageMapsList::~ImageMapsList () */ void ImageMapsList::startNewMap (object::Object *key) { + currentMap = new ImageMap (); + imageMaps->put (key, currentMap); } /** @@ -52,6 +86,7 @@ void ImageMapsList::startNewMap (object: */ void ImageMapsList::addShapeToCurrentMap (core::Shape *shape, int link) { + currentMap->add (shape, link); } // ---------------------------------------------------------------------- diff -r 877bbc03146b -r ebc6de688732 dw/image.hh --- a/dw/image.hh Thu Apr 17 22:14:42 2008 +0200 +++ b/dw/image.hh Mon Apr 21 21:03:51 2008 +0200 @@ -22,6 +22,27 @@ namespace dw { */ class ImageMapsList { +private: + class ImageMap: public object::Object { + private: + class ShapeAndLink: public object::Object { + public: + core::Shape *shape; + int link; + }; + + container::typed::List <ShapeAndLink> *shapesAndLinks; + public: + ImageMap (); + ~ImageMap (); + + void add (core::Shape *shape, int link); + int link (int x, int y); + }; + + container::typed::HashTable <object::Object, ImageMap> *imageMaps; + ImageMap *currentMap; + public: ImageMapsList (); ~ImageMapsList ();

3 20

patch: motionNotify and LEAVE
by corvid＠lavabit.com April 30, 2008

April 30, 2008

Since findtext has been in the news lately, I might as well at least provide this bit so that my code behaves better with dialogs.

2 3

[PATCH]: call widget->layout_damage() from FltkWidgetView::allocateFltkWidget
by onepoint＠starurchin.org April 30, 2008

April 30, 2008

This patch makes FltkWidgetView::allocateFltkWidget mark the FLTK widget's layout as damaged. This fixes dw::fltk::ui::FltkListResource (which is necessary to implement MULTIPLE SELECT inputs in forms). Currently a dw::fltk::ui::FltkListResource widget fails to display itself. (You can run test/dw-resource-test to see this). This is because the resource's fltk::MultiBrowser widget is created with a tiny size and later reallocated to the correct size. The viewport calls layout() each time, but this doesn't call widget->layout() unless the widget's layout is damaged. Unfortunately the layout is marked as damaged when the widget is created but *not* after it is resized, so MultiBrowser::layout() gets called when the widget is tiny, but not when it is the right size. Alas, MultiBrowser::draw() uses size information that was cached by MultiBrowser::layout() , so it behaves as though the widget is still tiny, concludes that none of the Items are visible and doesn't draw anything. This bug potentially bites all widgets, it's just sheer luck that only MultiBrowser is visibly affected. Other widgets are either simple enough to survive their layout() being called when they were a different size, or else smart enough to mark *themselves* as damaged so that the viewport calls their layout() at the right time. Regards, Jeremy Henty

2 3

patch: usemap <area shape=default>
by corvid＠lavabit.com April 30, 2008

April 30, 2008

shape=default is the background in a client-side image map.

2 1

Q: lout::Object::Bool ?
by onepoint＠starurchin.org April 30, 2008

April 30, 2008

I'm looking at properly implementing dw::fltk::ui::FltkListResource::isSelected() and I need to maintain a hash of Items to boolean values. However, lout::container::typed::HashTable requires the keys and values to inherit lout::object::Object . I could use lout::object::Integer values, but the really appropriate thing would be lout::object::Bool , which doesn't exist. Is it worth implementing lout::object::Bool or should I just use lout::object::Integer ? Regards, Jeremy Henty

1 0