Commit: f7fae490993a405e1f0c722798058931cd90749a - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• Revision: f7fae490993a405e1f0c722798058931cd90749a (tree)
• Time: 2002-11-03 13:56:15
• Author: John Harper <jsh@src....>
• Commiter: John Harper

Log Message

merged font changes from HEAD

Change Summary

• modified: ChangeLog
• modified: Makedefs.in
• modified: configure.in
• modified: src/ChangeLog
• modified: src/fonts.c
• modified: src/frames.c
• modified: src/functions.c
• modified: src/sawmill.h
• modified: src/sawmill_subrs.h

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
[phone]  John Harper  <[e-mail]>
+
+	* configure.in, config.h.in, Makedefs.in: check for Xft
+	libraries and headers (merged from HEAD)
+
 2002-09-26  Stanislav Brabec  <[e-mail]>
 
 	* po/cs.po: Updated Czech translation from Miloslav Trmac

--- a/Makedefs.in
+++ b/Makedefs.in
@@ -54,7 +54,7 @@ LIBS=@LIBS@
 LIBOBJS=
 X11_CFLAGS=@X_CFLAGS@
 X11_LIBS=@X_PRE_LIBS@ -lX11 @X_LIBS@ @X_EXTRA_LIBS@
-EXTRA_X11_LIBS=@XINERAMA_LIBS@ -lXext
+EXTRA_X11_LIBS=@XINERAMA_LIBS@ @XFT_LIBS@ -lXext
 IMLIB_CFLAGS=@IMLIB_CFLAGS@
 IMLIB_LIBS=@IMLIB_LIBS@
 GDK_PIXBUF_CFLAGS=@GDK_PIXBUF_CFLAGS@

--- a/configure.in
+++ b/configure.in
@@ -98,6 +98,13 @@ AC_CHECK_LIB(Xinerama, XineramaQueryScreens,
 	      AC_CHECK_HEADERS(X11/extensions/Xinerama.h)],
 	     [],[$X_LIBS -lX11 -lXext])
 
+XFT_LIBS=""
+AC_SUBST(XFT_LIBS)
+AC_CHECK_LIB(Xft, XftDrawCreate,
+	     [XFT_LIBS="-lXft -lXrender"
+	     AC_CHECK_HEADERS(X11/Xft/Xft.h)],
+	     [], [$X_LIBS -lX11 -lXext])
+
 CPPFLAGS="${_cppflags}"
 
 dnl Check for librep

--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,34 @@
[phone]  John Harper  <[e-mail]>
+
+	* merged font changes from HEAD:
+
+	2002-11-02  John Harper  <[e-mail]>
+
+	* fonts.c, sawmill.h: different font rendering methods are now
+	better abstracted, using the Lisp_Font_Class structure
+
+	(get-font-typed, font-type-exists-p, font-type): new functions,
+	allows a font to be loaded from a type+name combination,
+	instead of just a name, which may be ambiguous when multiple
+	renderers are being used
+
+	Current types are "xlfd" for traditional X fonts, and "Xft" for
+	Xft client-side rendered fonts. The old get-font function
+	always tries to load xlfd fonts, for backwards compatibility
+
+	For now, Xft fonts can be used like this:
+
+	(when (and (boundp 'font-type-exists-p)
+		   (font-type-exists-p "Xft"))
+	  (setq default-font (get-font-typed "Xft" "Trebuchet MS-11")))
+
+	2002-11-02  John Harper  <[e-mail]>
+
+	* fonts.c (x_draw_string): now takes an explicit foreground
+	color parameter, instead of using the one in the gc
+
+	* x.c, sawmill_subrs.h, functions.c, frames.c: updated callers
+
 2002-10-20  John Harper  <[e-mail]>
 
 	* more merging:

--- a/src/fonts.c
+++ b/src/fonts.c
@@ -42,13 +42,80 @@
 #include <X11/Xlocale.h>
 #include <ctype.h>
 
+#ifdef HAVE_X11_XFT_XFT_H
+# include <X11/Xft/Xft.h>
+#endif
+
 static Lisp_Font *font_list;
 int font_type;
 
 DEFSYM(default_font, "default-font");
 
+struct Lisp_Font_Class_struct {
+    const char *type;
+    bool (*load) (Lisp_Font *f);
+    void (*finalize) (Lisp_Font *f);
+    int (*measure) (Lisp_Font *f, u_char *string, size_t length);
+    void (*draw) (Lisp_Font *f, u_char *string, size_t length,
+		  Window id, GC gc, Lisp_Color *fg, int x, int y);
+};
+
+
+/* Xlib font structs */
+
+static bool
+fontstruct_load (Lisp_Font *f)
+{
+    XFontStruct *font_struct;
+
+    font_struct = XLoadQueryFont (dpy, rep_STR (f->name));
+
+    if (font_struct == 0)
+	return FALSE;
+
+    f->font = font_struct;
+    f->ascent = font_struct->ascent;
+    f->descent = font_struct->descent;
+
+    return TRUE;
+}
+
+static void
+fontstruct_finalize (Lisp_Font *f)
+{
+    XFreeFont (dpy, f->font);
+}
+
+static int
+fontstruct_measure (Lisp_Font *f, u_char *string, size_t length)
+{
+    return XTextWidth (f->font, string, length);
+}
+
+static void
+fontstruct_draw (Lisp_Font *f, u_char *string, size_t length,
+		 Window id, GC gc, Lisp_Color *fg, int x, int y)
+{
+    XFontStruct *fs;
+    XGCValues gcv;
+
+    fs = f->font;
+
+    gcv.foreground = fg->pixel;
+    gcv.font = fs->fid;
+    XChangeGC (dpy, gc, GCForeground | GCFont, &gcv);
+
+    XDrawString (dpy, id, gc, x, y, string, length);
+}
+
+static const Lisp_Font_Class fontstruct_class = {
+    "xlfd",
+    fontstruct_load, fontstruct_finalize,
+    fontstruct_measure, fontstruct_draw,
+};
+
 
-/* XLFD pattern matching */
+/* Xlib font sets */
 
 static char *
 xlfd_get_element (const char *xlfd, int idx)
@@ -111,7 +178,7 @@ generalize_xlfd (const char *xlfd)
 }
 
 static XFontSet
-x_create_font_set (char *xlfd, char ***missing,
+x_create_fontset (char *xlfd, char ***missing,
 		   int *nmissing, char **def_string)
 {
     XFontSet fs = XCreateFontSet (dpy, xlfd, missing, nmissing, def_string);
@@ -171,11 +238,8 @@ x_create_font_set (char *xlfd, char ***missing,
     return fs;
 }
 
-
-/* font creation */
-
-static void *
-get_font_set (const char *name, int *typep, int *ascentp, int *descentp)
+static bool
+fontset_load (Lisp_Font *f)
 {
     XFontSet font_set;
     int ascent, descent;
@@ -183,10 +247,10 @@ get_font_set (const char *name, int *typep, int *ascentp, int *descentp)
     char **missing_charset_list, *def_string;
     int num_missing_charset_list;
 
-    font_set = x_create_font_set (rep_STR(name),
-				  &missing_charset_list,
-				  &num_missing_charset_list,
-				  &def_string);
+    font_set = x_create_fontset (rep_STR (f->name),
+				 &missing_charset_list,
+				 &num_missing_charset_list,
+				 &def_string);
 
     if (font_set != 0)
     {
@@ -194,15 +258,17 @@ get_font_set (const char *name, int *typep, int *ascentp, int *descentp)
 	char **font_names;
 	int i, j, num_fonts;
 
+	f->font = font_set;
+
 	num_fonts = XFontsOfFontSet (font_set, &fstrs, &font_names);
 	ascent = descent = 0;
 
 	for (i = 0; i < num_fonts; i++)
 	{
 	    if (fstrs[i]->ascent > ascent)
-		ascent = fstrs[i]->ascent;
+		f->ascent = fstrs[i]->ascent;
 	    if (fstrs[i]->descent > descent)
-		descent = fstrs[i]->descent;
+		f->descent = fstrs[i]->descent;
 	}
 
 	if (num_missing_charset_list > 0)
@@ -213,89 +279,242 @@ get_font_set (const char *name, int *typep, int *ascentp, int *descentp)
 	    XFreeStringList (missing_charset_list);
 	}
 
-	*typep = FF_FONT_SET;
-	*ascentp = ascent;
-	*descentp = descent;
+	return TRUE;
     }
 
-    return font_set;
+    return FALSE;
 }
 
-static void *
-get_font_struct (const char *name, int *typep, int *ascentp, int *descentp)
+static void
+fontset_finalize (Lisp_Font *f)
 {
-    XFontStruct *font_struct;
+    XFreeFontSet (dpy, f->font);
+}
 
-    font_struct = XLoadQueryFont (dpy, name);
+static int
+fontset_measure (Lisp_Font *f, u_char *string, size_t length)
+{
+    return XmbTextEscapement (f->font, string, length);
+}
 
-    if (font_struct != 0)
-    {
-	*typep = FF_FONT_STRUCT;
-	*ascentp = font_struct->ascent;
-	*descentp = font_struct->descent;
-    }
+static void
+fontset_draw (Lisp_Font *f, u_char *string, size_t length,
+	      Window id, GC gc, Lisp_Color *fg, int x, int y)
+{
+    XGCValues gcv;
+
+    gcv.foreground = fg->pixel;
+    XChangeGC (dpy, gc, GCForeground, &gcv);
 
-    return font_struct;
+    XmbDrawString (dpy, id, f->font, gc, x, y, string, length);
 }
 
+static const Lisp_Font_Class fontset_class = {
+    "xlfd",
+    fontset_load, fontset_finalize,
+    fontset_measure, fontset_draw,
+};
+
 
+/* Xft fonts */
 
-DEFUN("get-font", Fget_font, Sget_font, (repv name), rep_Subr1) /*
-::doc:sawfish.wm.fonts#get-font::
-get-font NAME
+#ifdef HAVE_X11_XFT_XFT_H
 
-Return the font object representing the font named NAME (a standard X
-font specifier string).
+static bool
+xft_load (Lisp_Font *f)
+{
+    XftFont *xft_font;
+
+    xft_font = XftFontOpenName (dpy, screen_num, rep_STR (f->name));
+
+    if (xft_font == 0)
+	return FALSE;
+
+    f->font = xft_font;
+    f->ascent = xft_font->ascent;
+    f->descent = xft_font->descent;
+
+    return TRUE;
+}
+
+static void
+xft_finalize (Lisp_Font *f)
+{
+    XftFontClose (dpy, f->font);
+}
+
+static int
+xft_measure (Lisp_Font *f, u_char *string, size_t length)
+{
+    XGlyphInfo info;
+
+    XftTextExtents8 (dpy, f->font, string, length, &info);
+
+    return info.xOff; 
+}
+
+static void
+xft_draw (Lisp_Font *f, u_char *string, size_t length,
+	  Window id, GC gc, Lisp_Color *fg, int x, int y)
+{
+    static XftDraw *draw;
+
+    XftColor xft_color;
+
+    if (draw == 0)
+	draw = XftDrawCreate (dpy, id, image_visual, image_cmap);
+    else
+	XftDrawChange (draw, id);
+
+    xft_color.pixel = fg->pixel;
+    xft_color.color.red = fg->red;
+    xft_color.color.green = fg->green;
+    xft_color.color.blue = fg->blue;
+    xft_color.color.alpha = 65535;	/* FIXME: */
+
+    XftDrawString8 (draw, &xft_color, f->font,
+		    x, y, string, length);
+}
+
+static const Lisp_Font_Class xft_class = {
+    "Xft",
+    xft_load, xft_finalize,
+    xft_measure, xft_draw,
+};
+
+#endif /* HAVE_X11_XFT_XFT_H */
+
+
+/* All classes */
+
+static const Lisp_Font_Class *classes[] = {
+    &fontstruct_class,
+    &fontset_class,
+#ifdef HAVE_X11_XFT_XFT_H
+    &xft_class,
+#endif
+    0,
+};
+
+
+/* Entry points */
+
+DEFUN ("font-type-exists-p", Ffont_type_exists_p,
+       Sfont_type_exists_p, (repv type), rep_Subr1) /*
+::doc:sawfish.wm.fonts#font-type-exists-p::
+font-type-exists-p TYPE
+
+Returns true if fonts with the type described by the string TYPE can be
+loaded.
+::end:: */
+{
+    int i;
+
+    rep_DECLARE1 (type, rep_STRINGP);
+
+    for (i = 0; classes[i] != 0; i++)
+    {
+	if (strcasecmp (rep_STR (type), classes[i]->type) == 0)
+	    return Qt;
+    }
+
+    return Qnil;
+}
+
+DEFUN("get-font-typed", Fget_font_typed, Sget_font_typed,
+      (repv type, repv name), rep_Subr2) /*
+::doc:sawfish.wm.fonts#get-font-typed::
+get-font-typed TYPE NAME
+
+Return the font object representing the font named NAME. NAME is
+interpreted based on the value of the string TYPE.
 ::end:: */
 {
     Lisp_Font *f;
+    const Lisp_Font_Class *class;
+    repv tem;
+    int i;
+
     rep_DECLARE1(name, rep_STRINGP);
+    rep_DECLARE2(type, rep_STRINGP);
 
     if (dpy == 0)
 	return Qnil;
 
-    f = font_list;
-    while (f != 0 && strcmp (rep_STR(name), rep_STR(f->name)) != 0)
-	f = f->next;
-
-    if (f == 0)
+    for (f = font_list; f != NULL; f = f->next)
     {
-	repv tem = global_symbol_value (Qfonts_are_fontsets);
-
-	void *font = 0;
-	int type = -1;
-	int ascent, descent;
-
-	if (font == 0 && tem != Qnil)
+	if (strcmp (rep_STR(name), rep_STR(f->name)) == 0
+	    && strcmp (rep_STR (type), rep_STR (f->name)) == 0)
 	{
-	    font = get_font_set (rep_STR(name), &type, &ascent, &descent);
+	    return rep_VAL (f);
 	}
+    }
 
-	if (font == 0)
-	{
-	    font = get_font_struct (rep_STR(name), &type, &ascent, &descent);
-	}
+    class = 0;
 
-	if (font == 0)
+    if (strcasecmp (rep_STR (type), "xlfd") == 0)
+    {
+	/* Boring old X core fonts */
+
+	tem = global_symbol_value (Qfonts_are_fontsets);
+	if (tem != Qnil)
+	    class = &fontset_class;
+	else
+	    class = &fontstruct_class;
+    }
+    else
+    {
+	for (i = 0; classes[i] != 0; i++)
 	{
-	    return Fsignal (Qerror, rep_list_2 (rep_string_dup ("no such font"), name));
+	    if (strcasecmp (rep_STR (type), classes[i]->type) == 0)
+	    {
+		class = classes[i];
+		break;
+	    }
 	}
+    }
 
-	f = rep_ALLOC_CELL(sizeof(Lisp_Font));
-	rep_data_after_gc += sizeof (Lisp_Font);
+    if (class == 0)
+    {
+	DEFSTRING (err, "unknown font type");
+	return Fsignal (Qerror, rep_list_2 (rep_VAL (&err), type));
+    }
+	
+    f = rep_ALLOC_CELL(sizeof(Lisp_Font));
 
-	f->next = font_list;
-	font_list = f;
+    f->car = font_type;
+    f->class = class;
+    f->type = type;
+    f->name = name;
+    f->plist = Qnil;
 
-	f->car = font_type | type;
-	f->name = name;
-	f->font = font;
-	f->plist = Qnil;
-	f->ascent = ascent;
-	f->descent = descent;
+    if (!(*class->load) (f))
+    {
+	DEFSTRING (err, "unknown font");
+
+	rep_FREE_CELL (f);
+	return Fsignal (Qerror, rep_list_2 (rep_VAL (&err), name));
     }
 
-    return rep_VAL(f);
+    rep_data_after_gc += sizeof (Lisp_Font);
+
+    f->next = font_list;
+    font_list = f;
+
+    return rep_VAL (f);
+}
+
+DEFUN("get-font", Fget_font, Sget_font, (repv name), rep_Subr1) /*
+::doc:sawfish.wm.fonts#get-font::
+get-font NAME
+
+Return the font object representing the font named NAME (a standard X
+font specifier string).
+::end:: */
+{
+    DEFSTRING (type, "xlfd");
+
+    return Fget_font_typed (rep_VAL (&type), name);
 }
 
 DEFUN("font-get", Ffont_get, Sfont_get, (repv win, repv prop), rep_Subr2) /*
@@ -348,6 +567,17 @@ Set the property PROPERTY (a symbol) associated with FONT to VALUE.
     return val;
 }
 
+DEFUN("font-type", Ffont_type, Sfont_type, (repv font), rep_Subr1) /*
+::doc:sawfish.wm.fonts#font-type::
+font-type FONT
+
+Return the type of the font represented by the font object FONT.
+::end:: */
+{
+    rep_DECLARE1(font, FONTP);
+    return VFONT(font)->type;
+}
+
 DEFUN("font-name", Ffont_name, Sfont_name, (repv font), rep_Subr1) /*
 ::doc:sawfish.wm.fonts#font-name::
 font-name FONT
@@ -372,36 +602,16 @@ Return t if ARG is a font object.
 int
 x_text_width (repv font, u_char *string, size_t len)
 {
-    switch (FONT_TYPE (font))
-    {
-    case FF_FONT_STRUCT:
-	return XTextWidth (VFONT(font)->font, string, len);
-
-    case FF_FONT_SET:
-	return XmbTextEscapement (VFONT(font)->font, string, len);
-	
-    default:
-	return 0;
-    }
+    return (*VFONT (font)->class->measure) (VFONT (font), string, len);
 }
 
+/* The foreground pixel of GC is undefined after this function returns. */
 void
-x_draw_string (Window id, repv font, GC gc,
+x_draw_string (Window id, repv font, GC gc, Lisp_Color *fg_color,
 	       int x, int y, u_char *string, size_t len)
 {
-    switch (FONT_TYPE (font))
-    {
-    case FF_FONT_STRUCT: {
-	XFontStruct *fs = VFONT(font)->font;
-
-	XSetFont (dpy, gc, fs->fid);
-	XDrawString (dpy, id, gc, x, y, string, len);
-	break; }
-
-    case FF_FONT_SET:
-	XmbDrawString (dpy, id, VFONT(font)->font, gc, x, y, string, len);
-	break;
-    }
+    return (*VFONT (font)->class->draw) (VFONT (font), string, len,
+					 id, gc, fg_color, x, y);
 }
 
 DEFUN("text-width", Ftext_width, Stext_width, (repv string, repv font), rep_Subr2) /*
@@ -475,13 +685,15 @@ static void
 font_prin (repv stream, repv obj)
 {
     char buf[256];
-    sprintf (buf, "#<font %s>", rep_STR(VFONT(obj)->name));
+    sprintf (buf, "#<font %s:%s>",
+	     rep_STR(VFONT(obj)->type), rep_STR(VFONT(obj)->name));
     rep_stream_puts (stream, buf, -1, FALSE);
 }
 
 static void
 font_mark (repv obj)
 {
+    rep_MARKVAL(VFONT(obj)->type);
     rep_MARKVAL(VFONT(obj)->name);
     rep_MARKVAL(VFONT(obj)->plist);
 }
@@ -494,18 +706,10 @@ font_sweep (void)
     while (w != 0)
     {
 	Lisp_Font *next = w->next;
+
 	if (!rep_GC_CELL_MARKEDP(rep_VAL(w)))
 	{
-	    switch (FONT_TYPE (rep_VAL (w)))
-	    {
-	    case FF_FONT_STRUCT:
-		XFreeFont (dpy, w->font);
-		break;
-
-	    case FF_FONT_SET:
-		XFreeFontSet (dpy, w->font);
-		break;
-	    }
+	    (*w->class->finalize) (w);
 	    rep_FREE_CELL(w);
 	}
 	else
@@ -528,9 +732,13 @@ fonts_init (void)
     font_type = rep_register_new_type ("font", font_cmp, font_prin, font_prin,
 				       font_sweep, font_mark,
 				       0, 0, 0, 0, 0, 0, 0);
+
+    rep_ADD_SUBR(Sfont_type_exists_p);
+    rep_ADD_SUBR(Sget_font_typed);
     rep_ADD_SUBR(Sget_font);
     rep_ADD_SUBR(Sfont_get);
     rep_ADD_SUBR(Sfont_put);
+    rep_ADD_SUBR(Sfont_type);
     rep_ADD_SUBR(Sfont_name);
     rep_ADD_SUBR(Sfontp);
     rep_ADD_SUBR(Stext_width);
@@ -541,10 +749,13 @@ fonts_init (void)
     rep_INTERN_SPECIAL(default_font);
     if (!batch_mode_p ())
     {
-	repv font = Fget_font (rep_string_dup("fixed"));
+	DEFSTRING (type, "xlfd");
+	DEFSTRING (name, "fixed");
+
+	repv font = Fget_font_typed (rep_VAL (&type), rep_VAL (&name));
 	if (font == rep_NULL || !FONTP(font))
 	{
-	    fputs ("can't load fixed font during initialisation", stderr);
+	    fputs ("can't load 'fixed' font during initialisation", stderr);
 	    rep_throw_value = rep_NULL;
 	    font = Qnil;
 	}

--- a/src/frames.c
+++ b/src/frames.c
@@ -658,8 +658,6 @@ set_frame_part_fg (struct frame_part *fp)
 {
     int state = current_state (fp);
     repv font = fp->font[state], fg = fp->fg[state];
-    XGCValues gcv;
-    u_long gcv_mask = 0;
     repv string = rep_NULL;
     int length = 0, width, height, x, y;
     Lisp_Window *win = fp->win;
@@ -743,6 +741,8 @@ set_frame_part_fg (struct frame_part *fp)
 
 	if (IMAGEP(fg))
 	{
+	    XGCValues gcv;
+	    u_long gcv_mask = 0;
 	    Pixmap fg_pixmap, fg_mask;
 
 	    if (fp->drawn.fg == fg
@@ -816,14 +816,8 @@ set_frame_part_fg (struct frame_part *fp)
 		set_frame_part_bg (fp);
 	    }
 
-	    if (COLORP(fg))
-	    {
-		gcv.foreground = VCOLOR(fg)->pixel;
-		gcv_mask |= GCForeground;
-	    }
-
-	    XChangeGC (dpy, fp->gc, gcv_mask, &gcv);
-	    x_draw_string (fp->id, font, fp->gc, x, y + VFONT(font)->ascent,
+	    x_draw_string (fp->id, font, fp->gc, VCOLOR(fg),
+			   x, y + VFONT(font)->ascent,
 			   rep_STR(string), length);
 
 	    fp->drawn.text = string;

--- a/src/functions.c
+++ b/src/functions.c
@@ -1041,10 +1041,9 @@ refresh_message_window ()
 	char *ptr;
 	int row = 0;
 
-	values.foreground = VCOLOR(message.fg)->pixel;
 	values.background = VCOLOR(message.bg)->pixel;
 	values.graphics_exposures = False;
-	mask = GCForeground | GCBackground | GCGraphicsExposures;
+	mask = GCBackground | GCGraphicsExposures;
 
 	if (message.gc == 0)
 	    message.gc = XCreateGC (dpy, message_win, mask, &values);
@@ -1071,7 +1070,7 @@ refresh_message_window ()
 		    offset = (message.width - width) / 2;
 	    }
 	    x_draw_string (message_win, message.font,
-			   message.gc, offset,
+			   message.gc, VCOLOR(message.fg), offset,
 			   MSG_PAD_Y
 			   + row * (VFONT(message.font)->ascent
 				    + VFONT(message.font)->descent

--- a/src/sawmill.h
+++ b/src/sawmill.h
@@ -1,5 +1,5 @@
 /* sawmill.h -- Main include file, brings in all the rest
-   $Id: sawmill.h,v 1.2 1999/07/25 15:02:21 john Exp
+   $Id$
 
    Copyright (C) 1999 John Harper <[e-mail]>
 
@@ -168,10 +168,14 @@ typedef struct lisp_window {
 #define WINDOW_FOCUSED_P(w) (focus_window == w)
 #define WINDOW_IS_GONE_P(w) (w->id == 0)
 
+typedef struct Lisp_Font_Class_struct Lisp_Font_Class;
+
 /* An allocated font */
 typedef struct lisp_font {
     repv car;
     struct lisp_font *next;
+    const Lisp_Font_Class *class;
+    repv type;
     repv name;
     void *font;
     repv plist;
@@ -181,14 +185,6 @@ typedef struct lisp_font {
 #define FONTP(v)	rep_CELL16_TYPEP(v, font_type)
 #define VFONT(v)	((Lisp_Font *)rep_PTR(v))
 
-#define FF_FONT_SET	(0 << (rep_CELL16_TYPE_BITS + 0))
-#define FF_FONT_STRUCT	(1 << (rep_CELL16_TYPE_BITS + 0))
-#define FF_FONT_MASK	(3 << (rep_CELL16_TYPE_BITS + 0))
-
-#define FONT_TYPE(v)	(VFONT(v)->car & FF_FONT_MASK)
-#define FONT_SET_P(v)	(FONT_TYPE (v) == FF_FONT_SET)
-#define FONT_STRUCT_P(v) (FONT_TYPE (v) == FF_FONT_STRUCT)
-
 /* An allocated color */
 typedef struct lisp_color {
     repv car;

--- a/src/sawmill_subrs.h
+++ b/src/sawmill_subrs.h
@@ -108,7 +108,7 @@ extern void events_kill (void);
 extern int font_type;
 extern repv Qdefault_font;
 extern int x_text_width (repv font, u_char *string, size_t len);
-extern void x_draw_string (Window id, repv font, GC gc,
+extern void x_draw_string (Window id, repv font, GC gc, Lisp_Color *fg_color,
 			   int x, int y, u_char *string, size_t len);
 extern repv Fget_font(repv name);
 extern repv Ffont_get(repv font, repv prop);