- Dillo-dev - lists.mailman3.com

[PATCH] SELECT form controls
by onepoint＠starurchin.org Dec. 31, 2007

Dec. 31, 2007

This patch adds (partial) support for SELECT controls in forms. Please note: * SELECTED and DISABLED are supported. * If no item is selected in the HTML source then the first item is selected by default. This means the code must delay adding any items until the SELECT is closed, since the DW API forces us to choose whether to select an item when creating it and won't let us change that later. * MULTI and SIZE are not supported: we render all SELECT controls as option menus that allow only one choice. I believe more work needs to be done on the DW ListResource before we can support multiple selections. * I added IN_OPTION to the HTML parsing flags. The code is also more careful than before to set/unset IN_FORM, IN_TEXTAREA, IN_SELECT and IN_OPTION. This may be a little redundant but I wanted to be sure that HTML tag soup can't make the flags inconsistent. I doubt the overhead of the extra bit-flipping is significant. Regards, Jeremy Henty

4 6

Re: patch: here are some consts for pixmaps.h
by jcid＠dillo.org Dec. 31, 2007

Dec. 31, 2007

Committed. -- Cheers Jorge.-

1 0

Re: patch: removing extraneous header inclusion
by jcid＠dillo.org Dec. 31, 2007

Dec. 31, 2007

On Sat, Dec 29, 2007 at 12:54:05AM +0000, place wrote: > Removed some where I couldn't see that they were being used for anything in > that file. > In one case, I added a prefs.h include (I had deleted a msg.h include, > and prefs.h is included in msg.h). > Committed. -- Cheers Jorge.-

1 0

Re: patch: here are a few more statics for dpi
by jcid＠dillo.org Dec. 31, 2007

Dec. 31, 2007

Committed. -- Cheers Jorge.-

1 0

patch: just hooking up panel preferences (panel_size, small_icons)
by place＠gobigwest.com Dec. 29, 2007

Dec. 29, 2007

Interestingly, the default was and is Tiny if panel_size is not mentioned in the rc, the default was and is Small in dillorc2, the initial value had been Medium in ui.cc, and the default was and is Large if the panel_size value is not understood.

3 2

[PATCH] dw::fltk::ui::FltkOptionMenuResource::isSelected()
by onepoint＠starurchin.org Dec. 28, 2007

Dec. 28, 2007

This patch provides a correct implementation of dw::fltk::ui::FltkOptionMenuResource::isSelected(), replacing the current stub. It is necessary for dillo2 to support SELECT controls in forms. Notes: * We implement Johannes' suggestion of modifying createNewMenu, using a single callback for each menu and calling item() to get the selected item. This gives a very clean implementation that doesn't add any new data members or virtual methods to the base classes. * We use FLTK widgets' user_data() to attach dw objects to FLTK widgets so that the FLTK callback can retrieve those dw objects from its arguments. This works very nicely and saves code since we don't have to add new data members to existing classes. * To avoid making identical changes everywhere an Item is created we refactored and created a new Item::createNewWidget() method. * For consistency of style we also refactored and created Item::createNewGroupWidget() and FltkSelectionResource::createNewItem(). (Despite their simplicity these refactorings actually account for most of the patch.) I should finish polishing the dillo2 SELECT patch soon. Then I'll be able to set comment thresholds on Slashdot! (These days that's the thing that most often forces me to quit dillo2 and start another browser, so this is a big itch to scratch.) Regards, Jeremy Henty

2 1

Q: Form SELECT support: what to do in the DW code?
by onepoint＠starurchin.org Dec. 26, 2007

Dec. 26, 2007

I'm working on supporting SELECT controls in forms. I've got a working first draft of the changes to the Dillo parser, but it's of no use yet because the Dillo menu widgets are incomplete; the menus report every item as selected and the items don't yet do anything when you select them (unless I've missed something). So I'm wondering how to fix this. We need a way to connect Items to callbacks. We need some abstraction because ListResources and OptionMenuResources will do things differently. The most straightforward thing to do is add a virtual function to SelectionResource that returns the callback to attach to the FLTK items we create. Is that OK, or do we need something more abstract? Assuming the Item will be passed to the callback, we really need a way to get back from the Item to the ListResource. The easiest way is to simply add a new data member to Itens that points to the ListResource. Again, is that OK, or should we be more abstract and not hardwire that implentation into the base class? I'm a fan of abstraction (I used to be a mathematician) but I'm inclined not to go too abstract unless there's good reason, so I think the suggestions above are good enough. Thoughts? If we do the above then fixing OptionMenuResource should be easy; add a data member to record the last selected Item, connect Items to a callback that updates that data member and implement isSelected() to compare the item being queried with the selected item. Is it worth submitting a patch along these lines, or should I do it differently? Regards, Jeremy Henty

2 2

[PATCH] FLTK Resources should call ::fltk::setfont before ::fltk::getwidth
by onepoint＠starurchin.org Dec. 23, 2007

Dec. 23, 2007

If you point Dillo at <URL:http://starurchin.org/dillo/bugs/form_setfont.html> you'll see that the textareas are rendered with different widths despite having the same number of columns. The problem is that FltkResource objects don't call ::fltk::setfont before calling ::fltk::getwidth to calculate their width, so they use the font that was set by the previous header elements, even though those elements were properly closed in the HTML source. This patch adds the missing ::fltk::setfont calls to Fltk{Entry,Button,Multiline}Resource . I've looked at all other uses of ::fltk::getwidth. The ones in dw2-cur/dw/fltkplatform.cc are properly protected by calls to ::fltk::setfont , but the ones in dw2-cur/dw/fltkpreview.cc and dillo2-cur/src/dialog.cc are not. I can't tell if they need to be protected, perhaps the current FLTK font is always correct when they are called? Thoughts? Regards, Jeremy Henty

2 5

[PATCH] FltkViewport fixes and TextEditor for FltkMultiLineResource
by onepoint＠starurchin.org Dec. 22, 2007

Dec. 22, 2007

Finally (I hope)! This patch changes FltkMultiLineResource to use the FLTK TextEditor. It includes fixes for the double free problem in FltkMultiLineResource that Johannes found, Johannes' fixes for the Viewport drawing code and the patch for the Viewport scrolling bug (which was previously posted separately so please ignore that post). Regards, Jeremy Henty diff -pru -- dw2-ref/dw/fltkui.cc dw2-cur/dw/fltkui.cc --- dw2-ref/dw/fltkui.cc 2007-12-19 12:26:59.000000000 +0000 +++ dw2-cur/dw/fltkui.cc 2007-12-22 12:48:23.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,23 @@ FltkMultiLineTextResource::FltkMultiLine FltkMultiLineTextResource::~FltkMultiLineTextResource () { - if (initText) - delete initText; + for (Iterator <ViewAndWidget> it = viewsAndWidgets->iterator (); + it.hasNext(); ) { + ViewAndWidget *viewAndWidget = it.getNext (); + ((::fltk::TextEditor *) viewAndWidget->widget)->buffer (0); + } + 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 +582,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-19 12:26:59.000000000 +0000 +++ dw2-cur/dw/fltkui.hh 2007-12-22 12:48:23.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; diff -pru -- dw2-ref/dw/fltkviewbase.cc dw2-cur/dw/fltkviewbase.cc --- dw2-ref/dw/fltkviewbase.cc 2007-12-06 17:29:59.000000000 +0000 +++ dw2-cur/dw/fltkviewbase.cc 2007-12-22 12:48:23.000000000 +0000 @@ -53,9 +53,7 @@ void FltkViewBase::draw () { int d = damage(); - if (d == DAMAGE_CHILD) { - Group::draw (); - } else if (d == DAMAGE_VALUE) { + if (d == DAMAGE_VALUE) { container::typed::Iterator <core::Rectangle> it; ::fltk::Rectangle view (0, 0, w (), h ()); @@ -76,7 +74,16 @@ void FltkViewBase::draw () pop_clip (); } } - } else { + + d &= ~DAMAGE_VALUE; + } + + if (d & DAMAGE_CHILD) { + Group::draw (); + d &= ~DAMAGE_CHILD; + } + + if (d) { ::fltk::Rectangle rect (x(), y(), w(), h()); /* fltk-clipping does not use widget coordinates */ @@ -98,6 +105,7 @@ void FltkViewBase::draw () drawRegion.clear (); } + core::ButtonState getDwButtonState () { int s1 = event_state (); @@ -113,7 +121,6 @@ core::ButtonState getDwButtonState () return (core::ButtonState)s2; } - int FltkViewBase::handle (int event) { bool processed; @@ -349,6 +356,23 @@ FltkWidgetView::~FltkWidgetView () delete canvasWidgets; } +void FltkWidgetView::layout () { + /** + * pass layout to child widgets. This is needed for complex fltk + * widgets as TextEditor. + * We can't use Group::layout() as that would rearrange the widgets. + */ + for(Iterator <TypedPointer < ::fltk::Widget> > it + = canvasWidgets->iterator (); + it.hasNext (); ) { + ::fltk::Widget *widget = it.getNext()->getTypedValue (); + + if (widget->layout_damage ()) { + widget->layout (); + } + } +} + void FltkWidgetView::drawText (core::style::Font *font, core::style::Color *color, core::style::Color::Shading shading, diff -pru -- dw2-ref/dw/fltkviewbase.hh dw2-cur/dw/fltkviewbase.hh --- dw2-ref/dw/fltkviewbase.hh 2007-12-06 17:29:59.000000000 +0000 +++ dw2-cur/dw/fltkviewbase.hh 2007-12-22 12:48:23.000000000 +0000 @@ -74,6 +74,8 @@ public: FltkWidgetView (int x, int y, int w, int h, const char *label = 0); ~FltkWidgetView (); + void layout(); + void drawText (core::style::Font *font, core::style::Color *color, core::style::Color::Shading shading, diff -pru -- dw2-ref/dw/fltkviewport.cc dw2-cur/dw/fltkviewport.cc --- dw2-ref/dw/fltkviewport.cc 2007-11-18 07:36:53.000000000 +0000 +++ dw2-cur/dw/fltkviewport.cc 2007-12-22 12:48:23.000000000 +0000 @@ -46,7 +46,7 @@ FltkViewport::FltkViewport (int x, int y vscrollbar->set_vertical(); vscrollbar->callback (vscrollbarCallback, this); - scrollX = scrollY = 0; + scrollX = scrollY = scrollDX = scrollDY = 0; dragScrolling = 0; gadgetOrientation[0] = GADGET_HORIZONTAL; @@ -154,6 +154,8 @@ void FltkViewport::layout () { theLayout->viewportSizeChanged (this, w(), h()); adjustScrollbarsAndGadgetsAllocation (); + + FltkWidgetView::layout (); } void FltkViewport::draw_area (void *data, const Rectangle& cr )

2 1

[PATCH] initialise FltkViewport::{scrollDX,scrollDY}
by onepoint＠starurchin.org Dec. 22, 2007

Dec. 22, 2007

This patch initialises FltkViewport::{scrollDX,scrollDY}. This removes a valgrind warning about a conditional jump depending on uninitialised data. It also fixes the mysterious sporadic disappearing page bug that was afflicting the development of the TextEditor patch. This makes me very happy, and confirms yet again that valgrind is awesome! Regards, Jeremy Henty diff -pru -- dw2-ref/dw/fltkviewport.cc dw2-cur/dw/fltkviewport.cc --- dw2-ref/dw/fltkviewport.cc 2007-12-22 01:23:39.000000000 +0000 +++ dw2-cur/dw/fltkviewport.cc 2007-12-22 01:46:11.000000000 +0000 @@ -46,7 +46,7 @@ FltkViewport::FltkViewport (int x, int y vscrollbar->set_vertical(); vscrollbar->callback (vscrollbarCallback, this); - scrollX = scrollY = 0; + scrollX = scrollY = scrollDX = scrollDY = 0; dragScrolling = 0; gadgetOrientation[0] = GADGET_HORIZONTAL;

2 2