- Dillo-dev - lists.mailman3.com

hook up the limit_text_width pref
by place＠gobigwest.com Jan. 2, 2008

Jan. 2, 2008

I'm not sure under what circumstances this pref. actually changes anything, but here it is anyway. (I didn't notice a difference when I enabled it in my old dillo either...)

2 1

patch: start_page and fullwindow_start prefs
by place＠gobigwest.com Jan. 2, 2008

Jan. 2, 2008

2 1

patch: the position part of the geometry pref.
by place＠gobigwest.com Jan. 2, 2008

Jan. 2, 2008

(That is, the X and Y of "geometry=WxH+X+Y") It appears that fltk just _guesses_ what the border size might be rather than actually determining the value. So when I run this with no window mgr, it puts the window where it would be if there were a 4-pixel-wide border and 21-pixel-high title bar. Same with twm, which is suboptimal because twm doesn't use those dimensions. As for fvwm2, which is the one I actually use -- and does appear to have those dimensions -- somehow the window ends up eight pixels too far down. But I'm regarding this as Not My Problem.

2 1

[PATCH] image load graphics improvements
by onepoint＠starurchin.org Jan. 2, 2008

Jan. 2, 2008

This patch tweaks the image load graphics: the spacing is nicer and the 'G' in "IMG" is more legible. You can preview the changes at http://starurchin.org/dillo/image_load/ . Regards, Jeremy Henty

2 1

[PATCH] initialise Layout::scrollIdleNotInterrupted
by onepoint＠starurchin.org Jan. 2, 2008

Jan. 2, 2008

This is another valgrind pacifier; it squashes an error "Conditional jump or move depends on uninitialised value(s)" at "dw::core::Layout::updateAnchor() (layout.cc:474)" from "valgrind dw2-cur/test/dw-lists". Regards, Jeremy Henty

2 1

Re: "de-exporting" prefs stuff
by jcid＠dillo.org Jan. 2, 2008

Jan. 2, 2008

On Tue, Jan 01, 2008 at 01:25:01AM +0000, place wrote: > Inspired by the 'de-exporting' of all of the gunk that had been in html.hh > a couple of months ago. (plus a few new defines and a 'static const') Committed. -- Cheers Jorge.-

1 0

[patch] fix hanging stop button
by Johannes.Hofmann＠gmx.de Jan. 2, 2008

Jan. 2, 2008

Hello, when pressing the stop button, it get's deactivated properly, but seems to get stuck in the pressed position. The patch below fixes the problem here. For the back- and forward- buttons it's not really necessary, because the url change seems to cause the necessary redraw anyway. However I added it there too for consistency. Regards, Johannes --- a/src/ui.cc Fri Dec 28 18:33:50 2007 +0100 +++ b/src/ui.cc Sat Dec 29 10:36:50 2007 +0100 @@ -21,6 +21,7 @@ #include <fltk/Input.h> #include <fltk/Output.h> #include <fltk/run.h> +#include <fltk/damage.h> #include <fltk/BarGroup.h> #include <fltk/PackedGroup.h> #include <fltk/xpmImage.h> @@ -996,12 +997,15 @@ void UI::button_set_sens(UIButton btn, i switch (btn) { case UI_BACK: (sens) ? Back->activate() : Back->deactivate(); + Back->redraw(DAMAGE_HIGHLIGHT); break; case UI_FORW: (sens) ? Forw->activate() : Forw->deactivate(); + Forw->redraw(DAMAGE_HIGHLIGHT); break; case UI_STOP: (sens) ? Stop->activate() : Stop->deactivate(); + Stop->redraw(DAMAGE_HIGHLIGHT); break; default: break;

2 1

[patch] make TopGroup a PackedGroup
by Johannes.Hofmann＠gmx.de Jan. 2, 2008

Jan. 2, 2008

Hello, as I didn't get any feedback from Sebastian yet on my proposal to make the scrollbars part of UI instead of FltkViewport, I decided to split my initial patch. Below is a version that still uses a PackedGroup in UI, but leaves the scrollbars in FltkViewport. Here comes the details: * Make scrollbars really children of FltkViewport, as it was probabely intended. * Use widget local coordinates in FltkViewport::adjustScrollbarsAndGadgets. * Adjust draw() and handle() so that scrollbars work properly. * As a consequence replace() now works properly, so remove the workaround. * Make TopGroup a PackedGroup and let it do the layout. * Simplify fullscreen mode. This also fixes annoying problems with the statusbar when new windows are created in fullscreen mode. Cheers, Johannes

3 8

Best wishes for this year 2008
by jcid＠dillo.org Jan. 1, 2008

Jan. 1, 2008

Hi guys, I want to start the year expressing my gratitude to all of you who have contributed your time and effort to make the Dillo project continue forward. The working atmosphere is very nice and that's a very important asset! Our ability to keep working steadily and to attract more developers is probably the cornerstone that can make Dillo --as a project-- thrive and evolve. The manpower behind a project is what pushes it forward. Once again, thanks to you all, and receive my best wishes. -- Cheers Jorge.-

2 1

[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

[PATCH] TEXTAREA controls submit their contents
by onepoint＠starurchin.org Dec. 22, 2007

Dec. 22, 2007

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);

3 20

Fixed a bug in the textblock's wrapping algorithm.
by jcid＠dillo.org Dec. 20, 2007

Dec. 20, 2007

A small bug fix in the textblock's wrapping algorithm was committed. It fixes some border cases like the attached page. -- Cheers Jorge.-

1 0

[patch] resize progress indicators dynamically
by Johannes.Hofmann＠gmx.de Dec. 19, 2007

Dec. 19, 2007

Hello, this patch resizes the progress indicators as needed. I don't like the constant "+ 4". Any ideas? Regards, Johannes diff -r 0a8a112b8e48 src/ui.cc --- a/src/ui.cc Mon Dec 17 14:07:38 2007 +0100 +++ b/src/ui.cc Mon Dec 17 19:33:53 2007 +0100 @@ -409,18 +409,24 @@ PackedGroup *UI::make_location() */ PackedGroup *UI::make_progress_bars(int wide, int thin_up) { + int width, height; + ProgBox = new PackedGroup(0,0,0,0); ProgBox->begin(); // Images - IProg = new InvisibleBox(0,0,pr_w,0, + IProg = new InvisibleBox(0,0,0,0, wide ? "Images\n0 of 0" : "0 of 0"); IProg->box(thin_up ? THIN_UP_BOX : EMBOSSED_BOX); IProg->labelcolor(GRAY10); + IProg->measure_label(width, height); + IProg->resize(width + 4, height + 4); // Page - PProg = new InvisibleBox(0,0,pr_w,0, + PProg = new InvisibleBox(0,0,0,0, wide ? "Page\n0.0KB" : "0.0KB"); PProg->box(thin_up ? THIN_UP_BOX : EMBOSSED_BOX); PProg->labelcolor(GRAY10); + PProg->measure_label(width, height); + PProg->resize(width + 4, height + 4); ProgBox->type(PackedGroup::ALL_CHILDREN_VERTICAL); ProgBox->end(); @@ -471,24 +477,24 @@ Group *UI::make_panel(int ww) if (PanelSize == P_tiny) { if (Small_Icons) - xpos = 0, bw = 22, bh = 22, fh = 0, lh = 22, lbl = 0, pr_w = 45; + xpos = 0, bw = 22, bh = 22, fh = 0, lh = 22, lbl = 0; else - xpos = 0, bw = 28, bh = 28, fh = 0, lh = 28, lbl = 0, pr_w = 45; + xpos = 0, bw = 28, bh = 28, fh = 0, lh = 28, lbl = 0; } else if (PanelSize == P_small) { if (Small_Icons) - xpos = 0, bw = 20, bh = 20, fh = 0, lh = 20, lbl = 0, pr_w = 45; + xpos = 0, bw = 20, bh = 20, fh = 0, lh = 20, lbl = 0; else - xpos = 0, bw = 28, bh = 28, fh = 0, lh = 28, lbl = 0, pr_w = 45; + xpos = 0, bw = 28, bh = 28, fh = 0, lh = 28, lbl = 0; } else if (PanelSize == P_medium) { if (Small_Icons) - xpos = 0, bw = 42, bh = 36, fh = 0, lh = 22, lbl = 1, pr_w = 60; + xpos = 0, bw = 42, bh = 36, fh = 0, lh = 22, lbl = 1; else - xpos = 0, bw = 45, bh = 45, fh = 0, lh = 28, lbl = 1, pr_w = 60; + xpos = 0, bw = 45, bh = 45, fh = 0, lh = 28, lbl = 1; } else { // P_large if (Small_Icons) - xpos = 0, bw = 42, bh = 36, fh = 22, lh = 22, lbl = 1, pr_w = 60; + xpos = 0, bw = 42, bh = 36, fh = 22, lh = 22, lbl = 1; else - xpos = 0, bw = 45, bh = 45, fh = 28, lh = 28, lbl = 1, pr_w = 60; + xpos = 0, bw = 45, bh = 45, fh = 28, lh = 28, lbl = 1; } if (PanelSize == P_tiny) { @@ -767,6 +773,7 @@ void UI::set_page_prog(size_t nbytes, in void UI::set_page_prog(size_t nbytes, int cmd) { char str[32]; + int width, height; if (cmd == 0) { PProg->deactivate(); @@ -779,6 +786,8 @@ void UI::set_page_prog(size_t nbytes, in str[0] = '\0'; } PProg->copy_label(str); + PProg->measure_label(width, height); + PProg->resize(width + 4, height + 4); PProg->redraw_label(); } } @@ -790,6 +799,7 @@ void UI::set_img_prog(int n_img, int t_i void UI::set_img_prog(int n_img, int t_img, int cmd) { char str[32]; + int width, height; if (cmd == 0) { IProg->deactivate(); @@ -802,6 +812,8 @@ void UI::set_img_prog(int n_img, int t_i str[0] = '\0'; } IProg->copy_label(str); + IProg->measure_label(width, height); + IProg->resize(width + 4, height + 4); IProg->redraw_label(); } } diff -r 0a8a112b8e48 src/ui.hh --- a/src/ui.hh Mon Dec 17 14:07:38 2007 +0100 +++ b/src/ui.hh Mon Dec 17 19:33:53 2007 +0100 @@ -48,7 +48,7 @@ class UI : public fltk::Window { int MainIdx; // Panel customization variables int PanelSize, CuteColor, Small_Icons; - int xpos, bw, bh, fh, lh, lbl, pr_w; + int xpos, bw, bh, fh, lh, lbl; // TODO: Hack for fullscreen mode int Panel_h, Status_h;

2 3

[PATCH] FltkMultilineTextResource: <Enter> is normal
by onepoint＠starurchin.org Dec. 19, 2007

Dec. 19, 2007

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);

2 1

[PATCH] tweak TEXTAREA vertical alignment
by onepoint＠starurchin.org Dec. 17, 2007

Dec. 17, 2007

This is a layout tweak. It moves the baseline of a FltkMultiLineTextResource from the top of the text to the bottom of the top line. Regards, Jeremy Henty diff -pru -- dw2-ref/dw/fltkui.cc dw2-cur/dw/fltkui.cc --- dw2-ref/dw/fltkui.cc 2007-12-17 16:00:34.000000000 +0000 +++ dw2-cur/dw/fltkui.cc 2007-12-17 17:14:21.000000000 +0000 @@ -571,11 +571,14 @@ void FltkMultiLineTextResource::sizeRequ if (style) { FltkFont *font = (FltkFont*)style->font; requisition->width = - (int)::fltk::getwidth ("M", 1) * numCols - + 2 * RELIEF_X_THICKNESS; - requisition->ascent = RELIEF_Y_THICKNESS; + (int)::fltk::getwidth ("M", 1) * numCols + + 2 * RELIEF_X_THICKNESS; + requisition->ascent = + font->ascent + RELIEF_Y_THICKNESS; requisition->descent = - (font->ascent + font->descent) * numRows + RELIEF_Y_THICKNESS; + font->descent + + (font->ascent + font->descent) * (numRows - 1) + + RELIEF_Y_THICKNESS; } else { requisition->width = 1; requisition->ascent = 1;

2 1

[PATCH] reset TEXTAREA controls
by onepoint＠starurchin.org Dec. 17, 2007

Dec. 17, 2007

This implements the DILLO_HTML_INPUT_TEXTAREA case in Html_reset_input() . Regards, Jeremy Henty diff -pru -- dillo2-ref/src/html.cc dillo2-cur/src/html.cc --- dillo2-ref/src/html.cc 2007-12-17 02:05:08.000000000 +0000 +++ dillo2-cur/src/html.cc 2007-12-17 14:50:38.000000000 +0000 @@ -3633,10 +3633,11 @@ static void Html_reset_input(DilloHtmlIn break; case DILLO_HTML_INPUT_TEXTAREA: if (input->init_str != NULL) { -// int pos = 0; -// gtk_editable_delete_text(GTK_EDITABLE(input->widget), 0, -1); -// gtk_editable_insert_text(GTK_EDITABLE(input->widget), input->init_str, -// strlen(input->init_str), &pos); + MultiLineTextResource *textres; + textres = + (MultiLineTextResource*) + ((Embed*)input->widget)->getResource(); + textres->setText(input->init_str ? input->init_str : ""); } break; default:

2 1

[PATCH] implements dw::fltk::ui::FltkMultiLineTextResource
by onepoint＠starurchin.org Dec. 17, 2007

Dec. 17, 2007

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);

3 9

should new windows inherit panel size and fullscreen mode?
by Johannes.Hofmann＠gmx.de Dec. 16, 2007

Dec. 16, 2007

Hello, I would like that new browser windows inherit the panel size and fullscreen mode from the current window. What do others think? Cheers, Johannes

3 4

Colspan and table percentages
by jcid＠dillo.org Dec. 15, 2007

Dec. 15, 2007

Hi! After a lot of work, the patch for better table rendering (regarding colspan and percentages) was good enough to be committed. Please enjoy and send feedback (or patches) ;-). - Implemented a weighted apportionment algorithm for table colspan. - Implemented percentage widths in tables (better rendering!). - Fixed an initialization bug in hruler. If you: #define DBG In table.cc. Verbose debugging output is enabled. I tried to make special and ill cases decision-making similar to firefox, but frankly, some cases are really weird! For instance, take a look here and compare: http://www.dillo.org/test/cs1.html http://www.dillo.org/test/cs7.html // e.g. look at th 20% table Well, the main point is for you to test and to report how it works! -- Cheers Jorge.-

3 9

[PATCH] comment fix in dw2/dw/iterator.hh
by onepoint＠starurchin.org Dec. 14, 2007

Dec. 14, 2007

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 */

2 1

[PATCH] DW: indentation in dw/selection.cc
by onepoint＠starurchin.org Dec. 12, 2007

Dec. 12, 2007

This is purely cosmetic: my changes to dw/selection.cc messed up the indentation so this patch fixes it. Incidentally, does anyone have a version of the emacs C/C++ modes that is consistent with the Dillo source? I've set: c-basic offset: 3 indent-tabs-mode: nil but it still pointlessly reformats the source. In particular it indents the contents of namespace { ... }. Regards, Jeremy Henty diff -pru -- dw2-ref/dw/selection.cc dw2-cur/dw/selection.cc --- dw2-ref/dw/selection.cc 2007-12-11 11:30:07.000000000 +0000 +++ dw2-cur/dw/selection.cc 2007-12-11 20:54:10.000000000 +0000 @@ -123,19 +123,19 @@ bool SelectionState::buttonPress (Iterat linkState = LINK_PRESSED; linkButton = event->button; DeepIterator *newLink = new DeepIterator (it); - if (newLink->isEmpty ()) { - delete newLink; - resetLink (); - } else { - link = newLink; - // It may be that the user has pressed on something activatable - // (linkNo != -1), but there is no contents, e.g. with images - // without ALTernative text. - if (link) { - linkChar = correctCharPos (link, charPos); - linkNumber = linkNo; - } - } + if (newLink->isEmpty ()) { + delete newLink; + resetLink (); + } else { + link = newLink; + // It may be that the user has pressed on something activatable + // (linkNo != -1), but there is no contents, e.g. with images + // without ALTernative text. + if (link) { + linkChar = correctCharPos (link, charPos); + linkNumber = linkNo; + } + } // We do not return the value of the signal method, // but we do actually process this event. ret = true; @@ -148,15 +148,15 @@ bool SelectionState::buttonPress (Iterat selectionState = SELECTING; DeepIterator *newFrom = new DeepIterator (it); - if (newFrom->isEmpty ()) { - delete newFrom; - resetSelection (); - } else { - from = newFrom; - fromChar = correctCharPos (from, charPos); - to = from->cloneDeepIterator (); - toChar = correctCharPos (to, charPos); - } + if (newFrom->isEmpty ()) { + delete newFrom; + resetSelection (); + } else { + from = newFrom; + fromChar = correctCharPos (from, charPos); + to = from->cloneDeepIterator (); + toChar = correctCharPos (to, charPos); + } ret = true; } else { if (event && event->button == 3) {

2 1

BUG: assertion failed: "no widget": in dw::core::DeepIterator::searchSideward
by onepoint＠starurchin.org Dec. 11, 2007

Dec. 11, 2007

Dillo aborts with an assertion failure if you click to the right of an image that has a line all to itself. For example, go to http://www.thenation.com/doc/20071203/pollitt and click to the right of the "Continued" logo. What happens is that the DeepIterator constructor wants an iterator with non-widget content. If necessary it calls searchDownward and searchSideward until it finds one. Both these methods raise an assertion failure if the iterator already has non-widget content, so the content must be checked before calling *either* of them. However, DeepIterator checks the content before calling searchDownward but *not* before calling searchSideward . Effectively, the code assumes that if searchDownward fails then the content type won't have changed. Unfortunately searchDownward can fail *and* change the content of the iterator to something non-widget. If this happens DeepIterator then calls searchSideward, which triggers the assertion. (NB: DeepIterator is in the dw::core namespace.) I'm trying to fix this but so far I'm just generating more crashes. What exactly should DeepIterator::DeepIterator do if searchDownward fails and changes the content of the iterator? If I know that I'll have another go. Regards, Jeremy Henty

3 14

[patch] fix close button height in page source window
by Johannes.Hofmann＠gmx.de Dec. 11, 2007

Dec. 11, 2007

Hi, the height of the close button of the source code window changes with the size of the window. The patch below fixes its size. Cheers, Johannes PS: Scrolling in the page source window is dead slow here. But that's definately a fltk issue... diff -r 043b53a25dc3 src/dialog.cc --- a/src/dialog.cc Mon Dec 10 15:42:03 2007 +0100 +++ b/src/dialog.cc Mon Dec 10 18:12:15 2007 +0100 @@ -123,7 +123,7 @@ void a_Dialog_text_window(const char *tx ReturnButton *b = new ReturnButton (0, wh-bh, ww, bh, "Close"); b->callback(window_close_cb, window); - window->resizable(window); + window->resizable(td); window->end(); window->show(); }

2 1

BUG: CCC corrupts memory when the Content-Type is wrong
by onepoint＠starurchin.org Dec. 6, 2007

Dec. 6, 2007

I am hoping that someone who understands Dillo's CCC better than I can point me in the right direction and save me some time debugging this. Dillo almost always crashes if the HTML contains the stumbleupon.com favicon link, ie.'<img src="http://www.stumbleupon.com/favicon.ico">'. (This is very annoying as it makes Dillo unusable for one of my favourite blogs.) If it doesn't crash right away then clicking Reload crashes it. Examining core dumps with gdb suggests that memory is being corrupted, and running dillo under valgrind shows that the CCC functions are reading, writing and freeing already freed memory. (Details attached.) A local HTTP server triggers the bug when it server returns a Content-Type of "text/plain; charset=iso-8859-1". If I change it to "image/x-icon" there is no corruption. Accessing the image directly via a "file:" URL does not trigger the bug. (Strangely, using a local HTTP server does not hit the bug until I open a second window on the page, although sometimes it crashes first time.) I'm attaching a summary of the invalid memory accesses that valgrind reported, and the entire valgrind log (which includes stack traces). Any suggestions for where I should start instrumenting the CCC to find out why it is prematurely freeing pointers? Jeremy Henty

2 4

[patch] fix crashes after panel size changes
by Johannes.Hofmann＠gmx.de Dec. 6, 2007

Dec. 6, 2007

Hello, now that was a weird bug! I was experiencing crashes when I had changed the panel size via the right mouse on the search button. The problem is that FltkWidgetView::prepareCreateFltkWidget() was calling fltk::Group::begin(). Therefore after visiting pages with forms, the newly created panel was getting a child of Main instead of TopGroup! Btw. did I mention that this fltk begin()/end() stuff is evil? One could expect that Group::replace() should disconnect the new widget properly from its old parent (if there is any). But that's not the case. I wrote a mail to fltk.general about this. So in the end Main still had a reference to the panel and once it was deleted -- bang. The patch below uses Group::add() directly in FltkWidgetView::addFltkWidget() instead of FltkWidgetView::prepareCreateFltkWidget(). Does anyone remember why FltkWidgetView::prepareCreateFltkWidget() was added in the first place? Cheers, Johannes diff --git a/dw/fltkplatform.cc b/dw/fltkplatform.cc --- a/dw/fltkplatform.cc +++ b/dw/fltkplatform.cc @@ -83,10 +83,6 @@ FltkColor::FltkColor (int color, core::s colors[SHADING_DARK] = shadeColor (color, SHADING_DARK) << 8; colors[SHADING_LIGHT] = shadeColor (color, SHADING_LIGHT) << 8; } -} - -void FltkView::prepareCreateFltkWidget () -{ } void FltkView::addFltkWidget (::fltk::Widget *widget, diff --git a/dw/fltkplatform.hh b/dw/fltkplatform.hh --- a/dw/fltkplatform.hh +++ b/dw/fltkplatform.hh @@ -40,7 +40,6 @@ public: public: virtual bool usesFltkWidgets () = 0; - virtual void prepareCreateFltkWidget (); virtual void addFltkWidget (::fltk::Widget *widget, core::Allocation *allocation); virtual void removeFltkWidget (::fltk::Widget *widget); diff --git a/dw/fltkui.cc b/dw/fltkui.cc --- a/dw/fltkui.cc +++ b/dw/fltkui.cc @@ -103,7 +103,6 @@ void FltkResource::attachView (FltkView ViewAndWidget *viewAndWidget = new ViewAndWidget(); viewAndWidget->view = view; - view->prepareCreateFltkWidget (); viewAndWidget->widget = createNewWidget (&allocation); viewAndWidget->view->addFltkWidget (viewAndWidget->widget, &allocation); viewsAndWidgets->append (viewAndWidget); diff --git a/dw/fltkviewbase.cc b/dw/fltkviewbase.cc --- a/dw/fltkviewbase.cc +++ b/dw/fltkviewbase.cc @@ -375,17 +375,12 @@ bool FltkWidgetView::usesFltkWidgets () return true; } - -void FltkWidgetView::prepareCreateFltkWidget () -{ - begin (); -} - void FltkWidgetView::addFltkWidget (::fltk::Widget *widget, core::Allocation *allocation) { canvasWidgets->append (new TypedPointer < ::fltk::Widget> (widget)); allocateFltkWidget (widget, allocation); + add (widget); } void FltkWidgetView::removeFltkWidget (::fltk::Widget *widget) diff --git a/dw/fltkviewbase.hh b/dw/fltkviewbase.hh --- a/dw/fltkviewbase.hh +++ b/dw/fltkviewbase.hh @@ -82,7 +82,6 @@ public: int x, int y, int width, int height); bool usesFltkWidgets (); - void prepareCreateFltkWidget (); void addFltkWidget (::fltk::Widget *widget, core::Allocation *allocation); void removeFltkWidget (::fltk::Widget *widget); void allocateFltkWidget (::fltk::Widget *widget,

2 1

[patch] initialize mustQueueResize in Textblock constructor
by Johannes.Hofmann＠gmx.de Dec. 5, 2007

Dec. 5, 2007

Hello, this patch initializes mustQueueResize in the Textblock constructor. Valgrind was complaining about a jump depending on uninitialized memory. Cheers, Johannes diff --git a/dw/textblock.cc b/dw/textblock.cc --- a/dw/textblock.cc +++ b/dw/textblock.cc @@ -39,6 +39,7 @@ Textblock::Textblock (bool limitTextWidt line1Offset = 0; line1OffsetEff = 0; ignoreLine1OffsetSometimes = false; + mustQueueResize = false; /* * The initial sizes of lines and words should not be

2 1

[patch] add missing style->ref ()
by Johannes.Hofmann＠gmx.de Dec. 5, 2007

Dec. 5, 2007

Hello, the tiny patch below adds a missing style->ref() which was causing a lot of crashes on my system. cheers, Johannes diff --git a/dw/fltkui.cc b/dw/fltkui.cc --- a/dw/fltkui.cc +++ b/dw/fltkui.cc @@ -159,6 +159,7 @@ void FltkResource::setStyle (core::style this->style->unref (); this->style = style; + style->ref (); for (Iterator <ViewAndWidget> it = viewsAndWidgets->iterator (); it.hasNext(); ) {

2 1

[patch] partial redraws - updated
by Johannes.Hofmann＠gmx.de Dec. 4, 2007

Dec. 4, 2007

Hello, this patch fixes the problem pointed out by Sebastian regarding partial redraws and scrolling interference. It adds a new Region class that is implemented similarily as in dillo1 as a set of rectangles not containing each other. The conversion from canvas to view coordinates is now done at draw-time. Regards, Johannes PS: The code did not get as complex as I initially thought it would :-)

2 5

Re: patch: a _minuscule_ amount of cleaning up the header parsing code
by jcid＠dillo.org Dec. 3, 2007

Dec. 3, 2007

On Thu, Nov 29, 2007 at 03:08:12PM +0000, place wrote: > No change in behavior is intended. > Yes, that code is getting hard to understand. After a review, I wondered why Cache_parse_header() is dealing with the message body, when it should only parse the header, and why is it getting the (buf, bufsize) pair when it has the content in entry->Header. It looks that a cleaner way would be something like: (not tested, just pseudo-code) if (!(entry->Flags & CA_GotHeader)) { while ((len = Cache_get_header(entry, buf + start, buf_size - start))) { /* Let's scan, allocate, and set things according to header info */ Cache_parse_header(entry); if (entry->Flags & CA_GotHeader) { start += len; } else // Let the flow continue downward so the remaining // of the buffer is processed } return; } and to get rid of the: dbuf = a_Decode_process(entry->TransferDecoder, dbuf); dbuf = a_Decode_process(entry->ContentDecoder, dbuf); lines inside Cache_parse_header(). Please give it a try. -- Cheers Jorge.-

1 0

Re: charset conversion issues
by jcid＠dillo.org Nov. 28, 2007

Nov. 28, 2007

Hi, On Sat, Nov 24, 2007 at 10:50:18PM +0000, place wrote: > With rough code to look at. > No sense polishing up and completing what I have yet when you'll want changes... OK. > > > Charset in the meta tag. > My options seemed to be: > - Client->Callback returns information to cache. > Probably not supposed to happen. Too big of a change. Agreed. At least to postpone until other approaches prove messier. ;-) > - Reach the meta tag and undo/redo within html.cc. > Somewhat fragile. > Whatever I might come up with, some html out there would surely find a way > to outsmart me. This is the one I like most at first sight. Considering the charset can be given by HTTP or a META element: We can assume ASCII in the html text until the HEAD element is closed. If there's a charset in the META, then the decoder can be switched from null to the specified one. This approach has the advantage of working both when the charset comes via HTTP or META (<HEAD> content is ASCII). We can even add a text buffer for the HEAD element and append it to the whole HTML content if the offset is hard to set for the new decoder. Do the problems you found apply to this scheme too? > - Bail out and start again. > This is what I have now. In fact, not knowing at all what to do, I just > call a_Nav_cancel_expect() and a_Nav_push() right then and there. > Surprisingly, it functions instead of crashing, but I'm probably spilling > resources And Violating Principles. > (And, since a_Nav_push() isn't quite right for the situation even then, > I have to fix the nav stack ptr in Nav_cleanup()) > > > There's a dialog box to set the Content-Type for a page. If you change it > to text/plain, you get source in a proper window (with searching) instead > of the little fltk window. No line numbers, though. The idea of using Dillo for view source is interesting, i'm not sure though. Maybe a fltk widget (like an stripped-down editor as the one in FLTK's test/ directory) which gets utf-8 via a_Capi_get_utf8_data(Url) is also good. > > > Not wanting to mess with TypeDet and TypeHdr until finding out what you > think, I stuck in another one, TypeSet. I'd prefer to try to apply the second method (described above). > I'm directly calling a_Cache_[sg]et_content_type() from just wherever, > which may or may not be all right. Cache should be called from Capi only, but at this stage... > I knew that latin1 != UTF-8, but I was not thinking when I wrote > that Decode code. Must've been thinking about the Unicode code numbers. > FLTK has a workaround in it to deal with fools like me who send it latin1 > or cp1252, but better that I stop being foolish :) > > > I don't have Plain or View Source set up to decode yet. I don't know whether > the cache should know about decoding charsets. Or a Text base class or > something. > > > The real-type-matches-header-type code will have to learn to relax a bit, > now that html might contain all kinds of bytes... -- Cheers Jorge.-

2 1

patch: decode filter (Re: [Dillo-dev] Implemented a weighted apportionment algorithm for table rowspan.)
by jcid＠dillo.org Nov. 27, 2007

Nov. 27, 2007

On Mon, Nov 26, 2007 at 07:24:34PM +0000, place wrote: > > Yes. Send me this. > > All right. Attached. Committed. > > > > > 2) Chunked Transfer-Encoding running on top of (1) because I thought it might > > > help with gzip latency. It was a can-I-get-this-working-in-principle effort > > > and I will have to rewrite it now. Plus I need to actually read through the > > > http/1.1 spec (what I did was just based on a little web page that > > > summarized the main differences between 1.0 and 1.1 for me). > > > > Hmm, yes. Please rewrite it as simple/clean as possible, and with the SPEC > > in one hand. Once there, please send it. > > > > My experience is that code written to comply with the SPEC is easier > > to debug and polish (there're plenty of cases where wrong behaviour is on > > the server side, and thus we can be sure is not dillo). > > It sounds like somebody's indeed had his share of bitter experience with > being sent hacked-together patches :) I wasn't actually threatening to send > this version; just letting you know what's going on... Yes, you're right. 8-P > > The most annoying part so far was that 1.1 is supposedly able to send > "100 Continue" before you get the real stuff. I haven't seen one actually > do it yet, though. Maybe that's only if you're doing pipelining... > > Oh, and I just read about multiline headers. It wasn't really clear whether > this was new in 1.1, though. Did 1.0 have to handle it as well? Multiline headers?! sorry, I don't remember that off the top of my head. -- Cheers Jorge.-

2 2

Implemented a weighted apportionment algorithm for table rowspan.
by jcid＠dillo.org Nov. 26, 2007

Nov. 26, 2007

On Mon, Nov 26, 2007 at 03:34:09PM +0000, place wrote: > > Everybody: please enjoy this patch, it was a lot of work! :-) > > if you find a URL where it helps, I'd appreciate some feedback. > > Hurray for better tables! Pages on the wunderground.com site fit together better > than they used to. Thanks for the feedback. (though I didn't find a "Short cell" message in the first clicks). > I currently have: > 1) I finally had the excuse to make decode into a proper filter. That is, > Dstr* as input as well as output. Yes. Send me this. > 2) Chunked Transfer-Encoding running on top of (1) because I thought it might > help with gzip latency. It was a can-I-get-this-working-in-principle effort > and I will have to rewrite it now. Plus I need to actually read through the > http/1.1 spec (what I did was just based on a little web page that > summarized the main differences between 1.0 and 1.1 for me). Hmm, yes. Please rewrite it as simple/clean as possible, and with the SPEC in one hand. Once there, please send it. My experience is that code written to comply with the SPEC is easier to debug and polish (there're plenty of cases where wrong behaviour is on the server side, and thus we can be sure is not dillo). -- Cheers Jorge.-

1 0

Implemented a weighted apportionment algorithm for table rowspan.
by jcid＠dillo.org Nov. 26, 2007

Nov. 26, 2007

Hi there, A new, weighted apportionment algorithm for table rowspans was committed. This wasn't implemented in dillo2, and the algorithm is different from the one in dillo1. This produces much better table rendering when rowspan is used (if there's no rowspan in the table, it's the same as before). You can notice the rowspan case in the Web because of a stdout message like this one: "Short cell 0, sumRows=66 ih=110" It is interesting to compare dillo2.old, dillo2.rowspan, dillo1 and firefox. You can use: http://www.dillo.org/test/rowspan.html Sebastian: I added some comments in rounding-errors.doc, explained the algorithm, including a formula. I also corrected an index in the previous section. Please check it in rounding-errors.html after re-running doxygen, or in the attached patch (already in CVS). Notes: * In the test page above, the last table in the second set shows "cellspacing" is not working. AFAIU this is not implemented and subject to another patch. * The vertical alignment of a cell content is not yet implemented in dillo2. That's why the cell content is aligned at the top instead of the middle (default, as firefox does). This is subject of another patch. * The same algorithm may be used for width apportionment. I'm not sure on this though. Sebastian: are you planning to work on this soon? If not, I can try to work on the above mentioned problems. Advice welcomed! Everybody: please enjoy this patch, it was a lot of work! :-) if you find a URL where it helps, I'd appreciate some feedback. -- Cheers Jorge.-

2 2

DPI infrastructure patches (3rd try)
by darkspirit5000＠gmail.com Nov. 26, 2007

Nov. 26, 2007

Excuse me the triple mail. I am very sorry for the problems this mail causes Hello and great work. Here i resend 2 patches related to DPI infrastructure. The first patch (dpid_services_support.diff) add the service concept to dpid (like docs sugest) so DPIs names are not related to services names asked by dillo, more than a DPI can serve a service and various DPIs can be installed to serve one service. The patch add new configuration lines in dpidrc, but can work without changes in dpidrc. (backward compatible) The lines in dpidrc have the form: service_name=ending_part_of_path_to_DPI User DPIs are preferred to system DPIs. Example: bookmarks=/bookmarks.dpi cookies=cookies/cookies.dpi downloads=downloads/downloads.dpi file=file/file.dpi ftp=ftp/ftp.filter.dpi https=https/https.filter.dpi data=datauri/datauri.filter.dpi hello=hello/hello.filter.dpi service names ending in '*' match a service asked by dillo starting with the text before the '*' and that not match other service names Example: car=car.dpi cab=cab.dpi ca*=a.dpi a.dpi is used only if dillo ask for a service that start with ca but is not car or cab To test the patch add next line to dpidrc: test=hello/hello.filter.dpi and use the url dpi:/test/ The second path (proto_services.diff) removes ad-hoc bindings for protocols DPIs in dillo. It uses services for protocols handled externaly (internal protocols: http and about; external: file, ftp, https and data). With this 2 features a protocol DPI (mms:, ed2k:, ...) can be programed without changes to dillo. The service names have the form proto.protocol_name. The lines below must be added to dpidrc and dpid need to be patched with first path (dpid_services_support.diff) so protocols works as before. (NOT backward compatible) proto.file=file/file.dpi proto.ftp=ftp/ftp.filter.dpi proto.https=https/https.filter.dpi proto.data=datauri/datauri.filter.dpi With the next line not handled protocols can return an error, a page to download new DPIs or search new protocol DPIs in dillo page using a DPI: proto.*=proto/unknown.filter.dpi This scrip mimics dillo operation #!/bin/sh # read dillo open url command read -d'>' dpip_tag echo "<dpi cmd='send_status_message' msg='ERROR: unsupported protocol' '>" I have rediscover the dpid bug (without and with pach) that ignore a DPI installed in user and system DPI_dirs at the same time. It is not solved so care about it. Diego. ----------- dpid_services_support.diff --------------------------------------------------------- diff -pru dillo2/dpid/dpid.c g/dpid/dpid.c --- dillo2/dpid/dpid.c 2007-10-14 02:09:40.000000000 +0200 +++ g/dpid/dpid.c 2007-11-24 18:19:36.000000000 +0100 @@ -23,6 +23,7 @@ #include <sys/stat.h> #include <sys/wait.h> #include <unistd.h> +#include <ctype.h> #include "dpid_common.h" #include "dpid.h" #include "dpi.h" @@ -138,6 +139,20 @@ void free_plugin_list(struct dp **dpi_at *dpi_attr_list_ptr = NULL; } +/*! Free memory used by the services list + */ +void free_services_list(Dlist *s_list) +{ + int i = 0; + struct service *s; + + for (i=0; i < dList_length(s_list) ; i++) { + s = dList_nth_data(s_list, i); + dFree(s->name); + } +// dList_free(s_list); +} + /*! \todo * Remove terminator and est_terminator unless we really want to clean up * on abnormal exit. @@ -409,6 +424,145 @@ int register_all(struct dp **attlist) return (snum); } +/* + * Compare two FileInfo pointers + * This function is used for sorting directories + */ +static int services_alpha_comp(const struct service *s1, const struct service *s2) +{ + int t; + + t=strcmp(s1->name, s2->name); + if (t>0) + return -1; + else if (t<0) + return 1; + + return 0; +} + +/*! Add services reading a dpidrc file + * each non empty or commented line has the form + * service = path_relative_to_dpidir + * \Return: + * \li Returns number of available services on success + * \li -1 on failure + */ +int fill_services_list(struct dp **attlist, int numdpis, Dlist *services_list) +{ + FILE *dpidrc_stream; + char *line = NULL; + int line_num = 0; + char *p; + char *service, *path; + int i; + struct service *s; + char *user_dpidir = NULL, *sys_dpidir = NULL, *dpidrc = NULL; + + user_dpidir = dStrconcat(dGethomedir(), "/", dotDILLO_DPI, NULL); + if (access(user_dpidir, F_OK) == -1) { + /* no dpis in user's space */ + dFree(user_dpidir); + user_dpidir = NULL; + } + dpidrc = dStrconcat(dGethomedir(), "/", dotDILLO_DPIDRC, NULL); + if (access(dpidrc, F_OK) == -1) { + dFree(dpidrc); + dpidrc = dStrdup(DPIDRC_SYS); + if (access(dpidrc, F_OK) == -1) { + dFree(dpidrc); + dpidrc = NULL; + } + } + if (!dpidrc || (sys_dpidir = get_dpi_dir(dpidrc)) == NULL) + sys_dpidir = NULL; + + if (!user_dpidir && !sys_dpidir) { + ERRMSG("fill_services_list", "Fatal error ", 0); + fprintf(stderr, "\n - Can't find the directory for dpis.\n"); + exit(1); + } + + if ((dpidrc_stream = fopen(dpidrc, "r")) == NULL) { + ERRMSG("fill_services_list", "popen failed", errno); + dFree(dpidrc); + dFree(sys_dpidir); + dFree(user_dpidir); + return (-1); + } + + /* dpidrc parser loop */ + while ((line = dGetline(dpidrc_stream)) != NULL) { + i++; + /* ignore start spaces, commented and empty lines */ + dStrstrip(line); + if (*line == '#' || *line == '\0') + continue; + + service = line; + if ((path = strchr(line, '=')) == NULL) { + printf("malformed line in %s at %d: \'=\' not found\n", dpidrc, line_num); + continue; + } + *path = '\0'; + path++; + + dStrstrip(service); + /* check that service name do not contains spaces */ + if (strchr(service, ' ') != NULL) { + printf("malformed line in %s at %d: service contains spaces\n", dpidrc, i); + continue; + } + if (strlen(service) < 2) { + printf("malformed line in %s at %d: service name too sort\n", dpidrc, i); + continue; + } + /* ignore dpi_dir silently */ + if (strcmp(service, "dpi_dir") == 0) + continue; + + dStrstrip(path); + /* process quotes */ + if (*path == '\"' || *path == '\'') { + p = strrchr(path + 1, *path); + if (p == NULL) { + printf("malformed line in %s at %d: unpaired \'%c\'\n", dpidrc, i, *path); + continue; + } else if (p[1] != '\0') { + printf("malformed line in %s at %d: garbage after \'%c\'\n", dpidrc, i, *path); + continue; + } + path++; + } + + s = dNew(struct service, 1); + /* init services list entry */ + s->name = dStrdup(service); + s->dp_index = -1; + + dList_append(services_list, s); + /* search the dpi for a service by its path */ + for (i = 0; i < numdpis; i++) + if ((p = strstr((*attlist)[i].path, path)) && *(p - 1) == '/' && + strlen(p) == strlen(path)) + break; + /* if the dpi exist bind service and dpi */ + if (i < numdpis) + s->dp_index = i; + dFree(line); + } + fclose(dpidrc_stream); + + dList_sort(services_list, (dCompareFunc)services_alpha_comp); + + dFree(dpidrc); + dFree(sys_dpidir); + dFree(user_dpidir); + + return (dList_length(services_list)); +} + + /*! Initialise the service request socket * \Return: * \li Number of sockets (1 == success) @@ -668,11 +822,13 @@ int register_all_cmd(char *sockdir) stop_active_dpis(dpi_attr_list, numdpis); rm_dpi_sockets(dpi_attr_list, numdpis); free_plugin_list(&dpi_attr_list, numdpis); + free_services_list(services_list); numdpis = 0; numsocks = 1; /* the srs socket */ FD_ZERO(&sock_set); FD_SET(srs, &sock_set); numdpis = register_all(&dpi_attr_list); + fill_services_list(&dpi_attr_list, numdpis, services_list); numsocks = init_all_dpi_sockets(dpi_attr_list, sockdir); return (numdpis); } @@ -697,6 +853,20 @@ char *get_message(int sock, char *dpi_ta return (msg); } +int service_match(const struct service *A, const char *B) +{ + int A_len, B_len, len; + + A_len = strlen(A->name); + B_len = strlen(B); + len = MAX (A_len, B_len); + + if (A->name[A_len - 1] == '*') + len = A_len - 1; + + return(dStrncasecmp(A->name, B, len)); +} + /*! * Send socket path that matches dpi_id to client */ @@ -705,12 +875,18 @@ void send_sockpath(int sock, char *dpi_t int i; char *dpi_id; char *d_cmd; + struct service *serv; dReturn_if_fail((dpi_id = get_message(sock, dpi_tag)) != NULL); - for (i = 0; i < numdpis; i++) - if (strstr(dpi_attr_list[i].id, dpi_id)) - break; + serv = dList_find_custom(services_list, dpi_id, (dCompareFunc)service_match); + + if (serv == NULL || (i = serv->dp_index) == -1) + for (i = 0; i < numdpis; i++) + if (!strncmp(dpi_attr_list[i].id, dpi_id, + dpi_attr_list[i].id - strchr(dpi_attr_list[i].id, '.'))) + break; + if (i < numdpis) { /* found */ if (access(dpi_attr_list[i].path, F_OK) == -1) { diff -pru dillo2/dpid/dpid.h g/dpid/dpid.h --- dillo2/dpid/dpid.h 2007-10-07 00:36:34.000000000 +0200 +++ g/dpid/dpid.h 2007-11-24 18:17:14.000000000 +0100 @@ -45,6 +45,13 @@ struct dp { int filter; }; +/*! bind dpi with service + */ +struct service { + char *name; + int dp_index; +}; + /*! Number of available plugins */ int numdpis; @@ -54,6 +61,9 @@ int numsocks; /*! State information for each plugin. */ struct dp *dpi_attr_list; +/*! service served for each plugin */ +Dlist *services_list; + /*! Set of sockets watched for connections */ fd_set sock_set; @@ -70,6 +80,8 @@ void free_dpi_attr(struct dp *dpi_attr); void free_plugin_list(struct dp **dpi_attr_list_ptr, int numdpis); +void free_services_list(Dlist *s_list); + enum file_type get_file_type(char *file_name); int get_dpi_attr(char *dpi_dir, char *service, struct dp *dpi_attr); @@ -78,6 +90,10 @@ int register_service(struct dp *dpi_attr int register_all(struct dp **attlist); +static int services_alpha_comp(const struct service *s1, const struct service *s2); + +int fill_services_list(struct dp **attlist, int numdpis, Dlist *services_list); + int init_srs_socket(char *sockdir); int init_dpi_socket(struct dp *dpi_attr, char *sockdir); @@ -98,6 +114,8 @@ int register_all_cmd(char *sockdir); char *get_message(int sock, char *dpi_tag); +int service_match(const struct service *A, const char *B); + void send_sockpath(int sock, char * dpi_tag, struct dp *dpi_attr_list); #endif diff -pru dillo2/dpid/main.c g/dpid/main.c --- dillo2/dpid/main.c 2007-10-07 00:36:34.000000000 +0200 +++ g/dpid/main.c 2007-11-24 18:17:14.000000000 +0100 @@ -228,6 +228,7 @@ int main(void) fd_set selected_set; dpi_attr_list = NULL; + services_list = NULL; //daemon(0,0); /* Use 0,1 for feedback */ /* todo: call setsid() ?? */ @@ -258,6 +259,11 @@ int main(void) exit(1); } + /* Init services list */ + services_list = dList_new(8); + /* And get server list */ + fill_services_list(&dpi_attr_list, numdpis, services_list); + /* Remove any sockets that may have been leftover from a crash */ cleanup(sockdir); /* Initialise sockets */ ---------- proto_services.diff ----------------------------------------- diff -pru dillo2/src/capi.c f/src/capi.c --- dillo2/src/capi.c 2007-11-17 15:18:37.000000000 +0100 +++ f/src/capi.c 2007-11-21 04:35:22.000000000 +0100 @@ -240,8 +240,12 @@ static int Capi_dpi_verify_request(Dillo static int Capi_url_uses_dpi(DilloUrl *url, char **server_ptr) { char *p, *server = NULL, *url_str = URL_STR(url); + Dstr *tmp; - if (dStrncasecmp(url_str, "dpi:/", 5) == 0) { + if ((dStrncasecmp(url_str, "http:", 5) == 0) || + (dStrncasecmp(url_str, "about:", 6) == 0)) { + /* Doing nothing returns 0 (url not uses dpi) and server = NULL */ + } else if (dStrncasecmp(url_str, "dpi:/", 5) == 0) { /* dpi prefix, get this server's name */ if ((p = strchr(url_str + 5, '/')) != NULL) { server = dStrndup(url_str + 5, (uint_t)(p - url_str - 5)); @@ -252,16 +256,11 @@ static int Capi_url_uses_dpi(DilloUrl *u dFree(server); server = dStrdup("bookmarks"); } - - } else if (dStrncasecmp(url_str, "ftp:/", 5) == 0) { - server = dStrdup("ftp"); - - } else if (dStrncasecmp(url_str, "https:/", 7) == 0) { - server = dStrdup("https"); - } else if (dStrncasecmp(url_str, "file:", 5) == 0) { - server = dStrdup("file"); - } else if (dStrncasecmp(url_str, "data:", 5) == 0) { - server = dStrdup("datauri"); + } else if ((p = strchr(url_str, ':')) != NULL) { + tmp = dStr_new("proto."); + dStr_append_l(tmp, url_str, p - url_str); + server = tmp->str; + dStr_free(tmp, 0); } return ((*server_ptr = server) ? 1 : 0);

2 1

DPI infrastructure patches (2nd try)
by darkspirit5000＠gmail.com Nov. 24, 2007

Nov. 24, 2007

Skipped content of type multipart/alternative

1 0

Re: (and the space bar) Re: horizontal scrolling
by jcid＠dillo.org Nov. 24, 2007

Nov. 24, 2007

Hi, On Fri, Nov 23, 2007 at 04:13:36PM +0000, place wrote: > Certain pages would exit when I hit space, so that list > in UI::handle() needs ' ' as well. I guess it was unhandled > and eventually found its way into the close_window_cb. > > An example of a page that would do it: > http://lists.auriga.wearlab.de/pipermail/dillo-dev/2003-July/000829.html > Maybe it had to do with clicking on a PRE. I don't know. Fixed in CVS (AFAIS). > PS Following the topic of that page, do you have any interest in a User-Agent > string preference in dillo? I made one for myself, but managed to become very > confused when I temporarily pretended to be firefox and google started sending > me these big, broken pages. Took me a while to remember why it was suddenly > doing this... Yes, that's the problem. I don't use User-Agent spoofing, but if somebody finds some good use for it, why not. -- Cheers Jorge.-

1 0

DPI infrastructure patches
by darkspirit5000＠gmail.com Nov. 24, 2007

Nov. 24, 2007

Skipped content of type multipart/alternative

1 0

Re: fullscreen/maximize question
by jcid＠dillo.org Nov. 21, 2007

Nov. 21, 2007

Hi there, Here's a funny thing that I'd like to make some tests on. In ui.cc:888 if you: - #if 0 + #if 1 for me, there's the following problem: > > If I start dillo as a small window, then hide the panel (using the old > > ctrl-find binding), then maximize the window, then unhide the panel with > > the same trick, I get a control panel slightly higher than what I started > > with. this happens to me with GNU/Linux and fltk2-r5975. but... On Sun, Nov 18, 2007 at 01:26:09PM +0000, place wrote: > > What FLTK2 version are you using? > > fltk-2.0.x-r5941 > > > > > If I undertood right, this doesn't happen to you. > > right. Does it happen to anyone else? -- Cheers Jorge.-

3 6

[patch] make partial redraw requests work
by Johannes.Hofmann＠gmx.de Nov. 21, 2007

Nov. 21, 2007

Hi, this patch adds set(), isEmpty(), and merge() methods to core::Rectangle. These methods are then used to maintain a rectangle that contains all screen areas for which a redraw was requested. When fltk really draws to the screen, the drawing is limited to this area. The most obvious improvement is visible on pages with very large images that take some time to load. While the image is loaded the rest of the page is no longer flickering - at least if there is no other stuff that requests complete redraws. Johannes diff --git a/dw/fltkviewbase.cc b/dw/fltkviewbase.cc --- a/dw/fltkviewbase.cc +++ b/dw/fltkviewbase.cc @@ -42,6 +42,7 @@ FltkViewBase::FltkViewBase (int x, int y canvasWidth = 1; canvasHeight = 1; bgColor = WHITE; + redrawArea.set (0, 0, 0, 0); } FltkViewBase::~FltkViewBase () @@ -50,9 +51,18 @@ FltkViewBase::~FltkViewBase () void FltkViewBase::draw () { - Group::draw (); + int d = damage(); + ::fltk::Rectangle rect (x(), y(), w(), h()); - ::fltk::Rectangle rect (x(), y(), w(), h()); + //Group::draw (); + + if (d == DAMAGE_VALUE) { + ::fltk::push_clip( + translateCanvasXToViewX(redrawArea.x), + translateCanvasYToViewY(redrawArea.y), + redrawArea.width, + redrawArea.height); + } /* fltk-clipping seems not to use widget coordinates */ ::fltk::intersect_with_clip(rect); @@ -68,6 +78,12 @@ void FltkViewBase::draw () area.width = rect.w(); area.height = rect.h(); theLayout->expose (this, &area); + + if (d == DAMAGE_VALUE) { + ::fltk::pop_clip(); + } + + redrawArea.set (0, 0, 0, 0); } core::ButtonState getDwButtonState () @@ -223,9 +239,9 @@ void FltkViewBase::finishDrawing (core:: void FltkViewBase::queueDraw (core::Rectangle *area) { - /** \bug Inefficient */ + redrawArea.merge (area); - redraw (DAMAGE_EXPOSE); + redraw (DAMAGE_VALUE); } void FltkViewBase::queueDrawTotal () diff --git a/dw/fltkviewbase.hh b/dw/fltkviewbase.hh --- a/dw/fltkviewbase.hh +++ b/dw/fltkviewbase.hh @@ -14,6 +14,7 @@ class FltkViewBase: public FltkView, pub { private: int bgColor; + core::Rectangle redrawArea; protected: core::Layout *theLayout; diff --git a/dw/types.cc b/dw/types.cc --- a/dw/types.cc +++ b/dw/types.cc @@ -27,10 +27,7 @@ namespace core { Rectangle::Rectangle (int x, int y, int width, int height) { - this->x = x; - this->y = y; - this->width = width; - this->height = height; + set (x, y, width, height); } /** @@ -111,6 +108,35 @@ bool Rectangle::isPointWithin (int x, in x >= this->x && y >= this->y && x < this->x + width && y < this->y + height; } + +/** + * \brief Enlarge the rectangle so that it also includes otherRect. + * If a rectangle has zero size, it is ignored. + */ +void Rectangle::merge (Rectangle *otherRect) +{ + if (otherRect->isEmpty()) { + return; + } + + if (isEmpty()) { + x = otherRect->x; + y = otherRect->y; + width = otherRect->width; + height = otherRect->height; + return; + } + + width = ::misc::max(x + width, otherRect->x + otherRect->width); + height = ::misc::max(y + height, otherRect->y + otherRect->height); + + x = ::misc::min(x, otherRect->x); + y = ::misc::min(y, otherRect->y); + + width -= x; + height -= y; +} + // ---------------------------------------------------------------------- diff --git a/dw/types.hh b/dw/types.hh --- a/dw/types.hh +++ b/dw/types.hh @@ -68,9 +68,18 @@ public: inline Rectangle () { } Rectangle (int x, int y, int width, int height); + void set (int x, int y, int w, int h) { + this->x = x; + this->y = y; + this->width = w; + this->height = h; + } + bool intersectsWith (Rectangle *otherRect, Rectangle *dest); + void merge (Rectangle *otherRect); bool isSubsetOf (Rectangle *otherRect); bool isPointWithin (int x, int y); + bool isEmpty() {return width == 0 && height == 0;}; }; /**

3 8

Re: patch: images: working menu, deferred loading; page menu works
by jcid＠dillo.org Nov. 21, 2007

Nov. 21, 2007

Hi, On Mon, Oct 29, 2007 at 11:18:21PM +0000, place wrote: > (I could have sworn that I sent you a patch making the page menu work, > but since I didn't realize that it wasn't in the main tree until I > was preparing this patch, it's included here. I'll likely end > up separating it out as we go through the process of refining the rest > of this patch...) > > This has an extra argument in the link signals, as you recommended, > instead of the array of image handlers that my previous version used. > > I had to add an x_img to style. > > The link block stores the Image and the url until loading is requested. Great! I made an extensive revision of the patch and commited it with some minor changes (attached so you can review and sync more easily). Urbi et orbi, this patch set more or less is: - Added code for the image menu and hooked it to dw2 signals. - Hooked the page and link menus. - Added code for optional image loading (nice interface) very advanced! - Fixed the position of the Bug Meter popup menu. - Added an extra argument in the link signals - Aded an x_img camp to style (an image array index, like x_link). > Although there's no placeholder, if there's anything to click on, left click > loads instances of that image and middle click loads all images on the page. > The latter should probably be in the page menu instead. The patch is very advanced and here go my comments: Yes, a place holder is the next step (sometimes image size is provided as attributes in the IMG element, some others not; in which case we can use a standard size). Note that with the current patch, images that are also links are not working (i.e. clicking on them loads the image but doesn't follow the link). I understand that left-clicking to load an image is quite handy. Now, FLTK2 has a nice feature with popups and it's that they can remember a menuitem position. If we make the right click popup remember the "load image" item, the same easeness of user interface may be attained (you may look in the test/menu program inside fltk2 sources). I also agree that "load all images" naturally belongs to the page menu. BTW, with regard to the toggle button, in the past I thought of a toolbox icon with a popup holding things like: "Load images" // toggle item "Force my colors" // toggle item "Restrict width" // toggle item ... It looks lilke a good idea to me, but I don't know whether in practice this is as convenient as it looks. Comments welcomed. -- Cheers Jorge.-

3 6

Scrolling patch!
by bogus＠does.not.exist.com Nov. 21, 2007

Nov. 21, 2007

Hi there, Here's a patch I wanted to add since a long time. Remembering the scroll position in a page. At least for me, it improves web browsing a lot! The dw2 part of the patch is attached to this email, so Sebastian can look at a minor change that looks like a fix for a hidden bug in the code... The patch is complete in CVS. -- Cheers Jorge.-

4 7