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

[PATCH] FltkMultilineTextResource: <Enter> is normal

by jcid＠dillo.org

On Tue, Dec 18, 2007 at 04:12:49PM +0000, Jeremy Henty wrote: > > This patch removes the special behaviour of the <Enter> key for the > FltkMultiLineTextResource. In fact it removes the callback > altogether, the resource simply holds text and has no activity. Committed. -- Cheers Jorge.-

Dec. 19, 2007

[PATCH] TEXTAREA controls submit their contents

by jcid＠dillo.org

On Wed, Dec 19, 2007 at 10:53:02AM +0000, Jeremy Henty wrote: > On Tue, Dec 18, 2007 at 11:01:01PM +0100, Johannes Hofmann wrote: > > > Ooops, you are right! There is a problem with my proposed fix. When > > we call Group::layout (), the Group code starts to reposition / > > resize the widgets. > > Yes, after posting I noticed that resizing the browser window made the > embedded widgets slide around the page. Very annoying. > > > Please try this instead: > > Looks good! Both dillo and test/dw-ui-test work fine, with no moving > widgets. Hopefully we've cracked it. Please test this solution and send me a full patch once it passes. -- Cheers Jorge.-

Dec. 19, 2007

[PATCH] TEXTAREA controls submit their contents

by onepoint＠starurchin.org

On Tue, Dec 18, 2007 at 11:01:01PM +0100, Johannes Hofmann wrote: > Ooops, you are right! There is a problem with my proposed fix. When > we call Group::layout (), the Group code starts to reposition / > resize the widgets. Yes, after posting I noticed that resizing the browser window made the embedded widgets slide around the page. Very annoying. > Please try this instead: Looks good! Both dillo and test/dw-ui-test work fine, with no moving widgets. Hopefully we've cracked it. I'm still surprised that none of these problems showed up until we tried to use a FLTK TextEditor. Is it possible we're working around some bug in TextEditor, or were we just lucky up until now? Regards, Jeremy Henty

Dec. 19, 2007

[patch] resize progress indicators dynamically

by jcid＠dillo.org

On Mon, Dec 17, 2007 at 07:37:58PM +0100, Johannes Hofmann wrote: > Hello, > > this patch resizes the progress indicators as needed. > I don't like the constant "+ 4". Any ideas? Yes, I committed a modified version that handles padding by subclassing InvisibleBox. -- Cheers Jorge.-

Dec. 19, 2007

[PATCH] TEXTAREA controls submit their contents

by Johannes.Hofmann＠gmx.de

On Tue, Dec 18, 2007 at 05:44:30PM +0000, Jeremy Henty wrote: > On Tue, Dec 18, 2007 at 04:48:27PM +0100, Johannes Hofmann wrote: > > On Tue, Dec 18, 2007 at 08:28:45AM +0000, Jeremy Henty wrote: > > > I think there must be something about the way DW creates widgets > > > that means the TextEditor isn't being managed properly; it can't > > > be right that layout() is not being called. > > > > > > Thoughts? > > > > Please try this patch: > > Success! Well, sort of: Dillo works fine, but test/dw-ui-test is > broken. Here's the TextEditor patch anyway. It depends on my > previous patch to remove the special behaviour of the <Enter>. > Johannes' patch in the previous message is also necessary for things > to work. > > Now we just have to fix test/dw-ui-test , but I think that's probably > a lower priority than completing Dillo's functionality. > Ooops, you are right! There is a problem with my proposed fix. When we call Group::layout (), the Group code starts to reposition / resize the widgets. But we want to control the layout on our own. Please try this instead: diff -r 3d6ba14ceb96 dw/fltkviewport.cc --- a/dw/fltkviewport.cc Tue Dec 18 16:42:42 2007 +0100 +++ b/dw/fltkviewport.cc Tue Dec 18 22:56:50 2007 +0100 @@ -154,6 +154,16 @@ void FltkViewport::layout () { theLayout->viewportSizeChanged (this, w(), h()); adjustScrollbarsAndGadgetsAllocation (); + + for(Iterator <TypedPointer < ::fltk::Widget> > it + = canvasWidgets->iterator (); + it.hasNext (); ) { + ::fltk::Widget *widget = it.getNext()->getTypedValue (); + + if (widget->layout_damage ()) { + widget->layout (); + } + } } Regards, Johannes PS: I start thinking that fltkviewbase should not inherit from Group at all. fltkviewbase hardly uses any functionality from Group anymore. > Regards, > > Jeremy Henty > > > diff -pru -- dw2-ref/dw/fltkui.cc dw2-cur/dw/fltkui.cc > --- dw2-ref/dw/fltkui.cc 2007-12-18 17:22:38.000000000 +0000 > +++ dw2-cur/dw/fltkui.cc 2007-12-18 17:31:03.000000000 +0000 > @@ -30,7 +30,7 @@ > #include <fltk/Group.h> > #include <fltk/Input.h> > #include <fltk/SecretInput.h> > -#include <fltk/MultiLineInput.h> > +#include <fltk/TextEditor.h> > #include <fltk/RadioButton.h> > #include <fltk/CheckButton.h> > #include <fltk/Choice.h> > @@ -533,7 +533,7 @@ FltkMultiLineTextResource::FltkMultiLine > FltkSpecificResource <dw::core::ui::MultiLineTextResource> (platform), > numCols(cols), numRows(rows) > { > - initText = NULL; > + buffer = new ::fltk::TextBuffer; > editable = false; > > init (platform); > @@ -541,27 +541,18 @@ FltkMultiLineTextResource::FltkMultiLine > > FltkMultiLineTextResource::~FltkMultiLineTextResource () > { > - if (initText) > - delete initText; > + delete buffer; > } > > ::fltk::Widget *FltkMultiLineTextResource::createNewWidget (core::Allocation > *allocation) > { > - ::fltk::MultiLineInput *input = > - new ::fltk::MultiLineInput (allocation->x, allocation->y, > - allocation->width, > - allocation->ascent + allocation->descent); > - > - 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; > + ::fltk::TextEditor *text = > + new ::fltk::TextEditor (allocation->x, allocation->y, > + allocation->width, > + allocation->ascent + allocation->descent); > + text->buffer (buffer); > + return text; > } > > void FltkMultiLineTextResource::sizeRequest (core::Requisition *requisition) > @@ -586,23 +577,12 @@ void FltkMultiLineTextResource::sizeRequ > > const char *FltkMultiLineTextResource::getText () > { > - if (viewsAndWidgets->isEmpty ()) > - return initText; > - else > - return ((::fltk::MultiLineInput*)viewsAndWidgets->getFirst()->widget)->value (); > + return buffer->text (); > } > > 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); > - } > + buffer->text (text); > } > > bool FltkMultiLineTextResource::isEditable () > diff -pru -- dw2-ref/dw/fltkui.hh dw2-cur/dw/fltkui.hh > --- dw2-ref/dw/fltkui.hh 2007-12-18 17:22:38.000000000 +0000 > +++ dw2-cur/dw/fltkui.hh 2007-12-18 17:26:59.000000000 +0000 > @@ -7,6 +7,7 @@ > > #include <fltk/Button.h> > #include <fltk/Menu.h> > +#include <fltk/TextBuffer.h> > > namespace dw { > namespace fltk { > @@ -317,7 +318,7 @@ class FltkMultiLineTextResource: > public FltkSpecificResource <dw::core::ui::MultiLineTextResource> > { > private: > - const char *initText; > + ::fltk::TextBuffer *buffer; > bool editable; > int numCols, numRows; > > > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)dillo.org > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

Dec. 18, 2007

[PATCH] TEXTAREA controls submit their contents

by onepoint＠starurchin.org

On Tue, Dec 18, 2007 at 04:48:27PM +0100, Johannes Hofmann wrote: > On Tue, Dec 18, 2007 at 08:28:45AM +0000, Jeremy Henty wrote: > > I think there must be something about the way DW creates widgets > > that means the TextEditor isn't being managed properly; it can't > > be right that layout() is not being called. > > > > Thoughts? > > Please try this patch: Success! Well, sort of: Dillo works fine, but test/dw-ui-test is broken. Here's the TextEditor patch anyway. It depends on my previous patch to remove the special behaviour of the <Enter>. Johannes' patch in the previous message is also necessary for things to work. Now we just have to fix test/dw-ui-test , but I think that's probably a lower priority than completing Dillo's functionality. Regards, Jeremy Henty diff -pru -- dw2-ref/dw/fltkui.cc dw2-cur/dw/fltkui.cc --- dw2-ref/dw/fltkui.cc 2007-12-18 17:22:38.000000000 +0000 +++ dw2-cur/dw/fltkui.cc 2007-12-18 17:31:03.000000000 +0000 @@ -30,7 +30,7 @@ #include <fltk/Group.h> #include <fltk/Input.h> #include <fltk/SecretInput.h> -#include <fltk/MultiLineInput.h> +#include <fltk/TextEditor.h> #include <fltk/RadioButton.h> #include <fltk/CheckButton.h> #include <fltk/Choice.h> @@ -533,7 +533,7 @@ FltkMultiLineTextResource::FltkMultiLine FltkSpecificResource <dw::core::ui::MultiLineTextResource> (platform), numCols(cols), numRows(rows) { - initText = NULL; + buffer = new ::fltk::TextBuffer; editable = false; init (platform); @@ -541,27 +541,18 @@ FltkMultiLineTextResource::FltkMultiLine FltkMultiLineTextResource::~FltkMultiLineTextResource () { - if (initText) - delete initText; + delete buffer; } ::fltk::Widget *FltkMultiLineTextResource::createNewWidget (core::Allocation *allocation) { - ::fltk::MultiLineInput *input = - new ::fltk::MultiLineInput (allocation->x, allocation->y, - allocation->width, - allocation->ascent + allocation->descent); - - 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; + ::fltk::TextEditor *text = + new ::fltk::TextEditor (allocation->x, allocation->y, + allocation->width, + allocation->ascent + allocation->descent); + text->buffer (buffer); + return text; } void FltkMultiLineTextResource::sizeRequest (core::Requisition *requisition) @@ -586,23 +577,12 @@ void FltkMultiLineTextResource::sizeRequ const char *FltkMultiLineTextResource::getText () { - if (viewsAndWidgets->isEmpty ()) - return initText; - else - return ((::fltk::MultiLineInput*)viewsAndWidgets->getFirst()->widget)->value (); + return buffer->text (); } 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); - } + buffer->text (text); } bool FltkMultiLineTextResource::isEditable () diff -pru -- dw2-ref/dw/fltkui.hh dw2-cur/dw/fltkui.hh --- dw2-ref/dw/fltkui.hh 2007-12-18 17:22:38.000000000 +0000 +++ dw2-cur/dw/fltkui.hh 2007-12-18 17:26:59.000000000 +0000 @@ -7,6 +7,7 @@ #include <fltk/Button.h> #include <fltk/Menu.h> +#include <fltk/TextBuffer.h> namespace dw { namespace fltk { @@ -317,7 +318,7 @@ class FltkMultiLineTextResource: public FltkSpecificResource <dw::core::ui::MultiLineTextResource> { private: - const char *initText; + ::fltk::TextBuffer *buffer; bool editable; int numCols, numRows;

Dec. 18, 2007

[PATCH] FltkMultilineTextResource: <Enter> is normal

by onepoint＠starurchin.org

This patch removes the special behaviour of the <Enter> key for the FltkMultiLineTextResource. In fact it removes the callback altogether, the resource simply holds text and has no activity. Regards, Jeremy Henty diff -pru -- dw2-ref/dw/fltkui.cc dw2-cur/dw/fltkui.cc --- dw2-ref/dw/fltkui.cc 2007-12-17 23:39:52.000000000 +0000 +++ dw2-cur/dw/fltkui.cc 2007-12-18 16:05:59.000000000 +0000 @@ -552,8 +552,6 @@ FltkMultiLineTextResource::~FltkMultiLin 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. @@ -586,21 +584,6 @@ void FltkMultiLineTextResource::sizeRequ } } -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 ()) diff -pru -- dw2-ref/dw/fltkui.hh dw2-cur/dw/fltkui.hh --- dw2-ref/dw/fltkui.hh 2007-12-17 16:00:34.000000000 +0000 +++ dw2-cur/dw/fltkui.hh 2007-12-18 16:06:11.000000000 +0000 @@ -321,8 +321,6 @@ private: bool editable; int numCols, numRows; - static void widgetCallback (::fltk::Widget *widget, void *data); - protected: ::fltk::Widget *createNewWidget (core::Allocation *allocation);

Dec. 18, 2007

[PATCH] TEXTAREA controls submit their contents

by Johannes.Hofmann＠gmx.de

On Tue, Dec 18, 2007 at 08:28:45AM +0000, Jeremy Henty wrote: > On Tue, Dec 18, 2007 at 07:11:27AM +0000, Jeremy Henty wrote: > > On Mon, Dec 17, 2007 at 04:44:01PM +0100, Johannes Hofmann wrote: > > > > > Just tried to use the TextEditor widget from fltk ... > > > Unfortunately it crashes on division by zero here... > > > > Same here > > The problem is that "editor->draw ()" gets called before > "editor->layout ()", so the maxsize_ member is 0. I can fix the crash > by explicitly calling "editor->layout ()" after creating the > TextEditor and attaching its TextBuffer , but then the editor comes up > inactive; it displays nothing and responds to nothing, although it > will still submit its initial text when the form is activated. > > I think there must be something about the way DW creates widgets that > means the TextEditor isn't being managed properly; it can't be right > that layout() is not being called. > > Thoughts? Please try this patch: diff -r 3d6ba14ceb96 dw/fltkviewport.cc --- a/dw/fltkviewport.cc Tue Dec 18 16:42:42 2007 +0100 +++ b/dw/fltkviewport.cc Tue Dec 18 16:47:31 2007 +0100 @@ -154,6 +154,7 @@ void FltkViewport::layout () { theLayout->viewportSizeChanged (this, w(), h()); adjustScrollbarsAndGadgetsAllocation (); + Group::layout (); } void FltkViewport::draw_area (void *data, const Rectangle& cr ) > > Jeremy Henty > > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)dillo.org > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

Dec. 18, 2007

[PATCH] TEXTAREA controls submit their contents

by onepoint＠starurchin.org

On Tue, Dec 18, 2007 at 07:11:27AM +0000, Jeremy Henty wrote: > On Mon, Dec 17, 2007 at 04:44:01PM +0100, Johannes Hofmann wrote: > > > Just tried to use the TextEditor widget from fltk ... > > Unfortunately it crashes on division by zero here... > > Same here The problem is that "editor->draw ()" gets called before "editor->layout ()", so the maxsize_ member is 0. I can fix the crash by explicitly calling "editor->layout ()" after creating the TextEditor and attaching its TextBuffer , but then the editor comes up inactive; it displays nothing and responds to nothing, although it will still submit its initial text when the form is activated. I think there must be something about the way DW creates widgets that means the TextEditor isn't being managed properly; it can't be right that layout() is not being called. Thoughts? Jeremy Henty

Dec. 18, 2007

[PATCH] TEXTAREA controls submit their contents

by onepoint＠starurchin.org

On Mon, Dec 17, 2007 at 04:44:01PM +0100, Johannes Hofmann wrote: > 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... Same here (or rather it's a floating point error which I assume is a division by zero). How annoying, especially as it's clearly the right widget to use and would give us scrolling for free. Guess I'll be recompiling FLTK2 with debugging next... Regards, Jeremy Henty

Dec. 18, 2007