- Dillo-dev - lists.mailman3.com

[PATCH] implements dw::fltk::ui::FltkMultiLineTextResource

by jcid＠dillo.org

On Sun, Dec 16, 2007 at 04:58:38PM +0000, Jeremy Henty wrote: > On Sun, Dec 16, 2007 at 09:53:06AM -0300, Jorge Arellano Cid wrote: > > BTW, I decided to bind it to the html parser ... > > Hey, *I* wanted to do that! Why are you spoiling my fun? :-) Guess > I'll have to look at selections instead. There was a small chance of you still hesitant to dig in the parser... I'll happily expect the full patch for the SELECT element! :-) > > > The next time you visit a form with a TEXTAREA, it will show! :-) > > Which means I can use Dillo to post flamebait to blogs. Clearly a > great milestone has been passed! :-) I'm afraid that's not yet the case. > > Please test and polish to full functionality. Text is not yet submitted, the enter key doesn't work as enter key when the textarea is selected, no word wrapping, rows&columns... > > OK, I'm looking at adding the rows and columns parameters. It should > be easy, except that I'm not sure which class to add the extra members > to. Options are: > > 1) dw::core::ui::MultiLineTextResource > 2) dw::fltk::ui::FltkMultiLineTextResource > > I'm inclined to say 2), since I don't like the idea of hardwiring this > API into the base class. Do you agree? From a distance, to me, it looks like the idea is to have MultiLineTextResource as an abstraction that can have different potential implementations (as FLTK2, GTK2, etc). If this is correct, FltkMultiLineTextResource is the implementation of that API in FLTK2. Now, I see no problem in implementing it in FltkMultiLineTextResource to test and then to decide what general API should go (or not) in the base class. -- Cheers Jorge.-

Dec. 16, 2007

[PATCH] implements dw::fltk::ui::FltkMultiLineTextResource

by onepoint＠starurchin.org

On Sun, Dec 16, 2007 at 04:58:38PM +0000, Jeremy Henty (ie. *me*) wrote: > OK, I'm looking at adding the rows and columns parameters. It > should be easy, except that I'm not sure which class to add the > extra members to. Options are: > > 1) dw::core::ui::MultiLineTextResource > 2) dw::fltk::ui::FltkMultiLineTextResource > > I'm inclined to say 2), since I don't like the idea of hardwiring > this API into the base class. Do you agree? On second thoughts, if I add members to 2) I still have to add an abstract version of the API to 1) so that the HTML parser can set the parameters in a platform-independent way. It still looks like the right way to go, though. Regards, Jeremy Henty

Dec. 16, 2007

[PATCH] implements dw::fltk::ui::FltkMultiLineTextResource

by onepoint＠starurchin.org

On Sun, Dec 16, 2007 at 09:53:06AM -0300, Jorge Arellano Cid wrote: > BTW, I decided to bind it to the html parser ... Hey, *I* wanted to do that! Why are you spoiling my fun? :-) Guess I'll have to look at selections instead. > The next time you visit a form with a TEXTAREA, it will show! :-) Which means I can use Dillo to post flamebait to blogs. Clearly a great milestone has been passed! :-) > Please test and polish to full functionality. OK, I'm looking at adding the rows and columns parameters. It should be easy, except that I'm not sure which class to add the extra members to. Options are: 1) dw::core::ui::MultiLineTextResource 2) dw::fltk::ui::FltkMultiLineTextResource I'm inclined to say 2), since I don't like the idea of hardwiring this API into the base class. Do you agree? Regards, Jeremy Henty

Dec. 16, 2007

should new windows inherit panel size and fullscreen mode?

by jcid＠dillo.org

On Thu, Dec 13, 2007 at 05:46:55PM +0100, Johannes Hofmann wrote: > Ok, here is a patch that opens new windows with the same style as the > current one. Good! Committed. -- Cheers Jorge.-

Dec. 16, 2007

[PATCH] implements dw::fltk::ui::FltkMultiLineTextResource

by jcid＠dillo.org

Hi Jeremy, On Sat, Dec 15, 2007 at 03:53:51AM +0000, Jeremy Henty wrote: > > I promised you all something more substantial than whitespace and > comment fixes next, didn't I? This patch implements the > dw::fltk::ui::FltkMultiLineTextResource class, using > ::fltk:LMultiLineInput to create the widget. It also adds a > FltkMultiLineTextResource to the dw-ui-test example. > > This isn't complete yet; the number of rows and columns are hardwired. > Comments are welcome. It looks good so far! BTW, I decided to bind it to the html parser and to commit. The next time you visit a form with a TEXTAREA, it will show! :-) Please test and polish to full functionality. -- Cheers Jorge.-

Dec. 16, 2007

Re: Colspan and table percentages

by jcid＠dillo.org

Hi, On Wed, Dec 12, 2007 at 06:09:17PM -0300, Jorge Arellano Cid wrote: > On Tue, Dec 11, 2007 at 01:04:02PM +0000, Jeremy Henty wrote: > > On Mon, Dec 10, 2007 at 06:22:36PM +0100, Johannes Hofmann wrote: > > > > > just noticed that http://www.dillo.org/MList.html still looks weird > > > with dillo-fltk: The main text is rendered just one word wide here. > > > > I see this quite a lot. I've attached a simple example below. It > > depends on the table cell having colspan="2". Not only does each word > > appear on a line by itself but no horizontal scrollbar appears even > > though one word extends past the right of the page. > > OK, a patch was committed to CVS. It fixes this issue but some > glitches remain. > > With http://www.dillo.org/MList.html, the "Bug Track Engine" > cell is too narrow. The main problem is that, AFAIS, new data > structures&algorithm is necessary to handle the special case > where a colsapanned cell has a larger width than the spanned > cells. > Some workarounds can be coded but they corrupt the meaning of > the current data structures. I'll try to find a solution... OK, a new patch with improved algorithms, using the same data structures, was committed. This time rendering is much better. Please test and send feedback, URLs. It looks like the "gross work" is done. Some polishing remains, but that's subject to another patch. 8-) -- Cheers Jorge.-

Dec. 15, 2007

[PATCH] implements dw::fltk::ui::FltkMultiLineTextResource

by onepoint＠starurchin.org

I promised you all something more substantial than whitespace and comment fixes next, didn't I? This patch implements the dw::fltk::ui::FltkMultiLineTextResource class, using ::fltk:LMultiLineInput to create the widget. It also adds a FltkMultiLineTextResource to the dw-ui-test example. This isn't complete yet; the number of rows and columns are hardwired. Comments are welcome. Regards, Jeremy Henty diff -pru -- dw2-ref/dw/fltkplatform.cc dw2-cur/dw/fltkplatform.cc --- dw2-ref/dw/fltkplatform.cc 2007-12-06 17:29:59.000000000 +0000 +++ dw2-cur/dw/fltkplatform.cc 2007-12-15 01:41:02.000000000 +0000 @@ -144,8 +144,7 @@ FltkPlatform::FltkResourceFactory::creat core::ui::MultiLineTextResource * FltkPlatform::FltkResourceFactory::createMultiLineTextResource () { - /** \bug Not implemented. */ - return NULL; + return new ui::FltkMultiLineTextResource (platform); } core::ui::CheckButtonResource * diff -pru -- dw2-ref/dw/fltkui.cc dw2-cur/dw/fltkui.cc --- dw2-ref/dw/fltkui.cc 2007-12-06 17:29:59.000000000 +0000 +++ dw2-cur/dw/fltkui.cc 2007-12-15 02:34:13.000000000 +0000 @@ -30,6 +30,7 @@ #include <fltk/Group.h> #include <fltk/Input.h> #include <fltk/SecretInput.h> +#include <fltk/MultiLineInput.h> #include <fltk/RadioButton.h> #include <fltk/CheckButton.h> #include <fltk/Choice.h> @@ -527,6 +528,107 @@ void FltkEntryResource::setEditable (boo // ---------------------------------------------------------------------- +FltkMultiLineTextResource::FltkMultiLineTextResource (FltkPlatform *platform): + FltkSpecificResource <dw::core::ui::MultiLineTextResource> (platform) +{ + initText = NULL; + editable = false; + + init (platform); +} + +FltkMultiLineTextResource::~FltkMultiLineTextResource () +{ + if (initText) + delete initText; +} + +::fltk::Widget *FltkMultiLineTextResource::createNewWidget (core::Allocation + *allocation) +{ + ::fltk::MultiLineInput *input = + new ::fltk::MultiLineInput (allocation->x, allocation->y, + allocation->width, + allocation->ascent + allocation->descent); + input->callback (widgetCallback, this); + input->when (::fltk::WHEN_ENTER_KEY_ALWAYS); + + if (viewsAndWidgets->isEmpty ()) { + // First widget created, attach the set text. + if (initText) + input->value (initText); + } else + input->value + (((::fltk::MultiLineInput*)viewsAndWidgets->getFirst()->widget)->value ()); + + return input; +} + +void FltkMultiLineTextResource::sizeRequest (core::Requisition *requisition) +{ + if (style) { + FltkFont *font = (FltkFont*)style->font; + requisition->width = + (int)::fltk::getwidth ("M", 1) * 20 + + 2 * RELIEF_X_THICKNESS; + requisition->ascent = RELIEF_Y_THICKNESS; + requisition->descent = + (font->ascent + font->descent) * 10 + RELIEF_Y_THICKNESS; + } else { + requisition->width = 1; + requisition->ascent = 1; + requisition->descent = 0; + } +} + +void FltkMultiLineTextResource::widgetCallback (::fltk::Widget *widget, + void *data) +{ + /* The (::fltk::event_key() == ::fltk::ReturnKey) test + * is necessary because WHEN_ENTER_KEY also includes + * other events we're not interested in. For instance pressing + * The Back or Forward, buttons, or the first click on a rendered + * page. BUG: this must be investigated and reported to FLTK2 team + */ + printf ("when = %d\n", widget->when ()); + if ((widget->when () & ::fltk::WHEN_ENTER_KEY_ALWAYS) && + (::fltk::event_key() == ::fltk::ReturnKey)) + ((FltkMultiLineTextResource*)data)->emitActivate (); +} + +const char *FltkMultiLineTextResource::getText () +{ + if (viewsAndWidgets->isEmpty ()) + return initText; + else + return ((::fltk::MultiLineInput*)viewsAndWidgets->getFirst()->widget)->value (); +} + +void FltkMultiLineTextResource::setText (const char *text) +{ + if (initText) + delete initText; + initText = strdup (text); + + for (Iterator <ViewAndWidget> it = viewsAndWidgets->iterator (); + it.hasNext(); ) { + ViewAndWidget *viewAndWidget = it.getNext (); + ((::fltk::MultiLineInput*)viewAndWidget->widget)->value (initText); + } +} + +bool FltkMultiLineTextResource::isEditable () +{ + return editable; +} + +void FltkMultiLineTextResource::setEditable (bool editable) +{ + this->editable = editable; +} + +// ---------------------------------------------------------------------- + template <class I> FltkToggleButtonResource<I>::FltkToggleButtonResource (FltkPlatform *platform, bool activated): diff -pru -- dw2-ref/dw/fltkui.hh dw2-cur/dw/fltkui.hh --- dw2-ref/dw/fltkui.hh 2007-10-06 23:03:01.000000000 +0100 +++ dw2-cur/dw/fltkui.hh 2007-12-15 01:28:53.000000000 +0000 @@ -313,6 +313,31 @@ public: }; +class FltkMultiLineTextResource: + public FltkSpecificResource <dw::core::ui::MultiLineTextResource> +{ +private: + const char *initText; + bool editable; + + static void widgetCallback (::fltk::Widget *widget, void *data); + +protected: + ::fltk::Widget *createNewWidget (core::Allocation *allocation); + +public: + FltkMultiLineTextResource (FltkPlatform *platform); + ~FltkMultiLineTextResource (); + + void sizeRequest (core::Requisition *requisition); + + const char *getText (); + void setText (const char *text); + bool isEditable (); + void setEditable (bool editable); +}; + + template <class I> class FltkToggleButtonResource: public FltkSpecificResource <I> { diff -pru -- dw2-ref/test/dw_ui_test.cc dw2-cur/test/dw_ui_test.cc --- dw2-ref/test/dw_ui_test.cc 2007-10-06 23:03:01.000000000 +0100 +++ dw2-cur/test/dw_ui_test.cc 2007-12-15 02:35:22.000000000 +0000 @@ -44,10 +44,10 @@ int main(int argc, char **argv) FltkPlatform *platform = new FltkPlatform (); Layout *layout = new Layout (platform); - ::fltk::Window *window = new ::fltk::Window(300, 300, "Dw UI Test"); + ::fltk::Window *window = new ::fltk::Window(400, 400, "Dw UI Test"); window->begin(); - FltkViewport *viewport = new FltkViewport (0, 0, 300, 300); + FltkViewport *viewport = new FltkViewport (0, 0, 400, 400); layout->attachView (viewport); StyleAttrs styleAttrs; @@ -83,6 +83,8 @@ int main(int argc, char **argv) entryres1->setText ("Hi!"); EntryResource *entryres2 = layout->getResourceFactory()->createEntryResource (10, true); + MultiLineTextResource *textres = + layout->getResourceFactory()->createMultiLineTextResource (); RadioButtonResource *radiores1 = layout->getResourceFactory()->createRadioButtonResource (NULL, false); RadioButtonResource *radiores2 = @@ -115,6 +117,7 @@ int main(int argc, char **argv) form::Form *form = new form::Form(); form->addTextResource ("val1", entryres1); form->addTextResource ("val2", entryres2); + form->addTextResource ("text", textres); const char *radiovalues[] = { "radio1", "radio2", NULL }; form->addRadioButtonResource ("val3", radiores1, radiovalues); form->addCheckButtonResource ("check", checkres); @@ -151,6 +154,19 @@ int main(int argc, char **argv) table->addCell (input2, 1, 1); table->addRow (cellStyle); + + Textblock *label = new Textblock(false); + label->setStyle (cellStyle); + table->addCell (label, 1, 1); + label->addText (strdup ("text = "), cellStyle); + label->flush (); + + Embed *text = new Embed (textres); + text->setStyle (cellStyle); + table->addCell (text, 1, 1); + + table->addRow (cellStyle); + Textblock *radiolabel1 = new Textblock(false); radiolabel1->setStyle (cellStyle); table->addCell (radiolabel1, 2, 1);

Dec. 15, 2007

[PATCH] comment fix in dw2/dw/iterator.hh

by jcid＠dillo.org

On Thu, Dec 13, 2007 at 02:49:51PM +0000, Jeremy Henty wrote: > > The comment near the top of dw2/dw/iterator.hh refers to two methods > dw::core::Iterator::pointsOnRealContent and dw::core::hasAnyContents, > neither of which exist. (In fact there's no case-insensitive match > for pointsOn, OnReal, RealContent, hasAny or AnyContents anywhere in > the source.) The only similarly-named method I can find is > dw::core::Widget::hasContents so I've changed the comment to mention > that. Committed. > Or maybe the comment should be rewritten or deleted? Good question. When understanding of the code is complete, commenting is easier. :-) -- Cheers Jorge.-

Dec. 14, 2007

should new windows inherit panel size and fullscreen mode?

by Johannes.Hofmann＠gmx.de

Ok, here is a patch that opens new windows with the same style as the current one. Cheers, Johannes

Dec. 13, 2007

[PATCH] comment fix in dw2/dw/iterator.hh

by onepoint＠starurchin.org

The comment near the top of dw2/dw/iterator.hh refers to two methods dw::core::Iterator::pointsOnRealContent and dw::core::hasAnyContents, neither of which exist. (In fact there's no case-insensitive match for pointsOn, OnReal, RealContent, hasAny or AnyContents anywhere in the source.) The only similarly-named method I can find is dw::core::Widget::hasContents so I've changed the comment to mention that. Or maybe the comment should be rewritten or deleted? The next patch will be non-cosmetic, I just wanted to get some cleanups out of my TO-DO. Regards, Jeremy Henty diff -pru -- dw2-ref/dw/iterator.hh dw2-cur/dw/iterator.hh --- dw2-ref/dw/iterator.hh 2007-12-11 11:30:07.000000000 +0000 +++ dw2-cur/dw/iterator.hh 2007-12-13 14:26:43.000000000 +0000 @@ -11,9 +11,8 @@ namespace core { /** * \brief Iterators are used to iterate through the contents of a widget. * - * When using iterators, you should care about the results of - * dw::core::Iterator::pointsOnRealContent and especially - * dw::core::hasAnyContents. + * When using iterators, you should care about the results of + * dw::core::Widget::hasContents. * * \sa dw::core::Widget::iterator */

Dec. 13, 2007