- Dillo-dev - lists.mailman3.com

[patch] segfault when closing window while it is loading

by jcid＠dillo.org

On Tue, Jan 01, 2008 at 12:44:55PM +0100, Johannes Hofmann wrote: > Happy new year! 8-) > Below is a small patch to fix a crash that happens when I open > a new window (e.g. with the middle mouse button) and close it > immediately while it is still loading the page. > > Johannes > > --- a/src/uicmd.cc Mon Dec 31 22:49:02 2007 +0100 > +++ b/src/uicmd.cc Tue Jan 01 12:38:14 2008 +0100 > @@ -125,6 +125,7 @@ void a_UIcmd_close_bw(void *vbw) > Layout *layout = (Layout*)bw->render_layout; > > MSG("a_UIcmd_close_bw\n"); > + a_Bw_stop_clients(bw, BW_Root + BW_Img + Bw_Force); > ui->destroy(); > delete(layout); > a_Bw_free(bw); It looks OK, but I can't make mine crash... Do you have an example URL? -- Cheers Jorge.-

Jan. 2, 2008

hook up the limit_text_width pref

by jcid＠dillo.org

On Tue, Jan 01, 2008 at 02:41:48AM +0000, place wrote: > I'm not sure under what circumstances this pref. actually changes anything, > but here it is anyway. Committed. > (I didn't notice a difference when I enabled it in my old dillo either...) I'm also not sure of the internal state of this feature... -- Cheers Jorge.-

Jan. 2, 2008

patch: start_page and fullwindow_start prefs

by jcid＠dillo.org

Committed. -- Cheers Jorge.-

Jan. 2, 2008

patch: the position part of the geometry pref.

by jcid＠dillo.org

On Wed, Jan 02, 2008 at 02:55:14AM +0000, place wrote: > (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. Committed. -- Cheers Jorge.-

Jan. 2, 2008

[PATCH] image load graphics improvements

by jcid＠dillo.org

On Tue, Jan 01, 2008 at 05:08:38PM +0000, Jeremy Henty wrote: > > 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/ . Committed. -- Cheers Jorge.-

Jan. 2, 2008

[PATCH] initialise Layout::scrollIdleNotInterrupted

by jcid＠dillo.org

On Tue, Jan 01, 2008 at 02:10:54PM +0000, Jeremy Henty wrote: > > 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". Committed. -- Cheers Jorge.-

Jan. 2, 2008

Re: "de-exporting" prefs stuff

by jcid＠dillo.org

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.-

Jan. 2, 2008

patch: color shading

by jcid＠dillo.org

On Sun, Dec 30, 2007 at 05:37:14AM +0000, place wrote: > This should make shading better... > Committed. BTW, would you mind looking at this case? <table border=90> <tr> <td>1 2 3 4 <td>5 6 7 8 9 10 <td>A <tr> <td colspan="2" bgcolor=teal>cs=2 <td>B </table> It may use a bevel like firefox. On to another topic: Have you kept on working on the code to suport charset decoding when specified in the HEAD section? -- Cheers Jorge.-

Jan. 2, 2008

[patch] fix hanging stop button

by jcid＠dillo.org

On Sat, Dec 29, 2007 at 10:37:30AM +0100, Johannes Hofmann wrote: > 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. Committed. -- Cheers Jorge.-

Jan. 2, 2008

patch: start_page and fullwindow_start prefs

by place＠gobigwest.com

Jan. 2, 2008

patch: the position part of the geometry pref.

by place＠gobigwest.com

(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.

Jan. 2, 2008

[patch] make TopGroup a PackedGroup

by jcid＠dillo.org

On Tue, Jan 01, 2008 at 04:41:49PM +0100, Johannes Hofmann wrote: > Hi Jorge, > > On Tue, Jan 01, 2008 at 11:26:59AM -0300, Jorge Arellano Cid wrote: > > Hi Johannes, > > > > On Fri, Dec 28, 2007 at 05:26:19PM +0100, Johannes Hofmann wrote: > > > 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. > > > > Reviewing the patch made me remember the struggle I had, to > > develop those workarounds to have the UI working. As you may > > intuit I'm more than willing to commit. ;-) > > > > The question is: Do you agree with commiting now or do you > > prefer to hold them for comment as the former patch? > > I think it can be commited, as this new patch does not include the > reorganization of my initial patch that makes the scrollbars part of > the UI and thereby obsoletes all the ScrollbarThickness stuff in dw. Committed! -- Cheers Jorge.-

Jan. 2, 2008

[PATCH] image load graphics improvements

by onepoint＠starurchin.org

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

Jan. 1, 2008

Best wishes for this year 2008

by onepoint＠starurchin.org

On Tue, Jan 01, 2008 at 10:38:17AM -0300, Jorge Arellano Cid wrote: > 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. Likewise I am grateful to you for opening up Dillo development so that we can contribute! > The working atmosphere is very nice and that's a very important > asset! I agree. I have been very encouraged by the good-natured and constructive responses my suggestions have received. I hope everyone else feels the same. Regards, Jeremy Henty

Jan. 1, 2008

[patch] make TopGroup a PackedGroup

by Johannes.Hofmann＠gmx.de

Hi Jorge, On Tue, Jan 01, 2008 at 11:26:59AM -0300, Jorge Arellano Cid wrote: > Hi Johannes, > > On Fri, Dec 28, 2007 at 05:26:19PM +0100, Johannes Hofmann wrote: > > 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. > > Reviewing the patch made me remember the struggle I had, to > develop those workarounds to have the UI working. As you may > intuit I'm more than willing to commit. ;-) > > The question is: Do you agree with commiting now or do you > prefer to hold them for comment as the former patch? I think it can be commited, as this new patch does not include the reorganization of my initial patch that makes the scrollbars part of the UI and thereby obsoletes all the ScrollbarThickness stuff in dw. Cheers, Johannes > > -- > Cheers > Jorge.- > > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)dillo.org > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

Jan. 1, 2008

[patch] make TopGroup a PackedGroup

by jcid＠dillo.org

Hi Johannes, On Fri, Dec 28, 2007 at 05:26:19PM +0100, Johannes Hofmann wrote: > 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. Reviewing the patch made me remember the struggle I had, to develop those workarounds to have the UI working. As you may intuit I'm more than willing to commit. ;-) The question is: Do you agree with commiting now or do you prefer to hold them for comment as the former patch? -- Cheers Jorge.-

Jan. 1, 2008

[PATCH] initialise Layout::scrollIdleNotInterrupted

by onepoint＠starurchin.org

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

Jan. 1, 2008

Best wishes for this year 2008

by jcid＠dillo.org

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.-

Jan. 1, 2008

[patch] segfault when closing window while it is loading

by Johannes.Hofmann＠gmx.de

Happy new year! Below is a small patch to fix a crash that happens when I open a new window (e.g. with the middle mouse button) and close it immediately while it is still loading the page. Johannes --- a/src/uicmd.cc Mon Dec 31 22:49:02 2007 +0100 +++ b/src/uicmd.cc Tue Jan 01 12:38:14 2008 +0100 @@ -125,6 +125,7 @@ void a_UIcmd_close_bw(void *vbw) Layout *layout = (Layout*)bw->render_layout; MSG("a_UIcmd_close_bw\n"); + a_Bw_stop_clients(bw, BW_Root + BW_Img + Bw_Force); ui->destroy(); delete(layout); a_Bw_free(bw);

Jan. 1, 2008

hook up the limit_text_width pref

by place＠gobigwest.com

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

Jan. 1, 2008

[PATCH] SELECT form controls

by jcid＠dillo.org

On Sun, Dec 30, 2007 at 07:52:35AM +0000, Jeremy Henty wrote: > > This patch adds (partial) support for SELECT controls in forms. Good work Jeremy, committed! I was also eager to have this working. :-) > 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. A more detailed comment probably next year. I just wanted to commit this cookie!. -- Cheers Jorge.-

Dec. 31, 2007

Re: patch: here are some consts for pixmaps.h

by jcid＠dillo.org

Committed. -- Cheers Jorge.-

Dec. 31, 2007

Re: patch: removing extraneous header inclusion

by jcid＠dillo.org

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.-

Dec. 31, 2007

Re: patch: here are a few more statics for dpi

by jcid＠dillo.org

Committed. -- Cheers Jorge.-

Dec. 31, 2007

[PATCH] SELECT form controls

by onepoint＠starurchin.org

On Sun, Dec 30, 2007 at 08:33:44PM +0000, place wrote: > Jeremy wrote: > > What happens if you > > confine the scope of those variables by putting the body of the case > > clause inside {...} ? Does the compiler still complain? > > That works. OK, that confirms it's an issue with the scope of those variables, though like you I'm surprised that the compiler complains when you don't even use them. Regards, Jeremy Henty

Dec. 31, 2007

[PATCH] SELECT form controls

by Johannes.Hofmann＠gmx.de

Hi Jeremy, works like a charm so far. Now one can edit bookmarks again! Thanks for your work on this, Johannes On Sun, Dec 30, 2007 at 07:52:35AM +0000, Jeremy Henty wrote: > > 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 > diff -pru -- dillo2-ref/src/html.cc dillo2-cur/src/html.cc > --- dillo2-ref/src/html.cc 2007-12-28 21:02:20.000000000 +0000 > +++ dillo2-cur/src/html.cc 2007-12-30 06:13:14.000000000 +0000 > @@ -90,9 +90,9 @@ typedef struct _DilloLinkImage DilloLi > typedef struct _DilloHtmlClass DilloHtmlClass; > typedef struct _DilloHtmlState DilloHtmlState; > typedef struct _DilloHtmlForm DilloHtmlForm; > -typedef struct _DilloHtmlOption DilloHtmlOption; > -typedef struct _DilloHtmlSelect DilloHtmlSelect; > typedef struct _DilloHtmlInput DilloHtmlInput; > +typedef struct _DilloHtmlSelect DilloHtmlSelect; > +typedef struct _DilloHtmlOption DilloHtmlOption; > > typedef enum { > DT_NONE, > @@ -175,10 +175,11 @@ typedef enum { > IN_BODY = 1 << 2, > IN_FORM = 1 << 3, > IN_SELECT = 1 << 4, > - IN_TEXTAREA = 1 << 5, > - IN_MAP = 1 << 6, > - IN_PRE = 1 << 7, > - IN_BUTTON = 1 << 8 > + IN_OPTION = 1 << 5, > + IN_TEXTAREA = 1 << 6, > + IN_MAP = 1 << 7, > + IN_PRE = 1 << 8, > + IN_BUTTON = 1 << 9, > } DilloHtmlProcessingState; > > /*----------------------------------------------------------------------------- > @@ -231,18 +232,12 @@ struct _DilloHtmlForm { > }; > > struct _DilloHtmlOption { > - //GtkWidget *menuitem; > - char *value; > - bool_t init_val; > + char *value, *content; > + bool selected, enabled; > }; > > struct _DilloHtmlSelect { > - //GtkWidget *menu; > - int size; > - > - DilloHtmlOption *options; > - int num_options; > - int num_options_max; > + misc::SimpleVector<DilloHtmlOption *> *options; > }; > > struct _DilloHtmlInput { > @@ -858,31 +853,33 @@ void DilloHtml::initDw() > */ > DilloHtml::~DilloHtml() > { > - int i, j, k; > - DilloHtmlForm *form; > - DilloHtmlInput *input_j; > - > _MSG("::~DilloHtml(this=%p)\n", this); > > a_Bw_remove_doc(bw, this); > > a_Url_free(base_url); > > - for (i = 0; i < forms->size(); i++) { > - form = forms->getRef(i); > + for (int i = 0; i < forms->size(); i++) { > + DilloHtmlForm *form = forms->getRef(i); > a_Url_free(form->action); > - for (j = 0; j < form->inputs->size(); j++) { > - input_j = form->inputs->getRef(j); > - dFree(input_j->name); > - dFree(input_j->init_str); > - > - if (input_j->type == DILLO_HTML_INPUT_SELECT || > - input_j->type == DILLO_HTML_INPUT_SEL_LIST) { > - for (k = 0; k < input_j->select->num_options; k++) { > - dFree(input_j->select->options[k].value); > + for (int j = 0; j < form->inputs->size(); j++) { > + DilloHtmlInput *input = form->inputs->getRef(j); > + dFree(input->name); > + dFree(input->init_str); > + > + if (input->type == DILLO_HTML_INPUT_SELECT || > + input->type == DILLO_HTML_INPUT_SEL_LIST) { > + > + int size = input->select->options->size (); > + for (int k = 0; k < size; k++) { > + DilloHtmlOption *option = > + input->select->options->get (k); > + dFree(option->value); > + dFree(option->content); > + delete(option); > } > - dFree(input_j->select->options); > - dFree(input_j->select); > + delete(input->select->options); > + delete(input->select); > } > } > delete(form->inputs); > @@ -890,12 +887,12 @@ DilloHtml::~DilloHtml() > } > delete(forms); > > - for (i = 0; i < links->size(); i++) > + for (int i = 0; i < links->size(); i++) > if (links->get(i)) > a_Url_free(links->get(i)); > delete (links); > > - for (i = 0; i < images->size(); i++) { > + for (int i = 0; i < images->size(); i++) { > DilloLinkImage *li = images->get(i); > a_Url_free(li->url); > if (li->image) > @@ -3435,6 +3432,9 @@ static void Html_tag_open_form(DilloHtml > return; > } > html->InFlags |= IN_FORM; > + html->InFlags &= ~IN_SELECT; > + html->InFlags &= ~IN_OPTION; > + html->InFlags &= ~IN_TEXTAREA; > > method = DILLO_HTML_METHOD_GET; > if ((attrbuf = Html_get_attr(html, tag, tagsize, "method"))) { > @@ -3491,9 +3491,12 @@ static void Html_tag_close_form(DilloHtm > // } > // } > } > + > html->InFlags &= ~IN_FORM; > html->InFlags &= ~IN_SELECT; > + html->InFlags &= ~IN_OPTION; > html->InFlags &= ~IN_TEXTAREA; > + > Html_pop_tag(html, TagIdx); > } > > @@ -3601,20 +3604,20 @@ static void Html_reset_input(DilloHtmlIn > /* this is in reverse order so that, in case more than one was > * selected, we get the last one, which is consistent with handling > * of multiple selected options in the layout code. */ > - for (i = input->select->num_options - 1; i >= 0; i--) { > - if (input->select->options[i].init_val) { > +// for (i = input->select->num_options - 1; i >= 0; i--) { > +// if (input->select->options[i].init_val) { > // gtk_menu_item_activate(GTK_MENU_ITEM > // (input->select->options[i].menuitem)); > // Html_select_set_history(input); > - break; > - } > - } > +// break; > +// } > +// } > } > break; > case DILLO_HTML_INPUT_SEL_LIST: > if (!input->select) > break; > - for (i = 0; i < input->select->num_options; i++) { > +// for (i = 0; i < input->select->num_options; i++) { > // if (input->select->options[i].init_val) { > // if (input->select->options[i].menuitem->state == GTK_STATE_NORMAL) > // gtk_list_select_child(GTK_LIST(input->select->menu), > @@ -3624,7 +3627,7 @@ static void Html_reset_input(DilloHtmlIn > // gtk_list_unselect_child(GTK_LIST(input->select->menu), > // input->select->options[i].menuitem); > // } > - } > +// } > break; > case DILLO_HTML_INPUT_TEXTAREA: > if (input->init_str != NULL) { > @@ -3805,25 +3808,19 @@ static void Html_submit_form2(DilloHtml > case DILLO_HTML_INPUT_HIDDEN: > Html_append_input(DataStr, input->name, input->init_str); > break; > -// case DILLO_HTML_INPUT_SELECT: > -// for (i = 0; i < input->select->num_options; i++) { > -// if (GTK_CHECK_MENU_ITEM(input->select->options[i].menuitem)-> > -// active) { > -// Html_append_input(DataStr, input->name, > -// input->select->options[i].value); > -// break; > -// } > -// } > -// break; > -// case DILLO_HTML_INPUT_SEL_LIST: > -// for (i = 0; i < input->select->num_options; i++) { > -// if (input->select->options[i].menuitem->state == > -// GTK_STATE_SELECTED) { > -// Html_append_input(DataStr, input->name, > -// input->select->options[i].value); > -// } > -// } > -// break; > + case DILLO_HTML_INPUT_SELECT: > + case DILLO_HTML_INPUT_SEL_LIST: > + SelectionResource *sel_res = > + (SelectionResource*)((Embed*)input->widget)->getResource(); > + int size = input->select->options->size (); > + for (int i = 0; i < size; i++) { > + if (sel_res->isSelected(i)) { > + DilloHtmlOption *option = > + input->select->options->get (i); > + Html_append_input(DataStr, input->name, option->value); > + } > + } > + break; > // case DILLO_HTML_INPUT_INDEX: > // Html_urlencode_append(DataStr, > // gtk_entry_get_text(GTK_ENTRY(input->widget))); > @@ -4212,7 +4209,8 @@ static void Html_tag_close_textarea(Dill > Widget *widget; > int i; > > - if (html->InFlags & IN_FORM && html->InFlags & IN_TEXTAREA) { > + if (html->InFlags & IN_FORM && > + html->InFlags & IN_TEXTAREA) { > /* Remove the line ending that follows the opening tag */ > if (html->Stash->str[0] == '\r') > dStr_erase(html->Stash, 0, 1); > @@ -4339,28 +4337,29 @@ static void Html_tag_open_textarea(Dillo > /* The select tag is quite tricky, because of gorpy html syntax. */ > static void Html_tag_open_select(DilloHtml *html, const char *tag, int tagsize) > { > -// DilloHtmlForm *form; > -// DilloHtmlSelect *Select; > -// GtkWidget *widget, *menu; > -// char *name; > // const char *attrbuf; > // int size, type, multi; > -// > -// if (!(html->InFlags & IN_FORM)) { > -// MSG_HTML("<select> outside <form>\n"); > -// return; > -// } > -// if (html->InFlags & IN_SELECT) { > -// MSG_HTML("nested <select>\n"); > -// return; > -// } > -// html->InFlags |= IN_SELECT; > -// > -// > -// form = forms->getRef (forms->size() - 1); > -// > -// name = Html_get_attr_wdef(html, tag, tagsize, "name", NULL); > -// > + > + if (!(html->InFlags & IN_FORM)) { > + MSG_HTML("<select> outside <form>\n"); > + return; > + } > + if (html->InFlags & IN_SELECT) { > + MSG_HTML("nested <select>\n"); > + return; > + } > + html->InFlags |= IN_SELECT; > + html->InFlags &= ~IN_OPTION; > + > + DilloHtmlForm *form = html->forms->getRef (html->forms->size() - 1); > + char *name = Html_get_attr_wdef(html, tag, tagsize, "name", NULL); > + OptionMenuResource *res = > + HT2LT(html)->getResourceFactory()->createOptionMenuResource (); > + Widget *widget; > + Embed *embed; > + widget = embed = new Embed(res); > + DW2TB(html->dw)->addWidget (embed, S_TOP(html)->style); > + > // size = 0; > // if ((attrbuf = Html_get_attr(html, tag, tagsize, "size"))) > // size = strtol(attrbuf, NULL, 10); > @@ -4380,17 +4379,13 @@ static void Html_tag_open_select(DilloHt > // gtk_list_set_selection_mode(GTK_LIST(menu), GTK_SELECTION_MULTIPLE); > // type = DILLO_HTML_INPUT_SEL_LIST; > // } > -// > -// Select = dNew(DilloHtmlSelect, 1); > -// Select->menu = menu; > -// Select->size = size; > -// Select->num_options = 0; > -// Select->num_options_max = 8; > -// Select->options = dNew(DilloHtmlOption, Select->num_options_max); > -// > -// Html_add_input(form, type, widget, name, NULL, Select, FALSE); > -// Html_stash_init(html); > -// dFree(name); > + > + DilloHtmlSelect *select = new DilloHtmlSelect; > + select->options = new misc::SimpleVector<DilloHtmlOption *> (4); > + Html_add_input(form, DILLO_HTML_INPUT_SELECT, widget, embed, name, > + NULL, select, false); > + Html_stash_init(html); > + dFree(name); > } > > /* > @@ -4398,47 +4393,19 @@ static void Html_tag_open_select(DilloHt > */ > static void Html_option_finish(DilloHtml *html) > { > -// DilloHtmlForm *form; > -// DilloHtmlInput *input; > -// GtkWidget *menuitem; > -// GSList *group; > -// DilloHtmlSelect *select; > -// > -// if (!(html->InFlags & IN_FORM)) > -// return; > -// > -// form = html->forms->getRef (html->forms->size() - 1); > -// input = form->inputs->getRef (form->inputs->size() - 1); > -// if (input->select->num_options <= 0) > -// return; > -// > -// select = input->select; > -// if (input->type == DILLO_HTML_INPUT_SELECT ) { > -// if (select->num_options == 1) > -// group = NULL; > -// else > -// group = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM > -// (select->options[0].menuitem)); > -// menuitem = gtk_radio_menu_item_new_with_label(group, html->Stash->str); > -// select->options[select->num_options - 1].menuitem = menuitem; > -// if (select->options[select->num_options - 1].value == NULL) > -// select->options[select->num_options - 1].value = > -// dStrdup(html->Stash->str); > -// gtk_menu_append(GTK_MENU(select->menu), menuitem); > -// if (select->options[select->num_options - 1].init_val) > -// gtk_menu_item_activate(GTK_MENU_ITEM(menuitem)); > -// gtk_widget_show(menuitem); > -// } else if (input->type == DILLO_HTML_INPUT_SEL_LIST) { > -// menuitem = gtk_list_item_new_with_label(html->Stash->str); > -// select->options[select->num_options - 1].menuitem = menuitem; > -// if (select->options[select->num_options - 1].value == NULL) > -// select->options[select->num_options - 1].value = > -// dStrdup(html->Stash->str); > -// gtk_container_add(GTK_CONTAINER(select->menu), menuitem); > -// if (select->options[select->num_options - 1].init_val) > -// gtk_list_select_child(GTK_LIST(select->menu), menuitem); > -// gtk_widget_show(menuitem); > -// } > + DilloHtmlForm *form = > + html->forms->getRef (html->forms->size() - 1); > + DilloHtmlInput *input = > + form->inputs->getRef (form->inputs->size() - 1); > + if (input->type == DILLO_HTML_INPUT_SELECT || > + input->type == DILLO_HTML_INPUT_SEL_LIST) { > + DilloHtmlSelect *select = > + input->select; > + DilloHtmlOption *option = > + select->options->get (select->options->size() - 1); > + option->content = > + Html_parse_entities(html, html->Stash->str, html->Stash->len); > + } > } > > /* > @@ -4446,28 +4413,36 @@ static void Html_option_finish(DilloHtml > */ > static void Html_tag_open_option(DilloHtml *html, const char *tag, int tagsize) > { > -// DilloHtmlForm *form; > -// DilloHtmlInput *input; > -// int no; > -// > -// if (!(html->InFlags & IN_SELECT)) > -// return; > -// > -// form = forms->getRef (forms->size() - 1); > -// input = form->inputs->getRef (form->inputs->size() - 1); > -// if (input->type == DILLO_HTML_INPUT_SELECT || > -// input->type == DILLO_HTML_INPUT_SEL_LIST) { > -// Html_option_finish(html); > -// no = input->select->num_options; > -// a_List_add(input->select->options, no, input->select->num_options_max); > -// input->select->options[no].menuitem = NULL; > -// input->select->options[no].value = Html_get_attr_wdef(html, tag, tagsize, > -// "value", NULL); > -// input->select->options[no].init_val = > -// (Html_get_attr(html, tag, tagsize, "selected") != NULL); > -// input->select->num_options++; > -// } > -// Html_stash_init(html); > + if (!(html->InFlags & IN_FORM && > + html->InFlags & IN_SELECT )) > + return; > + if (html->InFlags & IN_OPTION) > + Html_option_finish(html); > + html->InFlags |= IN_OPTION; > + > + DilloHtmlForm *form = > + html->forms->getRef (html->forms->size() - 1); > + DilloHtmlInput *input = > + form->inputs->getRef (form->inputs->size() - 1); > + > + if (input->type == DILLO_HTML_INPUT_SELECT || > + input->type == DILLO_HTML_INPUT_SEL_LIST) { > + > + DilloHtmlOption *option = new DilloHtmlOption; > + option->value = > + Html_get_attr_wdef(html, tag, tagsize, "value", NULL); > + option->content = NULL; > + option->selected = > + (Html_get_attr(html, tag, tagsize, "selected") != NULL); > + option->enabled = > + (Html_get_attr(html, tag, tagsize, "disabled") == NULL); > + > + int size = input->select->options->size (); > + input->select->options->increase (); > + input->select->options->set (size, option); > + } > + > + Html_stash_init(html); > } > > /* > @@ -4475,71 +4450,49 @@ static void Html_tag_open_option(DilloHt > */ > static void Html_tag_close_select(DilloHtml *html, int TagIdx) > { > -// // AL > -// DilloHtmlForm *form; > -// DilloHtmlInput *input; > -// GtkWidget *scrolledwindow; > -// Widget *embed_gtk; > -// GtkRequisition req; > -// int height; > -// > -// if (html->InFlags & IN_SELECT) { > -// html->InFlags &= ~IN_SELECT; > -// > -// form = forms->getRef (forms->size() - 1); > -// input = form->inputs->getRef (form->inputs->size() - 1); > -// if (input->type == DILLO_HTML_INPUT_SELECT) { > -// Html_option_finish(html); > -// > -// gtk_option_menu_set_menu(GTK_OPTION_MENU(input->widget), > -// input->select->menu); > -// Html_select_set_history(input); > -// > -// // gtk_option_menu_set_history(GTK_OPTION_MENU(input->widget), 1); > -// > -// gtk_widget_show(input->widget); > -// > -// embed_gtk = a_Dw_embed_gtk_new (); > -// a_Dw_embed_gtk_add_gtk (DW_EMBED_GTK (embed_gtk), input->widget); > -// DW2TB(html->dw)->addWidget (embed_gtk, > -// S_TOP(html)->style); > -// } else if (input->type == DILLO_HTML_INPUT_SEL_LIST) { > -// Html_option_finish(html); > -// > -// if (input->select->size < input->select->num_options) { > -// scrolledwindow = gtk_scrolled_window_new(NULL, NULL); > -// gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow), > -// GTK_POLICY_NEVER, > -// GTK_POLICY_AUTOMATIC); > -// gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW > -// (scrolledwindow), > -// input->widget); > -// > -// gtk_container_set_focus_vadjustment > -// (GTK_CONTAINER (input->widget), > -// gtk_scrolled_window_get_vadjustment > -// (GTK_SCROLLED_WINDOW(scrolledwindow))); > -// > -// /* Calculate the height of the scrolled window */ > -// gtk_widget_size_request(input->select->options[0].menuitem, &req); > -// height = input->select->size * req.height + > -// 2 * scrolledwindow->style->klass->ythickness; > -// gtk_widget_set_usize(scrolledwindow, -1, height); > -// > -// gtk_widget_show(input->widget); > -// input->widget = scrolledwindow; > -// } > -// gtk_widget_show(input->widget); > -// > -// /* note: In this next call, scrolledwindows get a warning from > -// * gdkwindow.c:422. I'm not really going to sweat it now - the > -// * embedded widget stuff is going to get massively redone anyway. */ > -// embed_gtk = a_Dw_embed_gtk_new (); > -// a_Dw_embed_gtk_add_gtk (DW_EMBED_GTK (embed_gtk), input->widget); > -// DW2TB(html->dw)->addWidget (embed_gtk, > -// S_TOP(html)->style); > -// } > -// } > + if (html->InFlags & IN_FORM && > + html->InFlags & IN_SELECT) { > + if (html->InFlags & IN_OPTION) > + Html_option_finish(html); > + html->InFlags &= ~IN_SELECT; > + html->InFlags &= ~IN_OPTION; > + > + DilloHtmlForm *form = > + html->forms->getRef (html->forms->size() - 1); > + DilloHtmlInput *input = > + form->inputs->getRef (form->inputs->size() - 1); > + SelectionResource *res = > + (SelectionResource*)((Embed*)input->widget)->getResource(); > + > + int size = input->select->options->size (); > + if (size > 0) { > + // is anything selected? > + bool some_selected = false; > + for (int i = 0; i < size; i++) { > + DilloHtmlOption *option = > + input->select->options->get (i); > + if (option->selected) { > + some_selected = true; > + break; > + } > + } > + > + // select the first if nothing else is selected > + // BUG(?): should not do this for MULTI selections > + if (! some_selected) > + input->select->options->get (0)->selected = true; > + > + // add the items to the resource > + for (int i = 0; i < size; i++) { > + DilloHtmlOption *option = > + input->select->options->get (i); > + bool enabled = option->enabled; > + bool selected = option->selected; > + res->addItem(option->content,enabled,selected); > + } > + } > + } > + > Html_pop_tag(html, TagIdx); > } > > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)dillo.org > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

Dec. 31, 2007

[PATCH] SELECT form controls

by place＠gobigwest.com

Jeremy wrote: > I guess it's one of the things gcc 4.x is more picky about. Yeah, I had to go to 4.x after Jorge reported a bunch of sign warnings in my decoding stuff... > Perhaps the problem is that the variables sel_res and size remain in > scope in subsequent cases of the switch, yet if those cases are > executed then the variables won't be initialised. If it can tell in the new version that the variables aren't being used in subsequent cases, then I'd expect it to be able to able to tell in the old version. > What happens if you > confine the scope of those variables by putting the body of the case > clause inside {...} ? Does the compiler still complain? That works.

Dec. 30, 2007

[PATCH] SELECT form controls

by onepoint＠starurchin.org

On Sun, Dec 30, 2007 at 05:05:23PM +0000, place wrote: > I get some errors like > > html.cc:3832: error: jump to case label > html.cc:3808: error: crosses initialization of 'int size' > html.cc:3806: error: crosses initialization of 'dw::core::ui::SelectionResource* sel_res > > The compiler is happy after I separate it out as > > SelectionResource *sel_res; > int size; > sel_res =(SelectionResource*)((Embed*)input->widget)->getResource(); > size = input->select->options->size (); Thanks for the report. I've attached an updated patch as you suggest. There's no problem with the original code under gcc 3.4.3 . I guess it's one of the things gcc 4.x is more picky about. > I have no idea why that matters to the compiler. Perhaps the problem is that the variables sel_res and size remain in scope in subsequent cases of the switch, yet if those cases are executed then the variables won't be initialised. What happens if you confine the scope of those variables by putting the body of the case clause inside {...} ? Does the compiler still complain? > SELECT is a milestone because it means I will no longer have any > reason to run 0.8.x! Same here, that's why I was keen to implement it. Regards, Jeremy Henty

Dec. 30, 2007

[PATCH] SELECT form controls

by place＠gobigwest.com

I get some errors like html.cc:3832: error: jump to case label html.cc:3808: error: crosses initialization of 'int size' html.cc:3806: error: crosses initialization of 'dw::core::ui::SelectionResource* sel_res The compiler is happy after I separate it out as SelectionResource *sel_res; int size; sel_res =(SelectionResource*)((Embed*)input->widget)->getResource(); size = input->select->options->size (); however. Weird. I have no idea why that matters to the compiler. (g++ -v: gcc version 4.1.2) SELECT is a milestone because it means I will no longer have any reason to run 0.8.x! ---- Free trivia for anybody reading to the bottom of this msg: I finally noticed that file: directory listings have a '%' toggle that you can click to switch from the default format to a good format.

Dec. 30, 2007

[PATCH] SELECT form controls

by onepoint＠starurchin.org

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

Dec. 30, 2007

patch: color shading

by place＠gobigwest.com

This should make shading better...

Dec. 30, 2007

[patch] make TopGroup a PackedGroup

by place＠gobigwest.com

Johannes wrote: > On Sat, Dec 29, 2007 at 07:00:05AM +0000, place wrote: > > Johannes wrote: > > > just noticed that child widgets where not redrawn properly with my > > > patch. Attached is a fixed version against current cvs. > > > > If I switch to another screen and come back, the scrollbars aren't drawn. > > The viewport has damage 0xc0, and ?scrollbar->damage() is 0. > > Ah yes, the widget specific damage is only set in the DAMAGE_CHILD > case. Please try the patch below. This drawing stuff is really > fragile. It's not much code though (FltkViewport::draw () and > FltkViewBase::draw ()). Seems to be working well now. Thanks...

Dec. 29, 2007

[patch] fix hanging stop button

by Johannes.Hofmann＠gmx.de

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;

Dec. 29, 2007

patch: just hooking up panel preferences (panel_size, small_icons)

by Johannes.Hofmann＠gmx.de

Very nice! I was missing this a lot. Johannes On Thu, Dec 27, 2007 at 06:09:37PM +0000, place wrote: > 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. > > diff -pur dillo2/src/prefs.c dillo2-cur/src/prefs.c > --- dillo2/src/prefs.c 2007-12-09 18:59:45.000000000 +0000 > +++ dillo2-cur/src/prefs.c 2007-12-25 22:02:32.000000000 +0000 > @@ -167,13 +167,13 @@ static int Prefs_parse_pair(char *name, > break; > case DRC_TOKEN_PANEL_SIZE: > if (!dStrcasecmp(value, "tiny")) > - prefs.panel_size = 1; > + prefs.panel_size = P_tiny; > else if (!dStrcasecmp(value, "small")) > - prefs.panel_size = 2; > + prefs.panel_size = P_small; > else if (!dStrcasecmp(value, "medium")) > - prefs.panel_size = 3; > + prefs.panel_size = P_medium; > else /* default to "large" */ > - prefs.panel_size = 4; > + prefs.panel_size = P_large; > break; > case DRC_TOKEN_SMALL_ICONS: > prefs.small_icons = (strcmp(value, "YES") == 0); > @@ -345,7 +345,7 @@ void a_Prefs_init(void) > prefs.force_my_colors = FALSE; > prefs.contrast_visited_color = FALSE; > prefs.show_tooltip = FALSE; > - prefs.panel_size = 1; > + prefs.panel_size = P_tiny; > prefs.small_icons = FALSE; > prefs.limit_text_width = FALSE; > prefs.w3c_plus_heuristics = TRUE; > diff -pur dillo2/src/prefs.h dillo2-cur/src/prefs.h > --- dillo2/src/prefs.h 2007-11-11 16:05:05.000000000 +0000 > +++ dillo2-cur/src/prefs.h 2007-12-25 21:59:02.000000000 +0000 > @@ -20,6 +20,8 @@ extern "C" { > #define DW_COLOR_DEFAULT_PURPLE 0x800080 > #define DW_COLOR_DEFAULT_BGND 0xd6d6c0 > > +/* Panel sizes */ > +enum { P_tiny = 0, P_small, P_medium, P_large }; > > /* define enumeration values to be returned for specific symbols */ > typedef enum { > diff -pur dillo2/src/ui.cc dillo2-cur/src/ui.cc > --- dillo2/src/ui.cc 2007-12-20 20:02:31.000000000 +0000 > +++ dillo2-cur/src/ui.cc 2007-12-25 22:24:47.000000000 +0000 > @@ -593,11 +593,13 @@ UI::UI(int win_w, int win_h, const char* > } else { > // Set some default values > //PanelSize = P_tiny, CuteColor = 26, Small_Icons = 0; > - PanelSize = P_medium, CuteColor = 206, Small_Icons = 0; > + PanelSize = prefs.panel_size; > + Small_Icons = prefs.small_icons; > + CuteColor = 206; > } > > resizable(this); > diff -pur dillo2/src/ui.hh dillo2-cur/src/ui.hh > --- dillo2/src/ui.hh 2007-12-20 20:02:31.000000000 +0000 > +++ dillo2-cur/src/ui.hh 2007-12-25 22:07:57.000000000 +0000 > @@ -13,9 +13,6 @@ > > using namespace fltk; > > -// Panel sizes > -enum { P_tiny = 0, P_small, P_medium, P_large }; > - > typedef enum { > UI_BACK = 0, > UI_FORW, > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)dillo.org > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

Dec. 29, 2007

[patch] make TopGroup a PackedGroup

by Johannes.Hofmann＠gmx.de

On Sat, Dec 29, 2007 at 07:00:05AM +0000, place wrote: > Johannes wrote: > > just noticed that child widgets where not redrawn properly with my > > patch. Attached is a fixed version against current cvs. > > If I switch to another screen and come back, the scrollbars aren't drawn. > The viewport has damage 0xc0, and ?scrollbar->damage() is 0. Ah yes, the widget specific damage is only set in the DAMAGE_CHILD case. Please try the patch below. This drawing stuff is really fragile. It's not much code though (FltkViewport::draw () and FltkViewBase::draw ()). Johannes --- a/dw/fltkviewport.cc Fri Dec 28 20:17:46 2007 +0100 +++ b/dw/fltkviewport.cc Sat Dec 29 08:45:03 2007 +0100 @@ -193,10 +193,13 @@ void FltkViewport::draw () if (d) { draw_area(this, cr); - if (hscrollbar->damage ()) + if (d == DAMAGE_CHILD) { + if (hscrollbar->damage ()) draw_child (*hscrollbar); + if (vscrollbar->damage ()) draw_child (*vscrollbar); + } else { draw_child (*hscrollbar); - if (vscrollbar->damage ()) draw_child (*vscrollbar); + } } scrollDX = 0; > > > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)dillo.org > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

Dec. 29, 2007

[patch] make TopGroup a PackedGroup

by place＠gobigwest.com

Johannes wrote: > just noticed that child widgets where not redrawn properly with my > patch. Attached is a fixed version against current cvs. If I switch to another screen and come back, the scrollbars aren't drawn. The viewport has damage 0xc0, and ?scrollbar->damage() is 0.

Dec. 29, 2007

[patch] make TopGroup a PackedGroup

by Johannes.Hofmann＠gmx.de

Hi, just noticed that child widgets where not redrawn properly with my patch. Attached is a fixed version against current cvs. Cheers, Johannes On Fri, Dec 28, 2007 at 05:26:19PM +0100, Johannes Hofmann wrote: > 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

Dec. 28, 2007

[patch] make TopGroup a PackedGroup

by Johannes.Hofmann＠gmx.de

Hi, just noticed that child widgets where not redrawn properly with my patch. Attached is a fixed version against current cvs. Cheers, Johannes On Fri, Dec 28, 2007 at 05:26:19PM +0100, Johannes Hofmann wrote: > 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

Dec. 28, 2007

patch: just hooking up panel preferences (panel_size, small_icons)

by jcid＠dillo.org

Hi, Committed. On Thu, Dec 27, 2007 at 06:09:37PM +0000, place wrote: > 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. Yeah, quite untidy. Large is ok when there's no dillorc2, or panel_size is bad/not-present, dillorc2 in the source tree may vary. -- Cheers Jorge.-

Dec. 28, 2007

[patch] make TopGroup a PackedGroup

by Johannes.Hofmann＠gmx.de

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

Dec. 28, 2007

[PATCH] dw::fltk::ui::FltkOptionMenuResource::isSelected()

by jcid＠dillo.org

On Thu, Dec 27, 2007 at 05:28:52PM +0000, Jeremy Henty wrote: > > 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. Good. > * 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. Good2. ;) > * 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.) Committed! > 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.) I look forward to have SELECT working. -- Cheers Jorge.-

Dec. 28, 2007

patch: just hooking up panel preferences (panel_size, small_icons)

by place＠gobigwest.com

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.

Dec. 27, 2007

[PATCH] dw::fltk::ui::FltkOptionMenuResource::isSelected()

by onepoint＠starurchin.org

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

Dec. 27, 2007

Q: Form SELECT support: what to do in the DW code?

by onepoint＠starurchin.org

> > 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? > > Sounds ok to me, if it is necessary. I'm only starting to understand > the FltkSelectionResource stuff however :-) I've got something working that adds the callback as a virtual function in the FltkListResource::Item class. Unfortunately it requires adding some other virtual functions and some extremely verbose template code (+ use of the typename keyword to get it all through the parser) so I'm keen to simplify things. > Or would it be possible to connect the callback in createNewMenu() > which is virtual already? If you look at the test/menu.cxx from > fltk-2, there they install one callback per menu and get the item > using get_item(). That might be much simpler than what I currently have. I'd much rather reuse the virtual functions we already have than add new ones. Thanks for the tip, I'll give it a go! Jeremy Henty

Dec. 26, 2007

Q: Form SELECT support: what to do in the DW code?

by Johannes.Hofmann＠gmx.de

On Tue, Dec 25, 2007 at 07:20:43PM +0000, Jeremy Henty wrote: > > 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? Sounds ok to me, if it is necessary. I'm only starting to understand the FltkSelectionResource stuff however :-) Or would it be possible to connect the callback in createNewMenu() which is virtual already? If you look at the test/menu.cxx from fltk-2, there they install one callback per menu and get the item using get_item(). Regards, Johannes > > 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 > > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)dillo.org > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

Dec. 26, 2007

Q: Form SELECT support: what to do in the DW code?

by onepoint＠starurchin.org

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

Dec. 25, 2007

Re: Colspan and table percentages

by place＠gobigwest.com

I've noticed that sometimes people will make a table with two columns for the purpose of indenting their text, specifying only the width of the first column as some percentage. When they do this, dillo squishes everything to the right. Tiny example: <html><head><title></title></head><body> <table width=500 border=3> <tr> <td width="50%">Is explicitly 50%</td> <td>should be 50%</td> </tr> </table> </body></html>

Dec. 24, 2007

[PATCH] FLTK Resources should call ::fltk::setfont before ::fltk::getwidth

by jcid＠dillo.org

On Sun, Dec 23, 2007 at 06:49:06PM +0000, Jeremy Henty wrote: > On Sun, Dec 23, 2007 at 12:12:51PM -0300, Jorge Arellano Cid wrote: > > > With regard to dialog: it'd be nice to set the font size > > considering prefs.font_factor. > > OK, here's a patch but I'm not sure how to test it. What's an easy > way to get dillo-fltk to show a dialog? Last time I looked the https > dpi dialogs failed to appear. Just use "View source". Committed with a minor tweak. -- Cheers Jorge.-

Dec. 23, 2007

[PATCH] FLTK Resources should call ::fltk::setfont before ::fltk::getwidth

by jcid＠dillo.org

On Sun, Dec 23, 2007 at 05:33:49PM +0000, Jeremy Henty wrote: > On Sun, Dec 23, 2007 at 12:12:51PM -0300, Jorge Arellano Cid wrote: > > > For fltkpreview.cc, it'd be good to at least add a commented > > statement because it clearly is in a state of flux (and ifdefed > > out). > > Heh, I hadn't noticed it was ifdefed! Here's a patch that moves the > setfont() call to the top of the function and adds a comment > explaining why it must be there. There's no change to the > functionality since the interviewing code is commented out. Committed. -- Cheers Jorge.-

Dec. 23, 2007

[PATCH] FLTK Resources should call ::fltk::setfont before ::fltk::getwidth

by onepoint＠starurchin.org

On Sun, Dec 23, 2007 at 12:12:51PM -0300, Jorge Arellano Cid wrote: > With regard to dialog: it'd be nice to set the font size > considering prefs.font_factor. OK, here's a patch but I'm not sure how to test it. What's an easy way to get dillo-fltk to show a dialog? Last time I looked the https dpi dialogs failed to appear. Regards, Jeremy Henty

Dec. 23, 2007