summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2008-01-27 16:40:24 (GMT)
committerjenglish <jenglish@flightlab.com>2008-01-27 16:40:24 (GMT)
commite695ccdf159a6c9f54b216986d300e3f67b6d69e (patch)
tree5fec3a1a49b7b91c91fa2af93e31af550669a5fa
parenta97e62293d4ca8d3027753d0bcd4273f1b5eaf24 (diff)
downloadtk-e695ccdf159a6c9f54b216986d300e3f67b6d69e.zip
tk-e695ccdf159a6c9f54b216986d300e3f67b6d69e.tar.gz
tk-e695ccdf159a6c9f54b216986d300e3f67b6d69e.tar.bz2
Merged common code from InitFont() and TkpGetFontAttrsForChar(),
factored into GetTkFontAttributes() and GetTkFontMetrics(). Removed write-only struct UnixFtFont member 'drawable'. Removed unneeded double-pointer indirections. Ensure that TkFontAttributes.family member is a Tk_Uid as specified.
-rw-r--r--unix/tkUnixRFont.c199
1 files changed, 86 insertions, 113 deletions
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
index 0913fa1..f14ba40 100644
--- a/unix/tkUnixRFont.c
+++ b/unix/tkUnixRFont.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkUnixRFont.c,v 1.20 2007/05/15 19:37:58 jenglish Exp $
+ * RCS: @(#) $Id: tkUnixRFont.c,v 1.21 2008/01/27 16:40:24 jenglish Exp $
*/
#include "tkUnixInt.h"
@@ -33,7 +33,6 @@ typedef struct {
Display *display;
int screen;
XftDraw *ftDraw;
- Drawable drawable;
XftColor color;
} UnixFtFont;
@@ -92,6 +91,76 @@ GetFont(
/*
*---------------------------------------------------------------------------
*
+ * GetTkFontAttributes --
+ * Fill in TkFontAttributes from an XftFont.
+ */
+
+static void
+GetTkFontAttributes(
+ XftFont *ftFont,
+ TkFontAttributes *faPtr)
+{
+ char *family;
+ int weight, slant;
+ double size;
+
+ if (XftPatternGetString(ftFont->pattern, XFT_FAMILY, 0,
+ &family) != XftResultMatch) {
+ family = "Unknown";
+ }
+ if (XftPatternGetDouble(ftFont->pattern, XFT_SIZE, 0,
+ &size) != XftResultMatch) {
+ size = 12.0;
+ }
+ if (XftPatternGetInteger(ftFont->pattern, XFT_WEIGHT, 0,
+ &weight) != XftResultMatch) {
+ weight = XFT_WEIGHT_MEDIUM;
+ }
+ if (XftPatternGetInteger(ftFont->pattern, XFT_SLANT, 0,
+ &slant) != XftResultMatch) {
+ slant = XFT_SLANT_ROMAN;
+ }
+
+#if DEBUG_FONTSEL
+ printf("family %s size %g weight %d slant %d\n",
+ family, size, weight, slant);
+#endif /* DEBUG_FONTSEL */
+
+ faPtr->family = Tk_GetUid(family);
+ faPtr->size = (int) size;
+ faPtr->weight = (weight > XFT_WEIGHT_MEDIUM) ? TK_FW_BOLD : TK_FW_NORMAL;
+ faPtr->slant = (slant > XFT_SLANT_ROMAN) ? TK_FS_ITALIC : TK_FS_ROMAN;
+ faPtr->underline = 0;
+ faPtr->overstrike = 0;
+}
+
+/*
+ *---------------------------------------------------------------------------
+ *
+ * GetTkFontMetrics --
+ * Fill in TkFontMetrics from an XftFont.
+ */
+
+static void GetTkFontMetrics(
+ XftFont *ftFont,
+ TkFontMetrics *fmPtr)
+{
+ int spacing;
+
+ if (XftPatternGetInteger(ftFont->pattern, XFT_SPACING, 0,
+ &spacing) != XftResultMatch) {
+ spacing = XFT_PROPORTIONAL;
+ }
+
+ fmPtr->ascent = ftFont->ascent;
+ fmPtr->descent = ftFont->descent;
+ fmPtr->maxWidth = ftFont->max_advance_width;
+ fmPtr->fixed = spacing != XFT_PROPORTIONAL;
+}
+
+/*
+ *---------------------------------------------------------------------------
+ *
* InitFont --
*
* Initializes the fields of a UnixFtFont structure. If fontPtr is NULL,
@@ -109,15 +178,11 @@ InitFont(
FcPattern *pattern,
UnixFtFont *fontPtr)
{
- TkFontAttributes *faPtr;
- TkFontMetrics *fmPtr;
- char *family, **familyPtr = &family;
- int weight, slant, spacing, i;
- double size;
FcFontSet *set;
FcCharSet *charset;
FcResult result;
XftFont *ftFont;
+ int i;
if (!fontPtr) {
fontPtr = (UnixFtFont *) ckalloc(sizeof(UnixFtFont));
@@ -157,80 +222,22 @@ InitFont(
}
}
- fontPtr->font.fid = XLoadFont(Tk_Display(tkwin), "fixed");
fontPtr->display = Tk_Display(tkwin);
fontPtr->screen = Tk_ScreenNumber(tkwin);
fontPtr->ftDraw = 0;
- fontPtr->drawable = 0;
fontPtr->color.color.red = 0;
fontPtr->color.color.green = 0;
fontPtr->color.color.blue = 0;
fontPtr->color.color.alpha = 0xffff;
fontPtr->color.pixel = 0xffffffff;
- ftFont = GetFont(fontPtr, 0);
-
/*
- * Build the Tk font structure
+ * Fill in platform-specific fields of TkFont.
*/
-
- if (XftPatternGetString(ftFont->pattern, XFT_FAMILY, 0,
- familyPtr) != XftResultMatch) {
- family = "Unknown";
- }
-
- if (XftPatternGetInteger(ftFont->pattern, XFT_WEIGHT, 0,
- &weight) != XftResultMatch) {
- weight = XFT_WEIGHT_MEDIUM;
- }
- if (weight <= XFT_WEIGHT_MEDIUM) {
- weight = TK_FW_NORMAL;
- } else {
- weight = TK_FW_BOLD;
- }
-
- if (XftPatternGetInteger(ftFont->pattern, XFT_SLANT, 0,
- &slant) != XftResultMatch) {
- slant = XFT_SLANT_ROMAN;
- }
- if (slant <= XFT_SLANT_ROMAN) {
- slant = TK_FS_ROMAN;
- } else {
- slant = TK_FS_ITALIC;
- }
-
- if (XftPatternGetDouble(ftFont->pattern, XFT_SIZE, 0,
- &size) != XftResultMatch) {
- size = 12.0;
- }
-
- if (XftPatternGetInteger(ftFont->pattern, XFT_SPACING, 0,
- &spacing) != XftResultMatch) {
- spacing = XFT_PROPORTIONAL;
- }
- if (spacing == XFT_PROPORTIONAL) {
- spacing = 0;
- } else {
- spacing = 1;
- }
-#if DEBUG_FONTSEL
- printf("family %s size %g weight %d slant %d\n",
- family, size, weight, slant);
-#endif /* DEBUG_FONTSEL */
-
- faPtr = &fontPtr->font.fa;
- faPtr->family = family;
- faPtr->size = (int) size;
- faPtr->weight = weight;
- faPtr->slant = slant;
- faPtr->underline = 0;
- faPtr->overstrike = 0;
-
- fmPtr = &fontPtr->font.fm;
- fmPtr->ascent = ftFont->ascent;
- fmPtr->descent = ftFont->descent;
- fmPtr->maxWidth = ftFont->max_advance_width;
- fmPtr->fixed = spacing;
+ ftFont = GetFont(fontPtr, 0);
+ fontPtr->font.fid = XLoadFont(Tk_Display(tkwin), "fixed");
+ GetTkFontAttributes(ftFont, &fontPtr->font.fa);
+ GetTkFontMetrics(ftFont, &fontPtr->font.fm);
return fontPtr;
}
@@ -397,7 +404,7 @@ TkpGetFontFamilies(
Tcl_Obj *resultPtr, *strPtr;
XftFontSet *list;
int i;
- char *family, **familyPtr = &family;
+ char *family;
resultPtr = Tcl_NewListObj(0, NULL);
@@ -406,7 +413,7 @@ TkpGetFontFamilies(
XFT_FAMILY, (char*)0); /* fields */
for (i = 0; i < list->nfont; i++) {
if (XftPatternGetString(list->fonts[i], XFT_FAMILY, 0,
- familyPtr) == XftResultMatch) {
+ &family) == XftResultMatch) {
strPtr = Tcl_NewStringObj(Tk_GetUid(family), -1);
Tcl_ListObjAppendElement(NULL, resultPtr, strPtr);
}
@@ -437,9 +444,7 @@ TkpGetSubFonts(
Tcl_Obj *objv[3], *listPtr, *resultPtr;
UnixFtFont *fontPtr = (UnixFtFont *) tkfont;
FcPattern *pattern;
- char *family, **familyPtr = &family;
- char *foundry, **foundryPtr = &foundry;
- char *encoding, **encodingPtr = &encoding;
+ char *family, *foundry, *encoding;
int i;
resultPtr = Tcl_NewListObj(0, NULL);
@@ -449,15 +454,15 @@ TkpGetSubFonts(
fontPtr->faces[i].source);
if (XftPatternGetString(pattern, XFT_FAMILY, 0,
- familyPtr) != XftResultMatch) {
+ &family) != XftResultMatch) {
family = "Unknown";
}
if (XftPatternGetString(pattern, XFT_FOUNDRY, 0,
- foundryPtr) != XftResultMatch) {
+ &foundry) != XftResultMatch) {
foundry = "Unknown";
}
if (XftPatternGetString(pattern, XFT_ENCODING, 0,
- encodingPtr) != XftResultMatch) {
+ &encoding) != XftResultMatch) {
encoding = "Unknown";
}
objv[0] = Tcl_NewStringObj(family, -1);
@@ -477,12 +482,6 @@ TkpGetSubFonts(
* Retrieve the font attributes of the actual font used to render a given
* character.
*
- * Results:
- * None.
- *
- * Side effects:
- * The font attributes are stored in *faPtr.
- *
*----------------------------------------------------------------------
*/
@@ -497,34 +496,10 @@ TkpGetFontAttrsForChar(
/* Structure describing the logical font */
FcChar32 ucs4 = (FcChar32) c;
/* UCS-4 character to map */
- XftFont *xftFontPtr = GetFont(fontPtr, ucs4);
+ XftFont *ftFont = GetFont(fontPtr, ucs4);
/* Actual font used to render the character */
- const char *family; /* Font family name */
- const char **familyPtr = &family;
- double size; /* Font size */
- int weight; /* Font weight */
- int slant; /* Font slant */
-
- if (XftPatternGetString(xftFontPtr->pattern, XFT_FAMILY, 0,
- familyPtr) != XftResultMatch) {
- family = "Unknown";
- }
- if (XftPatternGetDouble(xftFontPtr->pattern, XFT_SIZE, 0,
- &size) != XftResultMatch) {
- size = 12.0;
- }
- if (XftPatternGetInteger(xftFontPtr->pattern, XFT_WEIGHT, 0,
- &weight) != XftResultMatch) {
- weight = XFT_WEIGHT_MEDIUM;
- }
- if (XftPatternGetInteger(xftFontPtr->pattern, XFT_SLANT, 0,
- &slant) != XftResultMatch) {
- slant = XFT_SLANT_ROMAN;
- }
- faPtr->family = Tk_GetUid(family);
- faPtr->size = (int) size;
- faPtr->weight = (weight > XFT_WEIGHT_MEDIUM) ? TK_FW_BOLD : TK_FW_NORMAL;
- faPtr->slant = (slant > XFT_SLANT_ROMAN) ? TK_FS_ITALIC : TK_FS_ROMAN;
+
+ GetTkFontAttributes(ftFont, faPtr);
faPtr->underline = fontPtr->font.fa.underline;
faPtr->overstrike = fontPtr->font.fa.overstrike;
}
@@ -677,13 +652,11 @@ Tk_DrawChars(
fontPtr->ftDraw = XftDrawCreate(display, drawable,
DefaultVisual(display, fontPtr->screen),
DefaultColormap(display, fontPtr->screen));
- fontPtr->drawable = drawable;
} else {
Tk_ErrorHandler handler = Tk_CreateErrorHandler(display, -1, -1, -1,
NULL, (ClientData) NULL);
XftDrawChange(fontPtr->ftDraw, drawable);
- fontPtr->drawable = drawable;
Tk_DeleteErrorHandler(handler);
}
XGetGCValues(display, gc, GCForeground, &values);