April 2008 - Dillo-dev - lists.mailman3.com

[patch]: FtlkListResource select callbacks

by Johannes.Hofmann＠gmx.de

Hi Jeremy, On Wed, Apr 30, 2008 at 09:33:36PM +0100, Jeremy Henty wrote: > > 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. It seems a bit complicated to me. Wouldn't it be easier to just add a member "selected" to Item that stores whether the item is currently selected or not? May well be that I'm missing something though. Cheers, Johannes > > 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 > diff -pru -- 00_pre/dw/fltkui.cc 01_post/dw/fltkui.cc > --- 00_pre/dw/fltkui.cc 2008-04-26 21:42:58.000000000 +0100 > +++ 01_post/dw/fltkui.cc 2008-04-30 20:37:40.000000000 +0100 > @@ -858,6 +858,22 @@ template <class I> FltkSelectionResource > } > > template <class I> > +bool FltkSelectionResource<I>::Item::equals (Object *other) > +{ > + return ((void *) this) == ((void *) other); > +} > + > +template <class I> > +int FltkSelectionResource<I>::Item::hashValue () > +{ > +#if SIZEOF_VOID_P == 4 > + return (int)this; > +#else > + return ((int*) this)[0] ^ ((int*) this)[1]; > +#endif > +} > + > +template <class I> > ::fltk::Item *FltkSelectionResource<I>::Item::createNewWidget () > { > ::fltk::Item *item = new ::fltk::Item (name); > @@ -1107,7 +1123,8 @@ bool FltkOptionMenuResource::isSelected > FltkListResource::FltkListResource (FltkPlatform *platform, > core::ui::ListResource::SelectionMode > selectionMode): > - FltkSelectionResource <dw::core::ui::ListResource> (platform) > + FltkSelectionResource <dw::core::ui::ListResource> (platform), > + itemsSelected(false,false) > { > init (platform); > } > @@ -1119,10 +1136,34 @@ FltkListResource::~FltkListResource () > > ::fltk::Menu *FltkListResource::createNewMenu (core::Allocation *allocation) > { > - return > + ::fltk::Menu *menu = > new ::fltk::MultiBrowser (allocation->x, allocation->y, > allocation->width, > allocation->ascent + allocation->descent); > + menu->callback(widgetCallback,this); > + menu->when(::fltk::WHEN_CHANGED); > + return menu; > +} > + > +void FltkListResource::widgetCallback (::fltk::Widget *widget, void *data) > +{ > + ::fltk::Widget *fltkItem = ((::fltk::Menu *) widget)->item (); > + Item *item = (Item *) (fltkItem->user_data ()); > + if (!item) return; > + Selection *selected = Selection::fromBool(fltkItem->selected ()); > + ((FltkListResource *) data)->itemsSelected.put (item, selected); > +} > + > +void FltkListResource::addItem (const char *str, bool enabled, bool selected) > +{ > + FltkSelectionResource<dw::core::ui::ListResource>::addItem > + (str,enabled,selected); > + Item *item = items->get (items->size()-1); > + Selection *is_selected = Selection::fromBool (selected); > + itemsSelected.put(item,is_selected); > + > + // blindly copied from FltkOptionMenuResource, is it necessary? > + queueResize (true); > } > > void FltkListResource::sizeRequest (core::Requisition *requisition) > @@ -1135,8 +1176,15 @@ void FltkListResource::sizeRequest (core > > bool FltkListResource::isSelected (int index) > { > - /** todo Not implemented. */ > - return true; > + return itemsSelected.get(items->get(index))->getValue(); > +} > + > +FltkListResource::Selection FltkListResource::Selection::SELECTED(true); > +FltkListResource::Selection FltkListResource::Selection::UNSELECTED(false); > + > +FltkListResource::Selection *FltkListResource::Selection::fromBool(bool value) > +{ > + return value ? &SELECTED : &UNSELECTED; > } > > } // namespace ui > diff -pru -- 00_pre/dw/fltkui.hh 01_post/dw/fltkui.hh > --- 00_pre/dw/fltkui.hh 2008-04-26 21:42:58.000000000 +0100 > +++ 01_post/dw/fltkui.hh 2008-04-30 20:37:40.000000000 +0100 > @@ -458,6 +458,9 @@ protected: > bool selected = false); > ~Item (); > > + bool equals (Object *other); > + int hashValue (); > + > ::fltk::Item *createNewWidget (); > ::fltk::ItemGroup *createNewGroupWidget (); > }; > @@ -526,11 +529,31 @@ class FltkListResource: > protected: > ::fltk::Menu *createNewMenu (core::Allocation *allocation); > > +private: > + > + class Selection : public Object { > + > + private: > + bool value; > + > + public: > + Selection(bool value) { this->value = value; } > + inline int getValue() { return value; } > + > + static Selection SELECTED, UNSELECTED; > + static Selection *fromBool (bool value); > + }; > + > + static void widgetCallback (::fltk::Widget *widget, void *data); > + container::typed::HashTable <Item, Selection> itemsSelected; > + > public: > FltkListResource (FltkPlatform *platform, > core::ui::ListResource::SelectionMode selectionMode); > ~FltkListResource (); > > + void addItem (const char *str, bool enabled, bool selected); > + > void sizeRequest (core::Requisition *requisition); > bool isSelected (int index); > }; > diff -pru -- 00_pre/test/dw_ui_test.cc 01_post/test/dw_ui_test.cc > --- 00_pre/test/dw_ui_test.cc 2008-04-26 21:42:59.000000000 +0100 > +++ 01_post/test/dw_ui_test.cc 2008-04-30 20:37:40.000000000 +0100 > @@ -192,7 +192,7 @@ int main(int argc, char **argv) > checklabel->addText (strdup (" check"), cellStyle); > checklabel->flush (); > > - for(int i = 0; i < 1; i++) { > + for(int i = 0; i < 2; i++) { > table->addRow (cellStyle); > > Embed *sel = new Embed (selres[i]); > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)dillo.org > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

April 30, 2008

dillo-fltk on x86_64

by corvid＠lavabit.com

Jorge wrote: > A patch for ~/.dillo creation was just committed. I think dillo should tell the user that it is creating the directory.

April 30, 2008

[patch]: FtlkListResource select callbacks

by onepoint＠starurchin.org

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

April 30, 2008

dillo-fltk on x86_64

by jcid＠dillo.org

Hi On Sun, Apr 27, 2008 at 03:46:11AM +0200, Justus Winter wrote: > [...] > >> With my three patches applied dillo compiles and runs fine, however I > >> had to create ~/.dillo and manually start dpid. Did I miss something here? > > No, I forgot porting the creation of ~/.dillo from dillo1 to dillo2! > > (as we all run dillo1 before, ~/.dillo was there :-) A patch for ~/.dillo creation was just committed. -- Cheers Jorge.-

April 30, 2008

[patch] ignore SIGPIPE

by jcid＠dillo.org

On Thu, Apr 24, 2008 at 08:10:04PM +0200, Johannes Hofmann wrote: > Hello, > > this patch avoids exits on SIGPIPE. Currently this is only observed > on DragonFly, but dillo1 had this too. Committed (with comment). -- Cheers Jorge.-

April 30, 2008

[patch] two more tiny memory leaks

by jcid＠dillo.org

On Wed, Apr 30, 2008 at 05:24:00PM +0200, Johannes Hofmann wrote: > Hi, > > two more small leaks in dw2 found by valgrind. Committed. -- Cheers Jorge.-

April 30, 2008

[patch] cleanup iterator fix

by jcid＠dillo.org

On Wed, Apr 30, 2008 at 05:21:55PM +0200, Johannes Hofmann wrote: > 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(). Committed. -- Cheers Jorge.-

April 30, 2008

patch: Re: patch: Re: [Dillo-dev] start on image maps (dw-part)

by jcid＠dillo.org

On Wed, Apr 30, 2008 at 02:38:17PM +0000, corvid wrote: > Jorge wrote: > > It'd be good to hook emitMotionNotify() to have URL feedback > > for ISMAP in the status box. > > Attached. Great! Committed. -- Cheers Jorge.-

April 30, 2008

patch: motionNotify and LEAVE

by jcid＠dillo.org

On Tue, Apr 29, 2008 at 09:43:09PM +0000, corvid wrote: > Jorge wrote: > > On Mon, Apr 28, 2008 at 09:21:16PM +0000, corvid wrote: > > > 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. > > > > > > > What is this patch for? > > If searching with the findtext dialog caused scrolling, the code > had been showing the url of the link that happened to be under the > cursor underneath the dialog. OK. Committed. -- Cheers Jorge.-

April 30, 2008

FIXED: [PATCH]: call widget->layout_damage() from FltkWidgetView::allocateFltkWidget

by jcid＠dillo.org

On Tue, Apr 29, 2008 at 04:37:08PM +0100, Jeremy Henty wrote: > > D'oh! "||" where I should have used "|"! What a n00b! Here's the > fixed patch. (And this time I have tested by running all the > executables in dw/test/ .) Good. Committed with an extra comment. -- Cheers Jorge.-

April 30, 2008