- Dillo-dev - lists.mailman3.com

patch: text search

by Johannes.Hofmann＠gmx.de

On Fri, Nov 16, 2007 at 07:10:48PM +0000, place wrote: > Johannes wrote: > > Very nice! I was text search a lot. > > What about incremental searching as you type? > > I don't mind the title bar... > > Hmm... I'd have to modify findtext.cc some... > I may get around to it at some point here, though I'm > feeling the need to look into what's going on with > redirection and gzip, so if anybody else gets there > first, it'll be fine with me! :) I was thinking about something like: diff -r f18e37a8e3ac src/dialog.cc --- a/src/dialog.cc Fri Nov 16 20:25:11 2007 +0100 +++ b/src/dialog.cc Fri Nov 16 20:27:18 2007 +0100 @@ -141,14 +141,6 @@ static void findtext_search_cb(Widget *, const char *key = tf->i->value(); bool case_sens = tf->cb->value(); - /* - * Somehow fltk even regards the first loss of focus for the - * window as a WHEN_ENTER_KEY_ALWAYS event. - */ - int e = event_key(); - if ((e != ReturnKey) && (e != LeftButton)) - return; - if (key[0] != '\0') a_UIcmd_findtext_search(tf->bw, key, case_sens); @@ -176,7 +168,7 @@ TextFinder::TextFinder(int ww, int wh, B begin(); i = new Input(0, 0, ww, ih); - i->when(WHEN_ENTER_KEY_ALWAYS); + i->when(WHEN_CHANGED); i->callback(findtext_search_cb, this); cb = new CheckButton(0, ih, ww, wh-ih-bh, "Case-sensitive"); on top of your patch of course. Works for me. Cheers, Johannes

Nov. 16, 2007

patch: text search

by place＠gobigwest.com

Johannes wrote: > Very nice! I was text search a lot. > What about incremental searching as you type? > I don't mind the title bar... Hmm... I'd have to modify findtext.cc some... I may get around to it at some point here, though I'm feeling the need to look into what's going on with redirection and gzip, so if anybody else gets there first, it'll be fine with me! :) If nothing else, it would be nice to change the behavior so that changing the search key doesn't restart the search from the top of the document.

Nov. 16, 2007

patch: text search

by Johannes.Hofmann＠gmx.de

Very nice! I was text search a lot. What about incremental searching as you type? I don't mind the title bar... Cheers, Johannes On Fri, Nov 16, 2007 at 04:22:01AM +0000, place wrote: > I'm not much of a drawing/gui person, but it's hard not being > able to search pages, so I gave it a try (attached). > > - If you hit ^Q on this window or the page source or page > bugs windows, dillo will crash because it assumes it's > closing a bw. > > - I didn't want a title bar, and I didn't want it to be able > to outlive its bw, but I didn't know what to do about it. > > - If searching scrolls the window, highlighting isn't undone > properly. (If you search for something like "a", the last > instance on each line will remain highlighted) > > > *plays with it a bit more* > > Maybe it's good to have a title bar after all. It's easier to > move out of the way than the 0.8.x one was... > > diff -pur dillo2/src/dialog.cc dillo2-cur/src/dialog.cc > --- dillo2/src/dialog.cc 2007-11-07 05:03:53.000000000 +0000 > +++ dillo2-cur/src/dialog.cc 2007-11-16 03:30:20.000000000 +0000 > @@ -11,22 +11,26 @@ > > // UI dialogs > > +#include <fltk/events.h> // for the unfortunate (temporary?) event key testing > #include <fltk/Window.h> > #include <fltk/ask.h> > #include <fltk/file_chooser.h> > #include <fltk/TextBuffer.h> > +#include <fltk/Input.h> > +#include <fltk/CheckButton.h> > #include <fltk/ReturnButton.h> > #include <fltk/TextDisplay.h> > > #include "dialog.hh" > #include "misc.h" > +#include "uicmd.hh" > > using namespace fltk; > > /* > - * Callback for the text window dialog. > + * Close dialog window. > */ > -void text_window_cb(Widget *, void *vwin) > +static void window_close_cb(Widget *, void *vwin) > { > Window *window = (Window*)vwin; > > @@ -107,10 +111,91 @@ void a_Dialog_text_window(const char *tx > td->buffer(text_buf); > > ReturnButton *b = new ReturnButton (0, wh-bh, ww, bh, "Close"); > - b->callback(text_window_cb, window); > + b->callback(window_close_cb, window); > > window->resizable(window); > window->end(); > window->show(); > } > > +/* > + * Dialog to find text in page. > + */ > +class TextFinder : public Window { > +public: > + TextFinder(int ww, int wh, BrowserWindow *bw); > + BrowserWindow *bw; > + Input *i; > + CheckButton *cb; > + ReturnButton *findb; > + Button *clrb; > + Button *clsb; > +}; > + > +/* > + * Find next occurrence of input key > + */ > +static void findtext_search_cb(Widget *, void *vtf) > +{ > + TextFinder *tf = (TextFinder *)vtf; > + const char *key = tf->i->value(); > + bool case_sens = tf->cb->value(); > + > + /* > + * Somehow fltk even regards the first loss of focus for the > + * window as a WHEN_ENTER_KEY_ALWAYS event. > + */ > + int e = event_key(); > + if ((e != ReturnKey) && (e != LeftButton)) > + return; > + > + if (key[0] != '\0') > + a_UIcmd_findtext_search(tf->bw, key, case_sens); > + > +} > + > +/* > + * Reset search state > + */ > +static void findtext_clear_cb(Widget *, void *vtf) > +{ > + TextFinder *tf = (TextFinder *)vtf; > + tf->i->value(""); > + a_UIcmd_findtext_reset(tf->bw); > +} > + > +/* > + * Construct text search window > + */ > +TextFinder::TextFinder(int ww, int wh, BrowserWindow *bw) : > + Window(ww, wh, "unwanted title") > +{ > + int button_width = 70, ih = 35, bh = 30, gap = 10; > + > + this->bw = bw; > + > + begin(); > + i = new Input(0, 0, ww, ih); > + i->when(WHEN_ENTER_KEY_ALWAYS); > + i->callback(findtext_search_cb, this); > + > + cb = new CheckButton(0, ih, ww, wh-ih-bh, "Case-sensitive"); > + > + findb = new ReturnButton(gap, wh-bh, button_width, bh, "Find"); > + findb->callback(findtext_search_cb, this); > + > + clrb = new Button(button_width+2*gap, wh-bh, button_width, bh, "Clear"); > + clrb->callback(findtext_clear_cb, this); > + > + clsb = new Button(2*button_width+3*gap, wh-bh, button_width, bh, "Close"); > + clsb->callback(window_close_cb, this); > + end(); > + > + hotspot(i); // place input widget beneath the cursor > +} > + > +void a_Dialog_findtext(BrowserWindow *bw) > +{ > + TextFinder *tf = new TextFinder(250, 90, bw); > + tf->show(); > +} > diff -pur dillo2/src/dialog.hh dillo2-cur/src/dialog.hh > --- dillo2/src/dialog.hh 2007-11-08 19:50:20.000000000 +0000 > +++ dillo2-cur/src/dialog.hh 2007-11-16 03:00:01.000000000 +0000 > @@ -1,6 +1,8 @@ > #ifndef __DIALOG_HH__ > #define __DIALOG_HH__ > > +#include "bw.h" > + > #ifdef __cplusplus > extern "C" { > #endif /* __cplusplus */ > @@ -14,7 +16,7 @@ const char *a_Dialog_save_file(const cha > char *a_Dialog_open_file(const char *msg, > const char *pattern, const char *fname); > void a_Dialog_text_window(const char *txt, const char *title); > - > +void a_Dialog_findtext(BrowserWindow *bw); > > #ifdef __cplusplus > } > diff -pur dillo2/src/menu.cc dillo2-cur/src/menu.cc > --- dillo2/src/menu.cc 2007-11-14 22:07:49.000000000 +0000 > +++ dillo2-cur/src/menu.cc 2007-11-16 02:09:24.000000000 +0000 > @@ -115,7 +115,8 @@ static void Menu_add_bookmark_cb(Widget* > */ > static void Menu_find_text_cb(Widget* ) > { > - a_UIcmd_fullscreen_toggle(popup_bw); > +// a_UIcmd_fullscreen_toggle(popup_bw); > + a_UIcmd_findtext_dialog(popup_bw); > } > > /* > diff -pur dillo2/src/uicmd.cc dillo2-cur/src/uicmd.cc > --- dillo2/src/uicmd.cc 2007-11-14 22:07:49.000000000 +0000 > +++ dillo2-cur/src/uicmd.cc 2007-11-16 03:03:19.000000000 +0000 > @@ -696,3 +696,43 @@ void a_UIcmd_fullscreen_toggle(BrowserWi > BW2UI(bw)->fullscreen_toggle(); > } > > +/* > + * Open the text search dialog. > + */ > +void a_UIcmd_findtext_dialog(BrowserWindow *bw) > +{ > + a_Dialog_findtext(bw); > +} > + > +/* > + * Search for next occurrence of key. > + */ > +void a_UIcmd_findtext_search(BrowserWindow *bw, const char *key, int case_sens) > +{ > + Layout *l = (Layout *)bw->render_layout; > + > + switch (l->search(key, case_sens)) { > + case FindtextState::RESTART: > + a_UIcmd_set_msg(bw, "No further occurrences of \"%s\". " > + "Restarting from the top.", key); > + break; > + case FindtextState::NOT_FOUND: > + a_UIcmd_set_msg(bw, "\"%s\" not found.", key); > + break; > + case FindtextState::SUCCESS: > + default: > + a_UIcmd_set_msg(bw, ""); > + } > +} > + > +/* > + * Reset text search state. > + */ > +void a_UIcmd_findtext_reset(BrowserWindow *bw) > +{ > + Layout *l = (Layout *)bw->render_layout; > + l->resetSearch(); > + > + a_UIcmd_set_msg(bw, ""); > +} > + > diff -pur dillo2/src/uicmd.hh dillo2-cur/src/uicmd.hh > --- dillo2/src/uicmd.hh 2007-11-14 22:07:49.000000000 +0000 > +++ dillo2-cur/src/uicmd.hh 2007-11-16 02:37:32.000000000 +0000 > @@ -27,6 +27,9 @@ void a_UIcmd_search_dialog(void *vbw); > void a_UIcmd_book(void *vbw); > void a_UIcmd_add_bookmark(BrowserWindow *bw, const DilloUrl *url); > void a_UIcmd_fullscreen_toggle(BrowserWindow *bw); > +void a_UIcmd_findtext_dialog(BrowserWindow *bw); > +void a_UIcmd_findtext_search(BrowserWindow *bw, const char *key, int case_sens); > +void a_UIcmd_findtext_reset(BrowserWindow *bw); > void a_UIcmd_page_popup(void *vbw, const DilloUrl *url, > const char *bugs_txt, int prefs_load_images); > void a_UIcmd_link_popup(void *vbw, const DilloUrl *url); > _______________________________________________ > Dillo-dev mailing list > Dillo-dev(a)dillo.org > http://lists.auriga.wearlab.de/cgi-bin/mailman/listinfo/dillo-dev

Nov. 16, 2007

[patch] avoid complete redraws for child widget updates

by Johannes.Hofmann＠gmx.de

Hello, here comes a patch that avoids complete redrawing if only a child widget (button or form input) requests redrawing. I don't really like the fact, that fltk widgets are sometimes drawn via Group::draw() and sometimes via theLayout->expose(), but this is already the case without my patch, so I just leave it as it is for now. In the long run, I would propose to add a mechanism similar to fltk DAMAGE_CHILD to dw. To test go to google and type in some text. Cheers, Johannes

Nov. 16, 2007

[PATCH]: fix occasional segfault in dw::Table::reallocChildren

by onepoint＠starurchin.org

This patch fixes an occasional segfault when adding columns to a table that contains cells that span multiple rows or columns. This was reported to the list last month by Matthias Franz. I've been bitten by this on several web sites (see the details below), so it's a useful fix. Regards, Jeremy Henty Only in dw2-cur/: Makefile Only in dw2-cur/: Makefile.in Only in dw2-cur/: aclocal.m4 Only in dw2-cur/: autom4te.cache Only in dw2-cur/: config.guess Only in dw2-cur/: config.log Only in dw2-cur/: config.status Only in dw2-cur/: config.sub Only in dw2-cur/: configure Only in dw2-cur/: depcomp Only in dw2-cur/doc: Makefile Only in dw2-cur/doc: Makefile.in Only in dw2-cur/dw: .deps Only in dw2-cur/dw: Makefile Only in dw2-cur/dw: Makefile.in diff -pru -- dw2-ref/dw/table.cc dw2-cur/dw/table.cc --- dw2-ref/dw/table.cc 2007-10-06 23:03:01.000000000 +0100 +++ dw2-cur/dw/table.cc 2007-11-16 13:02:59.000000000 +0000 @@ -357,7 +357,7 @@ void Table::reallocChildren (int newNumC break; case Child::SPAN_SPACE: if (children->get(children->get(n)->spanSpace.startRow - * newNumCols + + * numCols + children->get(n)->spanSpace.startCol) ->cell.colspanOrig == 0) { colspan0Col = children->get(n)->spanSpace.startCol; Only in dw2-cur/: install-sh Only in dw2-cur/lout: .deps Only in dw2-cur/lout: Makefile Only in dw2-cur/lout: Makefile.in Only in dw2-cur/: missing Only in dw2-cur/test: .deps Only in dw2-cur/test: Makefile Only in dw2-cur/test: Makefile.in Analysis of the bug: A dillo table stores its children in a single vector that is the concatenation of the rows. This means that when the number of columns increases the contents of the vector must be rearranged. The code does this in place, starting at the end and working backwards. When the code reaches a point that corresponds to a multi-row/column cell, it finds a placeholder that stores the row/column of the actual cell. The important point is that the actual cell is stored in the vector *before* any placeholders that refer to it. Therefore the cell has not yet been moved when the code reaches the placeholder (because it works backwards from the end). The code must calculate the index of the actual cell from the row/column in the placeholder based on the *old* number of columns. Unfortunately the code uses the *new* number of columns, so it may retrieve a cell from the wrong place. Sometimes it retrieves a NULL and segfaults when it tries to dereference it. Test cases: <html><head></head><body><table><tbody> <tr><td colspan="2"></td></tr> <tr><td rowspan="2"></td></tr> <tr><td colspan="2"></td></tr> </tbody></table></body></html> [NB: the next one is from Matthias Franz.] <html> <table> <tr></tr> <tr><td colspan="3"></td></tr> <td colspan="3"> </table> </html> Online pages that trigger the bug: <a href="http://legacyeditorial.gettyimages.com/source/search/details_pop.aspx?iid=7…"> <a href="http://www.eweek.com/article2/0,1759,2216435,00.asp"> <a href="http://www.possible-area.org/bad_timing161107.php"> <a href="http://www.eweek.com/article2/0,1895,2216978,00.asp"> <a href="http://www.nostalgia.com/nf_moreinfo.html?sku=10576">

Nov. 16, 2007

patch: text search

by place＠gobigwest.com

I'm not much of a drawing/gui person, but it's hard not being able to search pages, so I gave it a try (attached). - If you hit ^Q on this window or the page source or page bugs windows, dillo will crash because it assumes it's closing a bw. - I didn't want a title bar, and I didn't want it to be able to outlive its bw, but I didn't know what to do about it. - If searching scrolls the window, highlighting isn't undone properly. (If you search for something like "a", the last instance on each line will remain highlighted) *plays with it a bit more* Maybe it's good to have a title bar after all. It's easier to move out of the way than the 0.8.x one was...

Nov. 16, 2007

[patch] delete the phantom widgets

by Johannes.Hofmann＠gmx.de

Hello, here is a patch to really delete the fltk widgets when we leave a page. I hope there are no references to the deleted widgets left, but I'm not 100% sure, so please test it carefully. Also if someone has an idea for a more elegant implementation of FltkWidgetView::removeFltkWidget(), that would be great. Johannes diff --git a/dw/fltkplatform.cc b/dw/fltkplatform.cc --- a/dw/fltkplatform.cc +++ b/dw/fltkplatform.cc @@ -90,6 +90,10 @@ void FltkView::prepareCreateFltkWidget ( void FltkView::addFltkWidget (::fltk::Widget *widget, core::Allocation *allocation) +{ +} + +void FltkView::removeFltkWidget (::fltk::Widget *widget) { } diff --git a/dw/fltkplatform.hh b/dw/fltkplatform.hh --- a/dw/fltkplatform.hh +++ b/dw/fltkplatform.hh @@ -43,6 +43,7 @@ public: virtual void prepareCreateFltkWidget (); virtual void addFltkWidget (::fltk::Widget *widget, core::Allocation *allocation); + virtual void removeFltkWidget (::fltk::Widget *widget); virtual void allocateFltkWidget (::fltk::Widget *widget, core::Allocation *allocation); virtual void drawFltkWidget (::fltk::Widget *widget, core::Rectangle *area); diff --git a/dw/fltkui.cc b/dw/fltkui.cc --- a/dw/fltkui.cc +++ b/dw/fltkui.cc @@ -77,6 +77,21 @@ FltkResource::~FltkResource () FltkResource::~FltkResource () { platform->detachResource (this); + for (Iterator <ViewAndWidget> it = viewsAndWidgets->iterator (); + it.hasNext(); ) { + ViewAndWidget *viewAndWidget = it.getNext (); + + if (viewAndWidget->widget) { + if (viewAndWidget->view) { + viewAndWidget->view->removeFltkWidget(viewAndWidget->widget); + } + if (viewAndWidget->widget->parent()) { + viewAndWidget->widget->parent()->remove(viewAndWidget->widget); + } + delete viewAndWidget->widget; + } + + } delete viewsAndWidgets; if(style) style->unref (); diff --git a/dw/fltkviewbase.cc b/dw/fltkviewbase.cc --- a/dw/fltkviewbase.cc +++ b/dw/fltkviewbase.cc @@ -364,6 +364,19 @@ void FltkWidgetView::addFltkWidget (::fl allocateFltkWidget (widget, allocation); } +void FltkWidgetView::removeFltkWidget (::fltk::Widget *widget) +{ + for(Iterator <TypedPointer < ::fltk::Widget> > it + = canvasWidgets->iterator (); + it.hasNext (); ) { + TypedPointer < ::fltk::Widget> *wp = it.getNext(); + + if (widget == wp->getTypedValue ()) { + canvasWidgets->remove(wp); + } + } +} + void FltkWidgetView::allocateFltkWidget (::fltk::Widget *widget, core::Allocation *allocation) { diff --git a/dw/fltkviewbase.hh b/dw/fltkviewbase.hh --- a/dw/fltkviewbase.hh +++ b/dw/fltkviewbase.hh @@ -83,6 +83,7 @@ public: bool usesFltkWidgets (); void prepareCreateFltkWidget (); void addFltkWidget (::fltk::Widget *widget, core::Allocation *allocation); + void removeFltkWidget (::fltk::Widget *widget); void allocateFltkWidget (::fltk::Widget *widget, core::Allocation *allocation); void drawFltkWidget (::fltk::Widget *widget, core::Rectangle *area);

Nov. 15, 2007

Re: patch: base url page menu

by place＠gobigwest.com

Jorge wrote: > The "Load images" via page menu patch was committed. Are you seeing the menus popping up with the load images option under the pointer? What I get looks suspiciously like the previous option clicked plus the height of the control panel. *resizes control panel* Yes, _very_ suspiciously.

Nov. 15, 2007

Re: Accept-Encoding: gzip

by jcid＠dillo.org

On Wed, Nov 14, 2007 at 07:55:03PM +0000, place wrote: > Now that I'm on gcc4, let's get rid of the embarrassing signedness warnings: Committed. -- Cheers Jorge.-

Nov. 14, 2007

Re: patch: base url page menu

by jcid＠dillo.org

On Mon, Nov 12, 2007 at 04:59:34PM +0000, place wrote: > Considering how all of the arguments are bw, do you think > the control should go html -> bw -> uicmd -> menu? The "Load images" via page menu patch was committed. I also made a big cleanup of html.hh. It was exporting data no module besides html.cc was using. With regard to your question, currently we have this dependency graph: ,-------------> menu | ^ -----> timeout | | / | v / | ui <-----> uicmd <-----> nav | ^ ^ \ | | / | \ | | / v \ v '-> html ----' bw ----> dialog ^ | form I don't like the double relation between "html" and "menu". It could be "html" calling "menu" only. For instance if we implement setting a callback function in menu's API for "Load Images". Maybe there's a better way, and I'm not sure, but a least the committed cleanup makes it look much cleaner. ;-) BTW, I also added premliminar activate/deactivate to this menu item. -- Cheers Jorge.-

Nov. 14, 2007