User: stephent Date: 05/09/06 10:24:53 Branch: xemacs/lisp sjt-xft xemacs/lwlib sjt-xft xemacs/src sjt-xft Modified: xemacs/src ChangeLog.Xft console-x-impl.h frame-x.c redisplay-x.c xft-fonts.c Log: Daniel Pittman's efficiency work and some cleanups by stephen. <87ll2afvzy.fsf(a)tleepslib.sk.tsukuba.ac.jp&gt; <87ll2fucw1.fsf(a)rimspace.net&gt; <87zmqs7z2v.fsf(a)rimspace.net&gt; Revision Changes Path 1.1.2.3 +10 -0 XEmacs/xemacs/lisp/Attic/ChangeLog.Xft Index: ChangeLog.Xft =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/Attic/ChangeLog.Xft,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -p -r1.1.2.2 -r1.1.2.3 --- ChangeLog.Xft 2005/08/03 06:09:18 1.1.2.2 +++ ChangeLog.Xft 2005/09/06 08:24:45 1.1.2.3 ＠＠ -1,3 +1,13 ＠＠ +2005-08-17 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * fontconfig.el (fc-try-font): Improve docstring, add todo comment. + (make-fc-pattern): Use defalias, not defun. + +2005-08-04 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * fontconfig.el (make-fc-pattern): Don't add finalizer, now + finalizer is in lrecord implementation. + 2005-08-02 Stephen J. Turnbull <stephen(a)xemacs.org&gt; `fc-list-fonts-pattern-objects' now returns a LISP list. 1.1.2.5 +10 -6 XEmacs/xemacs/lisp/Attic/fontconfig.el Index: fontconfig.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/Attic/fontconfig.el,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -p -r1.1.2.4 -r1.1.2.5 --- fontconfig.el 2005/08/03 06:09:19 1.1.2.4 +++ fontconfig.el 2005/09/06 08:24:45 1.1.2.5 ＠＠ -267,16 +267,20 ＠＠ corresponding Xft font slant constant." (let ((pair (assoc str fc-font-name-weight-mapping-string-reverse))) (if pair (cdr pair)))) -(defun make-fc-pattern () - "Make a Xft pattern record." - (let ((pattern (fc-pattern-create))) - (add-finalizer pattern 'fc-pattern-destroy) - pattern)) +;; #### it might make sense to generalize `make-fc-pattern' by allowing +;; a plist of properties as an optional argument. +;; A LISP-y alias for the pattern constructor function. +(defalias 'make-fc-pattern 'fc-pattern-create) + +;; #### it might make sense to generalize `fc-try-font' by having a +;; global variable that contains a list of font name parsers. They are +;; tried in order, and the first one to return an fc-pattern is matched. + (defun fc-try-font (font &optional device) "Return list of pattern objects matching FONT on DEVICE. -FONT may be a fontconfig pattern object or a string (typically an XLFD). +FONT may be a fontconfig pattern object or a fontconfig font name (a string). Optional DEVICE is the device object to query, defaulting to the currently selected device." (fc-list-fonts-pattern-objects (or device (default-x-device)) 1.1.2.2 +15 -0 XEmacs/xemacs/lwlib/Attic/ChangeLog.Xft Index: ChangeLog.Xft =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/Attic/ChangeLog.Xft,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -p -r1.1.2.1 -r1.1.2.2 --- ChangeLog.Xft 2005/03/15 05:22:25 1.1.2.1 +++ ChangeLog.Xft 2005/09/06 08:24:48 1.1.2.2 ＠＠ -1,3 +1,18 ＠＠ +2005-09-06 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * lwlib-fonts.c (xft_open_font_by_name): Fix heuristic for XLFDs. + + * xlwmenu.c (string_draw_range): Recommend persistent xftDraw. + +2005-09-02 Daniel Pittman <daniel(a)rimspace.net&gt; + + * lwlib-fonts.c (xft_open_font_by_name): Eliminate code to avoid + use of scaled fonts (probably bogus, anyway). Add error message + in case of fatal failure to find any fonts at all. + <87ll2fucw1.fsf(a)rimspace.net&gt; + + * xlwmenu.c (string_draw_range): Plug leak of XftDraw. + 2005-03-09 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * xlwtabs.c (TabsGeometryManager): Fix "fat fingers" mistake. 1.1.2.2 +34 -16 XEmacs/xemacs/lwlib/Attic/lwlib-fonts.c Index: lwlib-fonts.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/Attic/lwlib-fonts.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -p -r1.1.2.1 -r1.1.2.2 --- lwlib-fonts.c 2004/11/25 12:44:05 1.1.2.1 +++ lwlib-fonts.c 2005/09/06 08:24:48 1.1.2.2 ＠＠ -26,6 +26,8 ＠＠ Boston, MA 02111-1307, USA. */ /* Synched up with: Not in GNU Emacs. */ #include <config.h> +#include <stdio.h> +#include <stdlib.h> #include "lwlib-fonts.h" #if 0 ＠＠ -45,7 +47,23 ＠＠ Boston, MA 02111-1307, USA. */ /* helper function to correctly open Xft/core fonts by name #### Can't we use FcParseName here? - #### Is this done so often that the logic needs to be hard-coded in C? */ + #### Is this done so often that the logic needs to be hard-coded in C? + + Daniel Pittman sez: Older code tried to enforce that an XLFD font was + not scaled, while this version just doesn't care. I think that is a + better behavior, since if someone really wants a scaled font we should + oblige them. + + Stephen sez: This whole function was ill-conceived, and I'm not sure it + succeeds at any of the things it attempts to do. First, we should be + using fontconfig directly. I'm not sure what Xft (or fontconfig) will + try to do if passed an XLFD. As for scaled fonts, both options are + equally bad. The problem is that the X server will often scale bitmap + fonts willy-nilly; it's worth trying to avoid that, but I can't say + whether that's worth overriding somebody who knows what they're doing. + In any case, I think we should find out what Xft (fontconfig?) is able + and willing to do with XLFDs, and probably move the logic to LISP. +*/ XftFont * xft_open_font_by_name (Display *dpy, char *name) { ＠＠ -62,29 +80,29 ＠＠ xft_open_font_by_name (Display *dpy, cha pos++; } - if (count < 14 && !(count >= 5 && index (name, '*'))) - /* #### hard-coding DefaultScreen is evil! */ - res = XftFontOpenName (dpy, DefaultScreen (dpy), name); + /* #### hard-coding DefaultScreen is evil! */ + if (count == 14 /* fully-qualified XLFD */ + || (count < 14 /* heuristic for wildcarded XLFD */ + && count >= 5 + && index (name, '*'))) + res = XftFontOpenXlfd (dpy, DefaultScreen (dpy), name); else - { - FcPattern *pat = FcPatternCreate (); - /* This is the magic pattern to open core fonts ... */ - /* Dudes, I love Xft!!! */ - FcPatternAddString (pat, XFT_XLFD, (FcChar8 *) name); - /* #### Is this core fonts, or is this using the core protocol when - Xrender is unavailable? */ - FcPatternAddBool (pat, XFT_CORE, True); - FcPatternAddBool (pat, FC_SCALABLE, False); - res = XftFontOpenPattern (dpy, pat); - } + res = XftFontOpenName (dpy, DefaultScreen (dpy), name); + + /* Try for a generic monospace font + #### Why? Menus don't need to line up in columns! */ + if (!res) + res = XftFontOpenName (dpy, DefaultScreen (dpy), "monospace"); + /* Try for anything we can get */ if (!res) - /* this is our last try ... */ res = XftFontOpenName (dpy, DefaultScreen (dpy), ""); if (!res) { /* #### This is Just So Wrong ... ! */ /* sorry folks ... */ + fprintf (stderr, + "Unable to find any usable XFT font, even the defaults!\n"); abort (); return 0; } 1.37.2.3 +3 -0 XEmacs/xemacs/lwlib/xlwmenu.c Index: xlwmenu.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwmenu.c,v retrieving revision 1.37.2.2 retrieving revision 1.37.2.3 diff -u -p -r1.37.2.2 -r1.37.2.3 --- xlwmenu.c 2004/12/10 06:43:25 1.37.2.2 +++ xlwmenu.c 2005/09/06 08:24:48 1.37.2.3 ＠＠ -879,6 +879,7 ＠＠ string_draw_range ( Visual *visual = DefaultVisualOfScreen (XtScreen (mw)); Colormap cmap = mw->core.colormap; XftFont *renderFont = mw->menu.renderFont; + /* #### should use parent frame's .xftDraw? */ XftDraw *xftDraw = XftDrawCreate (display, window, visual, cmap); /* draw background rect */ XftDrawRect (xftDraw, colorBg, ＠＠ -894,6 +895,8 ＠＠ string_draw_range ( XftTextExtents8 (display, renderFont, &string[start], end - start, &glyphinfo); + /* #### should use parent frame's .xftDraw */ + XftDrawDestroy (xftDraw); return glyphinfo.xOff; } #else 1.1.2.7 +30 -0 XEmacs/xemacs/src/Attic/ChangeLog.Xft Index: ChangeLog.Xft =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/ChangeLog.Xft,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -u -p -r1.1.2.6 -r1.1.2.7 --- ChangeLog.Xft 2005/08/03 06:09:32 1.1.2.6 +++ ChangeLog.Xft 2005/09/06 08:24:50 1.1.2.7 ＠＠ -1,3 +1,33 ＠＠ +2005-09-06 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * console-x-impl.h (struct x_frame): Rewrite comment. + + * redisplay-x.c (x_output_string): + * frame-x.c (x_delete_frame): + Improve style, let compiler optimize. + +2005-09-05 Daniel Pittman <daniel(a)rimspace.net&gt; + + * console-x-impl.h (struct x_frame): New member xftDraw. + (FRAME_X_XFTDRAW): Accessor for xftDraw member. + + * redisplay-x.c (x_output_string): Lazily initialize frame's + xftDraw member, and don't destroy it here. + + * frame-x.c (x_delete_frame): Destroy xftDraw here. + +2005-08-17 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * xft-fonts.c (Ffc_pattern_create): Improve docstring, remove todo. + (fc_intern): Add todo. + +2005-08-04 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * xft-fonts.c (finalize_fc_pattern): New static function. + Add it to lcrecord implementation of fc_pattern. + + * xft-fonts.c (Ffc_pattern_destroy): Disable with #if 0. + 2005-08-03 Stephen J. Turnbull <stephen(a)xemacs.org&gt; -- Minor cleanups. -- 1.3.2.1 +15 -0 XEmacs/xemacs/src/console-x-impl.h Index: console-x-impl.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-x-impl.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -p -r1.3 -r1.3.2.1 --- console-x-impl.h 2004/11/04 23:06:18 1.3 +++ console-x-impl.h 2005/09/06 08:24:51 1.3.2.1 ＠＠ -290,6 +290,17 ＠＠ struct x_frame #endif /* XIM_XLIB */ #endif /* HAVE_XIM */ +#ifdef USE_XFT + /* The Xft Drawable wrapper for this device. + #### Should this be per-device, or per-frame? */ + /* This is persistent to take advantage of the ability of Xft's glyph + cache in the server, and avoid rendering the font again and again... + + This is created the first time through redisplay, and destroyed when our + connection to the X display is destroyed. */ + XftDraw *xftDraw; +#endif + /* 1 if the frame is completely visible on the display, 0 otherwise. if 0 the frame may have been iconified or may be totally or partially hidden by another X window */ ＠＠ -338,6 +349,10 ＠＠ struct x_frame #endif /* HAVE_TOOLBARS */ #define FRAME_X_GEOM_FREE_ME_PLEASE(f) (FRAME_X_DATA (f)->geom_free_me_please) + +#ifdef USE_XFT +#define FRAME_X_XFTDRAW(f) (FRAME_X_DATA (f)->xftDraw) +#endif #define FRAME_X_TOTALLY_VISIBLE_P(f) (FRAME_X_DATA (f)->totally_visible_p) #define FRAME_X_TOP_LEVEL_FRAME_P(f) (FRAME_X_DATA (f)->top_level_frame_p) 1.68.2.7 +13 -0 XEmacs/xemacs/src/frame-x.c Index: frame-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-x.c,v retrieving revision 1.68.2.6 retrieving revision 1.68.2.7 diff -u -p -r1.68.2.6 -r1.68.2.7 --- frame-x.c 2005/07/13 04:46:45 1.68.2.6 +++ frame-x.c 2005/09/06 08:24:51 1.68.2.7 ＠＠ -2613,6 +2613,19 ＠＠ x_delete_frame (struct frame *f) DtDndDropUnregister (FRAME_X_TEXT_WIDGET (f)); #endif /* HAVE_CDE */ +#ifdef USE_XFT + /* If we have an XftDraw structure, we need to free it here. + We can't ever have an XftDraw without a Display, so we are safe + to free it in here, and we avoid too much playing around with the + malloc checking hooks this way. */ + if (FRAME_X_XFTDRAW (f)) + { + XftDrawDestroy (FRAME_X_XFTDRAW (f)); + FRAME_X_XFTDRAW (f) = NULL; + } +#endif + + assert (FRAME_X_SHELL_WIDGET (f) != 0); dpy = XtDisplay (FRAME_X_SHELL_WIDGET (f)); 1.39.2.6 +7 -4 XEmacs/xemacs/src/redisplay-x.c Index: redisplay-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-x.c,v retrieving revision 1.39.2.5 retrieving revision 1.39.2.6 diff -u -p -r1.39.2.5 -r1.39.2.6 --- redisplay-x.c 2005/03/15 05:24:42 1.39.2.5 +++ redisplay-x.c 2005/09/06 08:24:51 1.39.2.6 ＠＠ -937,10 +937,14 ＠＠ x_output_string (struct window *w, struc Colormap cmap = DEVICE_X_COLORMAP (d); Visual *visual = DEVICE_X_VISUAL (d); static XftColor fg, bg; - /* We probably want to cache that, but how and where? */ - /* Move it to frame-impl.h, Dude! XXX */ - XftDraw *xftDraw = XftDrawCreate (dpy, x_win, visual, cmap); + XftDraw *xftDraw; + /* Lazily initialize frame's xftDraw member. */ + if (!FRAME_X_XFTDRAW (f)) { + FRAME_X_XFTDRAW (f) = XftDrawCreate (dpy, x_win, visual, cmap); + } + xftDraw = FRAME_X_XFTDRAW (f); + /* #### This will probably cause asserts when passed a Lisp integer for a color. See ca. line 759 this file. #### Maybe xft_convert_color should take an XColor, not a pixel. */ ＠＠ -1464,7 +1468,6 ＠＠ x_output_string (struct window *w, struc } #ifdef USE_XFT - XftDrawDestroy (xftDraw); #undef XFT_FROB_LISP_COLOR #endif 1.1.2.14 +25 -6 XEmacs/xemacs/src/Attic/xft-fonts.c Index: xft-fonts.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/xft-fonts.c,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -u -p -r1.1.2.13 -r1.1.2.14 --- xft-fonts.c 2005/08/03 06:09:32 1.1.2.13 +++ xft-fonts.c 2005/09/06 08:24:52 1.1.2.14 ＠＠ -86,13 +86,24 ＠＠ Fixnum debug_xft; /* Set to 1 enables l * FcPattern objects * ****************************************************************/ +static void +finalize_fc_pattern (void *header, int UNUSED (for_disksave)) +{ + struct fc_pattern *p = (struct fc_pattern *) header; + if (p->fcpatPtr) + { + FcPatternDestroy (p->fcpatPtr); + p->fcpatPtr = 0; + } +} + static const struct memory_description fcpattern_description [] = { /* #### nothing here, is this right?? */ { XD_END } }; DEFINE_LRECORD_IMPLEMENTATION("fc-pattern", fc_pattern, - 0, 0, 0, 0, 0, 0, + 0, 0, 0, finalize_fc_pattern, 0, 0, fcpattern_description, struct fc_pattern); ＠＠ -147,6 +158,9 ＠＠ static FcChar8 *fc_standard_properties[] static struct hash_table *fc_property_name_hash_table; +/* #### Maybe fc_intern should be exposed to LISP? The idea is that + fc-pattern-add could warn or error if the property isn't interned. */ + static FcChar8 * fc_intern (Lisp_Object property) { ＠＠ -175,7 +189,7 ＠＠ Returns t if OBJECT is of type fc-patter } DEFUN("fc-pattern-create", Ffc_pattern_create, 0, 0, 0, /* -Create a fresh and empty fc-pattern object. +Return a new, empty fc-pattern object. */ ()) { ＠＠ -202,7 +216,7 ＠＠ Parse an Fc font name and return its rep alloc_lcrecord_type (struct fc_pattern, &lrecord_fc_pattern); #endif - CHECK_STRING(name); + CHECK_STRING(name); /* #### MEMORY LEAK!! maybe not ... */ fcpat->fcpatPtr = FcNameParse (extract_fcapi_string (name)); return wrap_fcpattern(fcpat); ＠＠ -474,7 +488,8 ＠＠ Xft v.2: encoding, charwidth, charheigh } } -#if 1 +#if 0 +/* #### delete this after some testing!! don't forget the DEFSUBR */ /* #### This is a big mistake, no? --- crap, there's no implicit finalizer */ DEFUN("fc-pattern-destroy", Ffc_pattern_destroy, 1, 1, 0, /* Explicitly deallocate a fc pattern object PATTERN. */ ＠＠ -511,7 +526,7 ＠＠ given pattern, or an error code. Possib #else alloc_lcrecord_type (struct fc_pattern, &lrecord_fc_pattern); #endif - CHECK_FCPATTERN(pattern); + CHECK_FCPATTERN(pattern); /* #### MEMORY LEAKS!!! */ if (NILP(device)) return Qnil; CHECK_X_DEVICE(device); ＠＠ -629,6 +644,8 ＠＠ match other font-listing APIs. */ } } +/* #### this actually is an Xft function, should split those out + or get rid of them entirely? */ /* #### be consistent about argument order. */ DEFUN("fc-font-real-pattern", Ffc_font_real_pattern, 2, 2, 0, /* Temporarily open FONTNAME (a string) and return the actual ＠＠ -645,7 +662,7 ＠＠ fc pattern matched by the Fc library. */ alloc_lcrecord_type (struct fc_pattern, &lrecord_fc_pattern); #endif - CHECK_STRING (fontname); + CHECK_STRING (fontname); /* #### MEMORY LEAK?! maybe not ... */ if (NILP(xdevice)) return Qnil; CHECK_X_DEVICE (xdevice); ＠＠ -828,7 +845,9 ＠＠ syms_of_xft_fonts (void) DEFSUBR(Ffc_pattern_add); DEFSUBR(Ffc_pattern_del); DEFSUBR(Ffc_pattern_get); +#if 0 DEFSUBR(Ffc_pattern_destroy); +#endif DEFSUBR(Ffc_list_fonts_pattern_objects); DEFSUBR(Ffc_font_sort); DEFSUBR(Ffc_font_match);