- Dillo-dev - lists.mailman3.com

SSL for dillo

by Andreas Kemnade

Hi, I have taken old ssl patches and updated them because I need ssl support. The result is at http://users.auriga.wearlab.de/~andi/dillo-ssl-0.7.diff.gz I can access https://auriga.wearlab.de/ without problems. The ssl support has to be enabled with --enable-ssl Greetings Andreas Kemnade

April 16, 2003

cache fonts and support font size/face

by madis

Tried to enable font tag size/face support and discovered that this made loading sites slow since same fonts were queried, dropped and requeried many times from X server. So here is a patch which makes Dw_style not drop any fonts from fonts_table hashmap until Dw_style_cleanup_fonts is called (from Html_close, when page rendering is finished) and enables support for font tags size and face attributes. diff -pru -x CVS -x configure -x 'aclocal*' -x 'Makefile*' -x config.h.in cvs/dillo/src/dw_style.c dillo/src/dw_style.c --- cvs/dillo/src/dw_style.c 2003-01-05 17:04:56.000000000 +0200 +++ dillo/src/dw_style.c 2003-04-13 14:26:12.000000000 +0300 @@ -24,8 +24,7 @@ #define EQUIV(a, b) (((a) && (b)) || (!(a) && !(b))) #define Dw_style_font_ref(font) ((font)->ref_count++) -#define Dw_style_font_unref(font) if (--((font)->ref_count) == 0) \ - Dw_style_font_remove (font) +#define Dw_style_font_unref(font) (--(font)->ref_count) #define Dw_style_color_ref(color) ((color)->ref_count++) #define Dw_style_color_unref(color) if (--((color)->ref_count) == 0) \ @@ -82,6 +81,8 @@ static void Dw_style_count_fonts (gpoint count[1] += font->ref_count; } + + /* * Called by a_Dw_style_freeall. */ @@ -142,6 +143,25 @@ void a_Dw_style_freeall (void) g_hash_table_destroy (colors_table); } +static gboolean Dw_style_cleanup_fonts (gpointer key, + gpointer value, + gpointer user_data) +{ + DwStyleFont *font = (DwStyleFont*) key; + + if (font->ref_count <= 0) { + Dw_style_font_remove (font); + return TRUE; + } + return FALSE; +} + +/* Collects garbage from fonts cache... */ +void a_Dw_style_fonts_cleanup (void) +{ +// fprintf(stderr, "a_Dw_style_fonts_cleanup called\n"); + g_hash_table_foreach_remove (fonts_table, Dw_style_cleanup_fonts, NULL); +} /* ---------------------------------------------------------------------- * @@ -340,6 +360,9 @@ static DwStyleFont* Dw_style_font_new_in if ((font = g_hash_table_lookup (fonts_table, font_attrs))) { return font; } else { +/*fprintf(stderr, "*** load new font... %d b%d i%d '%s'\n", + (int) font_attrs->size, (int) font_attrs->bold, + (int) font_attrs->italic, font_attrs->name);*/ font = g_new (DwStyleFont, 1); font->size = font_attrs->size; font->bold = font_attrs->bold; @@ -349,6 +372,9 @@ static DwStyleFont* Dw_style_font_new_in Dw_style_font_realize (font, try_all); if (font->font) { +/*fprintf(stderr, "*** new font: %d b%d i%d '%s'\n", + (int) font->size, (int) font->bold, + (int) font->italic, font->name);*/ g_hash_table_insert (fonts_table, font, font); return font; } else { @@ -424,7 +450,10 @@ DwStyleFont* a_Dw_style_font_new_from_li */ static void Dw_style_font_remove (DwStyleFont *font) { - g_hash_table_remove (fonts_table, font); +/*fprintf(stderr, "*** remove font... %d b%d i%d '%s'\n", + (int) font->size, (int) font->bold, + (int) font->italic, font->name);*/ +// g_hash_table_remove (fonts_table, font); g_free (font->name); gdk_font_unref (font->font); g_free (font); diff -pru -x CVS -x configure -x 'aclocal*' -x 'Makefile*' -x config.h.in cvs/di llo/src/dw_style.h dillo/src/dw_style.h --- cvs/dillo/src/dw_style.h 2002-12-29 18:09:52.000000000 +0200 +++ dillo/src/dw_style.h 2003-04-13 14:26:12.000000000 +0300 @@ -122,6 +122,7 @@ DwStyle* a_Dw_style_new GdkWindow *window); DwStyleFont* a_Dw_style_font_new (DwStyleFont *font_attrs); DwStyleFont* a_Dw_style_font_new_from_list (DwStyleFont *font_attrs); +void a_Dw_style_fonts_cleanup (void); DwStyleColor* a_Dw_style_color_new (gint color_val, GdkWindow *window); DwStyleShadedColor* a_Dw_style_shaded_color_new (gint color_val, +#define SUPPORT_FONTS 1 + +#if SUPPORT_FONTS +static const char *strcasestr(const char *haystack, const char *needle) +{ + int needle_len; + + for (needle_len = strlen(needle); *haystack; ++haystack) + if ((*haystack|' ') == (*needle|' ') && + !g_strncasecmp(haystack, needle, needle_len)) return haystack; + return NULL; +} +#endif static void Html_tag_open_font(DilloHtml *html, char *tag, gint tagsize) { #if 1 DwStyle style_attrs, *old_style; - /*DwStyleFont font;*/ +#if SUPPORT_FONTS + DwStyleFont font; + gint level, setsize = 0; +#endif const char *attrbuf; gint32 color; @@ -1792,10 +1817,26 @@ static void Html_tag_open_font(DilloHtml } } -#if 0 - if ((attrbuf = Html_get_attr(html, tag, tagsize, "face"))) { +#if SUPPORT_FONTS + if ((attrbuf = Html_get_attr(html, tag, tagsize, "size"))) { + level = strtol(attrbuf, NULL, 10); + if (level < 0 || *attrbuf == '+') + level += Html_fontsize_to_level(style_attrs.font->size); + setsize = Html_level_to_fontsize(level); + } + + if ((attrbuf = Html_get_attr(html, tag, tagsize, "face")) && + strcasestr(attrbuf, style_attrs.font->name)) + attrbuf = NULL; + + if (attrbuf || (setsize > 0 && setsize != style_attrs.font->size)) { font = *( style_attrs.font ); - font.name = attrbuf; +/* fprintf(stderr, "font '%s'->'%s', %d->%d\n", + font.name, attrbuf, font.size, setsize);*/ + if (attrbuf) + font.name = (char*) attrbuf; + if (setsize > 0) + font.size = setsize; style_attrs.font = a_Dw_style_font_new_from_list (&font); } #endif @@ -4183,6 +4289,9 @@ static void Html_close(DilloHtml *html, a_Progressbar_update(html->bw->progress, NULL, 0); g_free(html); + + /* free unused entries from font cache */ + a_Dw_style_fonts_cleanup(); }

April 16, 2003

Unix domain sockets

by Jorge Arellano Cid

Hi there! This question is for Unix domain sockets savvy guys. When a server that listens on a UDS has started and its socket's filename is removed from the filesystem. Is it notified somehow, maybe with a SIGPIPE signal or something? or not? I ask because when dillo-0.7.2 is out, the old bm_srv12 MUST be removed (but it may remain sleeping in memory when the binary is updated). It'd be good to be able to remove it indirectly by making it react to an 'unlink' call on its socket (well, from this release and on). For the 0.7.1.2 bm_srv12, I'm considering `fuser -k bm_srv12` and a hackish: <dpi cmd='bye' (without the closing ">" an exit(1) is forced!) Anyone? :-) Cheers Jorge.-

April 15, 2003

Re: [Dillo-dev] Full-screen?

by Kelson Vibber

It's a real full-screen mode on my systems, both Linux (Moz 1.3) and Windows (Moz 1.4a). At 11:23 AM 4/15/2003, Melvin Hadasht wrote: >I just checked Mozilla: their "Full Screen" is not a real one: it just shrinks >controls. This was tested on Linux. Kelson Vibber www.hyperborea.org

April 15, 2003

Re: [Dillo-dev] Full-screen?

by Chris Palmer

In my personal version it's "Hide/Show Controls". It made sense to me at the time. :) -- Chris music is what numbers feel like San Francisco, CA

April 15, 2003

Re: [Dillo-dev] Full-screen?

by Melvin Hadasht

Hi Jorge, on Tue, 15 Apr 2003 13:40:56 -0400 (CLT) Jorge Arellano Cid <jcid(a)softhome.net> wrote: > > Hi there, > > Here's a pending question: what to change "full screen on/off" > tooltip for? > > As dillo's controls are called "panel" in dillorc (and it may > be: large, medium or tiny), I'd be for something like: > > "Hide Panel" "Show Panel" > > Is it better than: > > "Full window on" "Full window off" ? > > Maybe some other wording? When changing it, just remember that the wording is also used in the command line option (which is -f, --fullwindow) and that it has to be changed, too. I don't mind if the command line option is to be changed: there is no problem concerning Claws as the code is still in CVS and the next official version is not scheduled yet. I'd be for "Full window" or alike for subjective reasons mainly :), and also because it is not only the panel that is hidden but also the status bar (but that can be seen as part of panel, or maybe that's only an excuse :) ...). I just checked Mozilla: their "Full Screen" is not a real one: it just shrinks controls. This was tested on Linux. Namlala unono (Comoran: Goodbye) -- Melvin Hadasht

April 15, 2003

Re: [Dillo-dev] slashdot site not rendered correctly...

by Jorge Arellano Cid

On Tue, 15 Apr 2003, Thorben Thuermer wrote: > On 14 Apr 2003 19:06:49 +1000 thestar <thestar(a)tpg.com.au> wrote: > > > What's wrong with this site? > > > > http://yro.slashdot.org/yro/02/10/24/1335223.shtml?tid=141 > > incorrectly nested table tags... > download a copy and run it through tidy --force-output 1 > (http://tidy.sf.net) and it's fixed... > > dillo handles incorrect table tags differently than other browsers, > which results in such results on many pages... Please somebody write Slashdot webmasters about it. Cheers Jorge.-

April 15, 2003

Full-screen?

by Jorge Arellano Cid

Hi there, Here's a pending question: what to change "full screen on/off" tooltip for? As dillo's controls are called "panel" in dillorc (and it may be: large, medium or tiny), I'd be for something like: "Hide Panel" "Show Panel" Is it better than: "Full window on" "Full window off" ? Maybe some other wording? I'm open to suggestions. If they come quick they may appear in 0.7.2! Cheers Jorge.-

April 15, 2003

Re: [Dillo-dev] slashdot site not rendered correctly...

by Thorben Thuermer

On 14 Apr 2003 19:06:49 +1000 thestar <thestar(a)tpg.com.au> wrote: > What's wrong with this site? > > http://yro.slashdot.org/yro/02/10/24/1335223.shtml?tid=141 incorrectly nested table tags... download a copy and run it through tidy --force-output 1 (http://tidy.sf.net) and it's fixed... dillo handles incorrect table tags differently than other browsers, which results in such results on many pages... (its not exacly less error-tolerant, but just makes different assumptions)

April 15, 2003

Re: [Dillo-dev] Re: configuration patch - Fix for bugs 386, 407, 392, 412 and notes on bugs 349, 408

by Jorge Arellano Cid

Andreas, > > [...] > > I'm not an expert in tunning the system's directories, but I > > wonder why if /usr/local has part of the system, it is not > > included in the search path in BSDs. Doesn't make sense to me > > (nut I don't know much here). > > All right, in terms of reasoning and well thought systems, > I prefer OpenBSD, hence I did a google search and came across > this lengthy discussion : > > http://www.netsys.com/openbsd-tech/1996/02/msg00019.html > > and follow-ups !!!! Well, from there, it becomes clear that this is not an easy to solve problem... > > OTOH, for instance, /usr/local is not a part of the system in > > Slackware, and I can't find it with: `gcc -print-search-dirs`. > > Actually, I think gcc -print-search-dirs is not the way to find > out about the inclusion of /usr/local - it doesn't show on > any system I have. Try > cpp -v </dev/null > instead. In fact, I think, that should be used in the test > instead of what I submitted earlier ... oh well ;-) I just tested > > ---- start patch ---- > $ cvs diff -c configure.in > cvs diff: failed to open /home/darkstar/andy/.cvspass for reading: No such file or directory > Index: configure.in > =================================================================== > RCS file: /sfhome/cvs/dillo/dillo/configure.in,v > retrieving revision 1.49 > diff -c -r1.49 configure.in > *** configure.in 10 Apr 2003 20:12:44 -0000 1.49 > --- configure.in 10 Apr 2003 23:47:08 -0000 > *************** > *** 28,33 **** > --- 28,38 ---- > AC_PROG_CC > AM_PROG_CC_STDC > AC_PROG_RANLIB > + AC_PROG_CPP > + if test ! "`$CPP -v < /dev/null 2>&1 | grep '/usr/local/include'`" ; then > + CPPFLAGS="$CPPFLAGS -I/usr/local/include" > + LDFLAGS="$LDFLAGS -L/usr/local/lib" > + fi > > dnl ----------------------------------- > dnl Check for Gtk+ (it checks glib too) > > > ---- end patch ---- Commited! > <snip> > > > output. If there is some output, then it assumes there is no > > jpeglib.h. Which is not true in this case: the output is just warning > > of cpp, which complains about the -I/usr/local/include (cpp 3.1 > > already has /usr/local/include it its system directories). > > I think the problem there is a mixup of stdout and stderr. > On one Linux system (Suse), I do get the warning, but it still detects > jpeglib.h > Another system does include /usr/local by default, as well (Archlinux), > but does not give any warning in config.log .... beats me. The /usr/local test should solve the problem, as the compiler complained about the forced inclusion (and order change) of the system's directories. > > Thinking that /usr/local was for extensions, I decided to > > remove the forced include from configure.in. > > > > Can anyone shed some light on this topic? > > Not more that my google results from above. Well, the conditional inclusion (CPP test) is our default way now! I hope it works; at least is passes a lot of tests. Now is time to finish the last details for the 0.7.2 release! Cheers Jorge.-

April 14, 2003