- Dillo-dev - lists.mailman3.com

[PATCH] TEXTAREA controls submit their contents

by Johannes.Hofmann＠gmx.de

On Mon, Dec 17, 2007 at 03:19:13PM +0000, Jeremy Henty wrote: > On Mon, Dec 17, 2007 at 10:07:09AM -0300, Jorge Arellano Cid wrote: > > > Please note that the enter key is selecting text instead of > > adding a new line... > > It's in the TO DO, along with the need for a scroller (and thanks for > the example page, BTW). I have some tweaks and cleanups to submit > first. Just tried to use the TextEditor widget from fltk (see test/input.cxx in the fltk tarball). It has scrollbar support built in and perhaps other useful stuff. Unfortunately it crashes on division by zero here... Regards, Johannes > > Regards, > > Jeremy Henty > > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)dillo.org > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

Dec. 17, 2007

[PATCH] TEXTAREA controls submit their contents

by onepoint＠starurchin.org

On Mon, Dec 17, 2007 at 10:07:09AM -0300, Jorge Arellano Cid wrote: > Please note that the enter key is selecting text instead of > adding a new line... It's in the TO DO, along with the need for a scroller (and thanks for the example page, BTW). I have some tweaks and cleanups to submit first. Regards, Jeremy Henty

Dec. 17, 2007

[PATCH] TEXTAREA controls submit their contents

by jcid＠dillo.org

On Mon, Dec 17, 2007 at 02:21:58AM +0000, Jeremy Henty wrote: > > This patch makes TEXTAREA controls submit their contents when their > form is activated. Note that I reworked the handling of the embed and > widget members of the form structure for TEXTAREA controls. This was > because I was getting crashes and corruption when the form attempted > to submit itself. I think the various coercions between (void *), > (Widget *) and (Embed *) were going wrong. Changing things so that > widget == embed is also more consistent with the way the other > embedded form controls are handled. Yes, it looks much better. Committed. Please note that the enter key is selecting text instead of adding a new line... -- Cheers Jorge.-

Dec. 17, 2007

[PATCH] TEXTAREA controls submit their contents

by jcid＠dillo.org

On Mon, Dec 17, 2007 at 02:21:58AM +0000, Jeremy Henty wrote: > > This patch makes TEXTAREA controls submit their contents when their > form is activated. Note that I reworked the handling of the embed and > widget members of the form structure for TEXTAREA controls. This was > because I was getting crashes and corruption when the form attempted > to submit itself. I think the various coercions between (void *), > (Widget *) and (Embed *) were going wrong. Changing things so that > widget == embed is also more consistent with the way the other > embedded form controls are handled. Here goes the attached page... -- Cheers Jorge.-

Dec. 17, 2007

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

by jcid＠dillo.org

On Sun, Dec 16, 2007 at 11:08:06PM +0000, Jeremy Henty wrote: > On Sun, Dec 16, 2007 at 10:56:28PM +0000, Jeremy Henty (ie. *me*) > wrote: > > > OK, here's the patch to dw2. I'll follow up with the (extremely > > short) patch to dillo2. > > Following up as promised... Committed. Please note that the multiline widget should be embedded inside a scroller. Something like what firefox does with the attached page. Disclaimer: I haven't checked whether this is easy or not! :-) -- Cheers Jorge.-

Dec. 17, 2007

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

by jcid＠dillo.org

On Sun, Dec 16, 2007 at 10:56:28PM +0000, Jeremy Henty wrote: > On Sun, Dec 16, 2007 at 08:19:57PM +0100, Johannes Hofmann wrote: > > > I would do it as it is done for the maxLength and password members > > of FltkEntryResource: Add parameters to > > createMultiLineTextResource() and store the values in private > > members of FltkMultiLineTextResource. > > OK, here's the patch to dw2. I'll follow up with the (extremely > short) patch to dillo2. Committed. > How should extra stuff like word-wrap be > supported? More arguments to the constructor or some other API? I think something akin to setText, getText is enough. -- Cheers Jorge.-

Dec. 17, 2007

[PATCH] TEXTAREA controls submit their contents

by onepoint＠starurchin.org

This patch makes TEXTAREA controls submit their contents when their form is activated. Note that I reworked the handling of the embed and widget members of the form structure for TEXTAREA controls. This was because I was getting crashes and corruption when the form attempted to submit itself. I think the various coercions between (void *), (Widget *) and (Embed *) were going wrong. Changing things so that widget == embed is also more consistent with the way the other embedded form controls are handled. Regards, Jeremy Henty diff -pru -- dillo2-ref/src/html.cc dillo2-cur/src/html.cc --- dillo2-ref/src/html.cc 2007-12-16 22:40:25.000000000 +0000 +++ dillo2-cur/src/html.cc 2007-12-17 01:59:29.000000000 +0000 @@ -3792,6 +3792,11 @@ static void Html_submit_form2(DilloHtml entryres = (EntryResource*)((Embed*)input->widget)->getResource(); Html_append_input(DataStr, input->name, entryres->getText()); break; + case DILLO_HTML_INPUT_TEXTAREA: + MultiLineTextResource *textres; + textres = (MultiLineTextResource*)((Embed*)input->widget)->getResource(); + Html_append_input(DataStr, input->name, textres->getText()); + break; case DILLO_HTML_INPUT_CHECKBOX: case DILLO_HTML_INPUT_RADIO: ToggleButtonResource *cb_r; @@ -4240,7 +4245,7 @@ static void Html_tag_close_textarea(Dill form = html->forms->getRef (html->forms->size() - 1); form->inputs->get(form->inputs->size() - 1).init_str = str; widget = (Widget*)(form->inputs->get(form->inputs->size() - 1).widget); - ((MultiLineTextResource *)widget)->setText(str); + ((MultiLineTextResource *)((Embed *)widget)->getResource ())->setText(str); html->InFlags &= ~IN_TEXTAREA; } @@ -4292,12 +4297,10 @@ static void Html_tag_open_textarea(Dillo Widget *widget; Embed *embed; - widget = (Widget*)textres; - embed = new Embed(textres); - EntryResource *entryres = (EntryResource*)embed->getResource(); + widget = embed = new Embed(textres); /* Readonly or not? */ if (Html_get_attr(html, tag, tagsize, "readonly")) - entryres->setEditable(false); + textres->setEditable(false); Html_add_input(form, DILLO_HTML_INPUT_TEXTAREA, widget, embed, name, NULL, NULL, false);

Dec. 17, 2007

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

by onepoint＠starurchin.org

On Sun, Dec 16, 2007 at 10:56:28PM +0000, Jeremy Henty (ie. *me*) wrote: > OK, here's the patch to dw2. I'll follow up with the (extremely > short) patch to dillo2. Following up as promised... Jeremy Henty diff -pru -- dillo2-ref/src/html.cc dillo2-cur/src/html.cc --- dillo2-ref/src/html.cc 2007-12-16 22:15:06.000000000 +0000 +++ dillo2-cur/src/html.cc 2007-12-16 22:25:40.000000000 +0000 @@ -4287,7 +4287,8 @@ static void Html_tag_open_textarea(Dillo name = dStrdup(attrbuf); MultiLineTextResource *textres = - HT2LT(html)->getResourceFactory()->createMultiLineTextResource (); + HT2LT(html)->getResourceFactory()->createMultiLineTextResource (cols, + rows); Widget *widget; Embed *embed;

Dec. 17, 2007

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

by onepoint＠starurchin.org

On Sun, Dec 16, 2007 at 08:19:57PM +0100, Johannes Hofmann wrote: > I would do it as it is done for the maxLength and password members > of FltkEntryResource: Add parameters to > createMultiLineTextResource() and store the values in private > members of FltkMultiLineTextResource. OK, here's the patch to dw2. I'll follow up with the (extremely short) patch to dillo2. How should extra stuff like word-wrap be supported? More arguments to the constructor or some other API? Regards, Jeremy Henty diff -pru -- dw2-ref/dw/fltkplatform.cc dw2-cur/dw/fltkplatform.cc --- dw2-ref/dw/fltkplatform.cc 2007-12-16 16:02:02.000000000 +0000 +++ dw2-cur/dw/fltkplatform.cc 2007-12-16 22:23:40.000000000 +0000 @@ -142,9 +142,10 @@ FltkPlatform::FltkResourceFactory::creat } core::ui::MultiLineTextResource * -FltkPlatform::FltkResourceFactory::createMultiLineTextResource () +FltkPlatform::FltkResourceFactory::createMultiLineTextResource (int cols, + int rows) { - return new ui::FltkMultiLineTextResource (platform); + return new ui::FltkMultiLineTextResource (platform, cols, rows); } core::ui::CheckButtonResource * diff -pru -- dw2-ref/dw/fltkplatform.hh dw2-cur/dw/fltkplatform.hh --- dw2-ref/dw/fltkplatform.hh 2007-12-06 17:29:59.000000000 +0000 +++ dw2-cur/dw/fltkplatform.hh 2007-12-16 22:22:55.000000000 +0000 @@ -70,7 +70,8 @@ private: core::ui::OptionMenuResource *createOptionMenuResource (); core::ui::EntryResource *createEntryResource (int maxLength, bool password); - core::ui::MultiLineTextResource *createMultiLineTextResource (); + core::ui::MultiLineTextResource *createMultiLineTextResource (int cols, + int rows); core::ui::CheckButtonResource *createCheckButtonResource (bool activated); core::ui::RadioButtonResource * diff -pru -- dw2-ref/dw/fltkui.cc dw2-cur/dw/fltkui.cc --- dw2-ref/dw/fltkui.cc 2007-12-16 16:02:02.000000000 +0000 +++ dw2-cur/dw/fltkui.cc 2007-12-16 22:32:49.000000000 +0000 @@ -528,8 +528,10 @@ void FltkEntryResource::setEditable (boo // ---------------------------------------------------------------------- -FltkMultiLineTextResource::FltkMultiLineTextResource (FltkPlatform *platform): - FltkSpecificResource <dw::core::ui::MultiLineTextResource> (platform) +FltkMultiLineTextResource::FltkMultiLineTextResource (FltkPlatform *platform, + int cols, int rows): + FltkSpecificResource <dw::core::ui::MultiLineTextResource> (platform), + numCols(cols), numRows(rows) { initText = NULL; editable = false; @@ -569,11 +571,11 @@ void FltkMultiLineTextResource::sizeRequ if (style) { FltkFont *font = (FltkFont*)style->font; requisition->width = - (int)::fltk::getwidth ("M", 1) * 20 + (int)::fltk::getwidth ("M", 1) * numCols + 2 * RELIEF_X_THICKNESS; requisition->ascent = RELIEF_Y_THICKNESS; requisition->descent = - (font->ascent + font->descent) * 10 + RELIEF_Y_THICKNESS; + (font->ascent + font->descent) * numRows + RELIEF_Y_THICKNESS; } else { requisition->width = 1; requisition->ascent = 1; diff -pru -- dw2-ref/dw/fltkui.hh dw2-cur/dw/fltkui.hh --- dw2-ref/dw/fltkui.hh 2007-12-16 16:02:02.000000000 +0000 +++ dw2-cur/dw/fltkui.hh 2007-12-16 22:20:40.000000000 +0000 @@ -319,6 +319,7 @@ class FltkMultiLineTextResource: private: const char *initText; bool editable; + int numCols, numRows; static void widgetCallback (::fltk::Widget *widget, void *data); @@ -326,7 +327,7 @@ protected: ::fltk::Widget *createNewWidget (core::Allocation *allocation); public: - FltkMultiLineTextResource (FltkPlatform *platform); + FltkMultiLineTextResource (FltkPlatform *platform, int cols, int rows); ~FltkMultiLineTextResource (); void sizeRequest (core::Requisition *requisition); diff -pru -- dw2-ref/dw/ui.hh dw2-cur/dw/ui.hh --- dw2-ref/dw/ui.hh 2007-10-06 23:03:01.000000000 +0100 +++ dw2-cur/dw/ui.hh 2007-12-16 22:19:32.000000000 +0000 @@ -537,7 +537,8 @@ public: virtual OptionMenuResource *createOptionMenuResource () = 0; virtual EntryResource *createEntryResource (int maxLength, bool password) = 0; - virtual MultiLineTextResource *createMultiLineTextResource () = 0; + virtual MultiLineTextResource *createMultiLineTextResource (int cols, + int rows) = 0; virtual CheckButtonResource *createCheckButtonResource (bool activated) = 0; virtual RadioButtonResource *createRadioButtonResource (RadioButtonResource *groupedWith, diff -pru -- dw2-ref/test/dw_ui_test.cc dw2-cur/test/dw_ui_test.cc --- dw2-ref/test/dw_ui_test.cc 2007-12-16 16:02:03.000000000 +0000 +++ dw2-cur/test/dw_ui_test.cc 2007-12-16 22:24:19.000000000 +0000 @@ -84,7 +84,7 @@ int main(int argc, char **argv) EntryResource *entryres2 = layout->getResourceFactory()->createEntryResource (10, true); MultiLineTextResource *textres = - layout->getResourceFactory()->createMultiLineTextResource (); + layout->getResourceFactory()->createMultiLineTextResource (15,3); RadioButtonResource *radiores1 = layout->getResourceFactory()->createRadioButtonResource (NULL, false); RadioButtonResource *radiores2 =

Dec. 17, 2007

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

by Johannes.Hofmann＠gmx.de

Hi Jeremy, On Sun, Dec 16, 2007 at 05:20:42PM +0000, Jeremy Henty wrote: > 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. I would do it as it is done for the maxLength and password members of FltkEntryResource: Add parameters to createMultiLineTextResource() and store the values in private members of FltkMultiLineTextResource. Cheers, Johannes

Dec. 16, 2007