- Dillo-dev - lists.mailman3.com

[PATCH] improved image load button graphics

by place＠gobigwest.com

Jeremy wrote: > I thought that the graphics for the image load toggle button looked > rather scrappy, so I have made some new ones that I think are a little > smarter. Good, I was hoping that somebody would fix the ugly thing that I drew :)

Nov. 18, 2007

on copy and paste

by sgeerken＠dillo.org

To start with a simple one ... On Sun, Nov 18, place wrote: > The bottom of dw/selection.cc goes: > > /** \todo Actual Selection is platform dependant. */ > > printf ("Selected text:\n"); > printf ("--------------------------------------------------\n"); > printf (strbuf.getChars ()); > printf ("\n--------------------------------------------------\n"); > > > Now, suppose we violate the principles of dw, sticking > #include <fltk/events.h> > in the top of the file, and put > const char *buf = strbuf.getChars(); > fltk::copy(buf, strlen(buf), false); > in place of the above printf()s. Works. > > So if anyone knows the structure of dw well enough to know > how to go about making a proper little platform-independent > interface, there's nothing difficult here in principle.. Well, a clean solution is rather simple: this is exactly, what dw::core::Platform is for. A patch is attached below (also in CVS). Sebastian ---------- Index: dw/fltkplatform.cc =================================================================== RCS file: /sfhome/cvs/dillo/dw2/dw/fltkplatform.cc,v retrieving revision 1.2 diff -u -r1.2 fltkplatform.cc --- dw/fltkplatform.cc 17 Nov 2007 16:15:13 -0000 1.2 +++ dw/fltkplatform.cc 18 Nov 2007 17:16:51 -0000 @@ -24,6 +24,7 @@ #include <fltk/draw.h> #include <fltk/run.h> +#include <fltk/events.h> #include <stdio.h> namespace dw { @@ -379,6 +380,10 @@ return new FltkColor(color, core::style::Color::TYPE_SHADED); } +void FltkPlatform::copySelection(const char *text) +{ + fltk::copy(text, strlen(text), false); +} core::Imgbuf *FltkPlatform::createImgbuf (core::Imgbuf::Type type, int width, int height) Index: dw/fltkplatform.hh =================================================================== RCS file: /sfhome/cvs/dillo/dw2/dw/fltkplatform.hh,v retrieving revision 1.2 diff -u -r1.2 fltkplatform.hh --- dw/fltkplatform.hh 17 Nov 2007 16:15:13 -0000 1.2 +++ dw/fltkplatform.hh 18 Nov 2007 17:16:52 -0000 @@ -157,6 +157,8 @@ core::Imgbuf *createImgbuf (core::Imgbuf::Type type, int width, int height); + void copySelection(const char *text); + core::ui::ResourceFactory *getResourceFactory (); void attachResource (ui::FltkResource *resource); Index: dw/layout.cc =================================================================== RCS file: /sfhome/cvs/dillo/dw2/dw/layout.cc,v retrieving revision 1.4 diff -u -r1.4 layout.cc --- dw/layout.cc 13 Nov 2007 13:57:32 -0000 1.4 +++ dw/layout.cc 18 Nov 2007 17:16:52 -0000 @@ -101,6 +101,8 @@ DBG_OBJ_ASSOC (&selection, this); platform->setLayout (this); + + selectionState.setLayout(this); } Layout::~Layout () Index: dw/layout.hh =================================================================== RCS file: /sfhome/cvs/dillo/dw2/dw/layout.hh,v retrieving revision 1.2 diff -u -r1.2 layout.hh --- dw/layout.hh 19 Oct 2007 22:10:13 -0000 1.2 +++ dw/layout.hh 18 Nov 2007 17:16:52 -0000 @@ -223,6 +223,11 @@ return platform->createImgbuf (type, width, height); } + inline void copySelection(const char *text) + { + platform->copySelection(text); + } + inline ui::ResourceFactory *getResourceFactory () { return platform->getResourceFactory (); Index: dw/platform.hh =================================================================== RCS file: /sfhome/cvs/dillo/dw2/dw/platform.hh,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 platform.hh --- dw/platform.hh 6 Oct 2007 22:03:01 -0000 1.1.1.1 +++ dw/platform.hh 18 Nov 2007 17:16:52 -0000 @@ -188,6 +188,11 @@ virtual Imgbuf *createImgbuf (Imgbuf::Type type, int width, int height) = 0; /** + * \brief Copy selected text (0-terminated). + */ + virtual void copySelection(const char *text) = 0; + + /** * ... */ virtual ui::ResourceFactory *getResourceFactory () = 0; Index: dw/selection.cc =================================================================== RCS file: /sfhome/cvs/dillo/dw2/dw/selection.cc,v retrieving revision 1.3 diff -u -r1.3 selection.cc --- dw/selection.cc 1 Nov 2007 15:00:04 -0000 1.3 +++ dw/selection.cc 18 Nov 2007 17:16:52 -0000 @@ -44,6 +44,8 @@ SelectionState::SelectionState () { + layout = NULL; + selectionState = NONE; from = NULL; to = NULL; @@ -493,12 +495,7 @@ delete i; } - /** \todo Actual Selection is platform dependant. */ - - printf ("Selected text:\n"); - printf ("--------------------------------------------------\n"); - printf (strbuf.getChars ()); - printf ("\n--------------------------------------------------\n"); + layout->copySelection(strbuf.getChars()); } } Index: dw/selection.hh =================================================================== RCS file: /sfhome/cvs/dillo/dw2/dw/selection.hh,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 selection.hh --- dw/selection.hh 6 Oct 2007 22:03:01 -0000 1.1.1.1 +++ dw/selection.hh 18 Nov 2007 17:16:52 -0000 @@ -209,6 +209,8 @@ DoubleClickEmitter doubleClickEmitter; + Layout *layout; + // selection enum { NONE, @@ -248,6 +250,7 @@ SelectionState (); ~SelectionState (); + inline void setLayout (Layout *layout) { this->layout = layout; } void reset (); inline void connectDoubleClick (DoubleClickReceiver *receiver) { doubleClickEmitter.connectDoubleClick (receiver); }

Nov. 18, 2007

[PATCH] improved image load button graphics

by onepoint＠starurchin.org

I thought that the graphics for the image load toggle button looked rather scrappy, so I have made some new ones that I think are a little smarter. You can compare them at http://starurchin.org/dillo/img_load.html . The patch is appended here. Regards, Jeremy Henty Only in dillo2-cur/: Makefile Only in dillo2-cur/: Makefile.in Only in dillo2-cur/: aclocal.m4 Only in dillo2-cur/: autom4te.cache Only in dillo2-cur/: config.guess Only in dillo2-cur/: config.h Only in dillo2-cur/: config.log Only in dillo2-cur/: config.status Only in dillo2-cur/: config.sub Only in dillo2-cur/: configure Only in dillo2-cur/: d_size.h Only in dillo2-cur/: depcomp Only in dillo2-cur/dlib: .deps Only in dillo2-cur/dlib: Makefile Only in dillo2-cur/dlib: Makefile.in Only in dillo2-cur/doc: Makefile Only in dillo2-cur/doc: Makefile.in Only in dillo2-cur/dpi: .deps Only in dillo2-cur/dpi: Makefile Only in dillo2-cur/dpi: Makefile.in Only in dillo2-cur/dpid: .deps Only in dillo2-cur/dpid: Makefile Only in dillo2-cur/dpid: Makefile.in Only in dillo2-cur/dpip: .deps Only in dillo2-cur/dpip: Makefile Only in dillo2-cur/dpip: Makefile.in Only in dillo2-cur/: install-sh Only in dillo2-cur/: missing Only in dillo2-cur/src: .deps Only in dillo2-cur/src/IO: .deps Only in dillo2-cur/src/IO: Makefile Only in dillo2-cur/src/IO: Makefile.in Only in dillo2-cur/src: Makefile Only in dillo2-cur/src: Makefile.in diff -pru -- dillo2-ref/src/pixmaps.h dillo2-cur/src/pixmaps.h --- dillo2-ref/src/pixmaps.h 2007-11-03 09:30:39.000000000 +0000 +++ dillo2-cur/src/pixmaps.h 2007-11-18 14:49:51.000000000 +0000 @@ -1497,44 +1497,44 @@ static char * mini_ok_xpm[] = { /* XPM */ static char * imgload_on_xpm[] = { "15 15 2 1", -" c #00000000CF3C", -". c #FFFFFFFFFFFF", -" . . .........", -" . ... ..", -" . . ... ....", -" . ... .. .....", -" ..... . .. .", -"......... .. .", -".......... .", -"...............", -". ...........", -". . . .. ....", -". .. . ....", -". .. . . .....", -". . . .....", -"...............", -"..............."}; +" c #FFFFFFFFFFFF", +". c #00000000CF3C", +" ", +" ... . . .. ", +" . .. .. . . ", +" . . . . . ", +" . . . . . ", +" . . . . . ", +" ... . . .. ", +" ", +" .. . . ", +" . . .. . ", +" . . . . . ", +" . . . .. ", +" . . . . ", +" .. . . ", +" "}; /* XPM */ static char * imgload_off_xpm[] = { "15 15 2 1", -" c #CF3C00000000", -". c #FFFFFFFFFFFF", -" .. . .........", -" . .. ...", -" . . ......", -" . . . . .. ..", -" . ... .. ..", -" ........ ..", -"...............", -"...............", -"...............", -" .. . ....", -" . .. ..", -" . . .... .....", -" . . ...", -" .. ... ...", -".... .... ....."}; +" c #FFFFFFFFFFFF", +". c #CF3C00000000", +" ", +" ... . . .. ", +" . .. .. . . ", +" . . . . . ", +" . . . . . ", +" . . . . . ", +" ... . . .. ", +" ", +" .. ... ... ", +" . . . . ", +" . . ... ... ", +" . . . . ", +" . . . . ", +" .. . . ", +" "}; /* XPM */ static char *left_i_xpm[] = { Only in dillo2-cur/: stamp-h1

Nov. 18, 2007

Re: fullscreen/maximize question

by jcid＠dillo.org

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

Nov. 18, 2007

[PATCH] Ctrl-R reloads

by jcid＠dillo.org

On Sun, Nov 18, 2007 at 08:53:30AM +0000, Jeremy Henty wrote: > > This patch amkes Ctrl-R reload the page. Just like Dillo Classic! Committed. -- Cheers Jorge.-

Nov. 18, 2007

on copy and paste

by place＠gobigwest.com

The bottom of dw/selection.cc goes: /** \todo Actual Selection is platform dependant. */ printf ("Selected text:\n"); printf ("--------------------------------------------------\n"); printf (strbuf.getChars ()); printf ("\n--------------------------------------------------\n"); Now, suppose we violate the principles of dw, sticking #include <fltk/events.h> in the top of the file, and put const char *buf = strbuf.getChars(); fltk::copy(buf, strlen(buf), false); in place of the above printf()s. Works. So if anyone knows the structure of dw well enough to know how to go about making a proper little platform-independent interface, there's nothing difficult here in principle...

Nov. 18, 2007

[PATCH] Ctrl-R reloads

by onepoint＠starurchin.org

This patch amkes Ctrl-R reload the page. Just like Dillo Classic! Regards, Jeremy Henty Only in dillo2-cur/: Makefile Only in dillo2-cur/: Makefile.in Only in dillo2-cur/: aclocal.m4 Only in dillo2-cur/: autom4te.cache Only in dillo2-cur/: config.guess Only in dillo2-cur/: config.h Only in dillo2-cur/: config.log Only in dillo2-cur/: config.status Only in dillo2-cur/: config.sub Only in dillo2-cur/: configure Only in dillo2-cur/: d_size.h Only in dillo2-cur/: depcomp Only in dillo2-cur/dlib: .deps Only in dillo2-cur/dlib: Makefile Only in dillo2-cur/dlib: Makefile.in Only in dillo2-cur/doc: Makefile Only in dillo2-cur/doc: Makefile.in Only in dillo2-cur/dpi: .deps Only in dillo2-cur/dpi: Makefile Only in dillo2-cur/dpi: Makefile.in Only in dillo2-cur/dpid: .deps Only in dillo2-cur/dpid: Makefile Only in dillo2-cur/dpid: Makefile.in Only in dillo2-cur/dpip: .deps Only in dillo2-cur/dpip: Makefile Only in dillo2-cur/dpip: Makefile.in Only in dillo2-cur/: install-sh Only in dillo2-cur/: missing Only in dillo2-cur/src: .deps Only in dillo2-cur/src/IO: .deps Only in dillo2-cur/src/IO: Makefile Only in dillo2-cur/src/IO: Makefile.in Only in dillo2-cur/src: Makefile Only in dillo2-cur/src: Makefile.in Only in dillo2-ref/src: html.cc.orig diff -pru -- dillo2-ref/src/ui.cc dillo2-cur/src/ui.cc --- dillo2-ref/src/ui.cc 2007-11-18 07:36:55.000000000 +0000 +++ dillo2-cur/src/ui.cc 2007-11-18 08:10:08.000000000 +0000 @@ -56,7 +56,8 @@ public: }; /* - * Disable: UpKey, DownKey, PageUpKey, PageDownKey and CTRL+{o,HomeKey,EndKey} + * Disable: UpKey, DownKey, PageUpKey, PageDownKey and + * CTRL+{o,r,HomeKey,EndKey} */ int NewInput::handle(int e) { @@ -64,7 +65,7 @@ int NewInput::handle(int e) bool ctrl = event_state(CTRL); _MSG("NewInput::handle event=%d", e); - if (ctrl && (k == 'o' || k == HomeKey || k == EndKey)) + if (ctrl && (k == 'o' || k == 'r' || k == HomeKey || k == EndKey)) return 0; if ((e == KEY || e == KEYUP) && k == UpKey || k == DownKey || k == PageUpKey || k == PageDownKey) { @@ -666,6 +667,9 @@ int UI::handle(int event) } else if (event_key() == 'q') { a_UIcmd_close_bw(user_data()); ret = 1; + } else if (event_key() == 'r') { + a_UIcmd_reload(user_data()); + ret = 1; } else if (event_key() == 's') { a_UIcmd_search_dialog(user_data()); ret = 1; Only in dillo2-cur/: stamp-h1

Nov. 18, 2007

Re: patch: base url page menu

by place＠gobigwest.com

Jorge wrote: > 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". I'm wondering whether the image list should live in the bw or something. Now that we keep a list of images around, reload should be able to do a proper full reload...

Nov. 18, 2007

Re: space bar to page

by jcid＠dillo.org

On Tue, Nov 13, 2007 at 10:18:48PM +0000, place wrote: > I like hitting the space bar to page down. I've been carrying this code > along for a couple of weeks now, and the take_focus() hasn't caused anything > horrible to happen yet, so far as I can tell, anyway... + Added shortcuts: PgDn=Spc PgUp=b Back=BackSpace|, Forw=Shift+Backspace|. Committed. -- Cheers Jorge.-

Nov. 17, 2007

patch: text search

by jcid＠dillo.org

Hi, 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). Good, I'm giving it a review. > - 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. Fixed in CVS. Funny how Ctrl+n from a search window produced a small dialog-sized 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... Checking patch now... -- Cheers Jorge.-

Nov. 17, 2007