#include "gtkfont.h"
#include "tree234.h"
-/*
- * TODO on fontsel
- * ---------------
- *
- * - implement the preview pane
- *
- * - extend the font style language for X11 fonts so that we
- * never get unexplained double size elements? Or, at least, so
- * that _my_ font collection never produces them; that'd be a
- * decent start.
- *
- * - decide what _should_ happen about font aliases. Should we
- * resolve them as soon as they're clicked? Or be able to
- * resolve them on demand, er, somehow? Or resolve them on exit
- * from the function? Or what? If we resolve on demand, should
- * we stop canonifying them on input, on the basis that we'd
- * prefer to let the user _tell_ us when to canonify them?
- *
- * - think about points versus pixels, harder than I already have
- *
- * - work out why the list boxes don't go all the way to the RHS
- * of the dialog box
- *
- * - develop a sensible sorting order for the font styles -
- * Regular / Roman / non-bold-or-italic should come at the top!
- *
- * - big testing and shakedown!
- */
-
/*
* Future work:
*
- * - all the GDK font functions used in the x11font subclass are
- * deprecated, so one day they may go away. When this happens -
- * or before, if I'm feeling proactive - it oughtn't to be too
- * difficult in principle to convert the whole thing to use
- * actual Xlib font calls.
+ * - it would be nice to have a display of the current font name,
+ * and in particular whether it's client- or server-side,
+ * during the progress of the font selector.
*
* - it would be nice if we could move the processing of
* underline and VT100 double width into this module, so that
* I haven't the energy.
*/
+#if !GLIB_CHECK_VERSION(1,3,7)
+#define g_ascii_strcasecmp g_strcasecmp
+#define g_ascii_strncasecmp g_strncasecmp
+#endif
+
/*
* Ad-hoc vtable mechanism to allow font structures to be
* polymorphic.
#define FONTFLAG_SERVERALIAS 0x0004
#define FONTFLAG_NONMONOSPACED 0x0008
+#define FONTFLAG_SORT_MASK 0x0007 /* used to disambiguate font families */
+
typedef void (*fontsel_add_entry)(void *ctx, const char *realfontname,
const char *family, const char *charset,
- const char *style, int size, int flags,
+ const char *style, const char *stylekey,
+ int size, int flags,
const struct unifont_vtable *fontclass);
struct unifont_vtable {
*/
unifont *(*create)(GtkWidget *widget, const char *name, int wide, int bold,
int shadowoffset, int shadowalways);
+ unifont *(*create_fallback)(GtkWidget *widget, int height, int wide,
+ int bold, int shadowoffset, int shadowalways);
void (*destroy)(unifont *font);
+ int (*has_glyph)(unifont *font, wchar_t glyph);
void (*draw_text)(GdkDrawable *target, GdkGC *gc, unifont *font,
- int x, int y, const char *string, int len, int wide,
+ int x, int y, const wchar_t *string, int len, int wide,
int bold, int cellwidth);
void (*enum_fonts)(GtkWidget *widget,
fontsel_add_entry callback, void *callback_ctx);
- char *(*canonify_fontname)(GtkWidget *widget, const char *name, int *size);
+ char *(*canonify_fontname)(GtkWidget *widget, const char *name, int *size,
+ int *flags, int resolve_aliases);
char *(*scale_fontname)(GtkWidget *widget, const char *name, int size);
/*
};
/* ----------------------------------------------------------------------
- * GDK-based X11 font implementation.
+ * X11 font implementation, directly using Xlib calls.
*/
+static int x11font_has_glyph(unifont *font, wchar_t glyph);
static void x11font_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font,
- int x, int y, const char *string, int len,
+ int x, int y, const wchar_t *string, int len,
int wide, int bold, int cellwidth);
static unifont *x11font_create(GtkWidget *widget, const char *name,
int wide, int bold,
static void x11font_enum_fonts(GtkWidget *widget,
fontsel_add_entry callback, void *callback_ctx);
static char *x11font_canonify_fontname(GtkWidget *widget, const char *name,
- int *size);
+ int *size, int *flags,
+ int resolve_aliases);
static char *x11font_scale_fontname(GtkWidget *widget, const char *name,
int size);
* failed, so that we don't keep trying and failing
* subsequently).
*/
- GdkFont *fonts[4];
+ XFontStruct *fonts[4];
int allocated[4];
/*
* `sixteen_bit' is true iff the font object is indexed by
* values larger than a byte. That is, this flag tells us
- * whether we use gdk_draw_text_wc() or gdk_draw_text().
+ * whether we use XDrawString or XDrawString16, etc.
*/
int sixteen_bit;
+ /*
+ * `variable' is true iff the font is non-fixed-pitch. This
+ * enables some code which takes greater care over character
+ * positioning during text drawing.
+ */
+ int variable;
+ /*
+ * real_charset is the charset used when translating text into the
+ * font's internal encoding inside draw_text(). This need not be
+ * the same as the public_charset provided to the client; for
+ * example, public_charset might be CS_ISO8859_1 while
+ * real_charset is CS_ISO8859_1_X11.
+ */
+ int real_charset;
/*
* Data passed in to unifont_create().
*/
static const struct unifont_vtable x11font_vtable = {
x11font_create,
+ NULL, /* no fallback fonts in X11 */
x11font_destroy,
+ x11font_has_glyph,
x11font_draw_text,
x11font_enum_fonts,
x11font_canonify_fontname,
x11font_scale_fontname,
- "server"
+ "server",
};
-char *x11_guess_derived_font_name(GdkFont *font, int bold, int wide)
+static char *x11_guess_derived_font_name(XFontStruct *xfs, int bold, int wide)
{
- XFontStruct *xfs = GDK_FONT_XFONT(font);
- Display *disp = GDK_FONT_XDISPLAY(font);
+ Display *disp = GDK_DISPLAY();
Atom fontprop = XInternAtom(disp, "FONT", False);
unsigned long ret;
if (XGetFontProperty(xfs, fontprop, &ret)) {
char *name = XGetAtomName(disp, (Atom)ret);
if (name && name[0] == '-') {
- char *strings[13];
+ const char *strings[13];
char *dupname, *extrafree = NULL, *ret;
char *p, *q;
int nstr;
p++;
}
- if (nstr < lenof(strings))
+ if (nstr < lenof(strings)) {
+ sfree(dupname);
return NULL; /* XLFD was malformed */
+ }
if (bold)
strings[2] = "bold";
return NULL;
}
-static int x11_font_width(GdkFont *font, int sixteen_bit)
+static int x11_font_width(XFontStruct *xfs, int sixteen_bit)
{
if (sixteen_bit) {
XChar2b space;
space.byte1 = 0;
- space.byte2 = ' ';
- return gdk_text_width(font, (const gchar *)&space, 2);
+ space.byte2 = '0';
+ return XTextWidth16(xfs, &space, 1);
} else {
- return gdk_char_width(font, ' ');
+ return XTextWidth(xfs, "0", 1);
}
}
+static int x11_font_has_glyph(XFontStruct *xfs, int byte1, int byte2)
+{
+ int index;
+
+ /*
+ * Not to be confused with x11font_has_glyph, which is a method of
+ * the x11font 'class' and hence takes a unifont as argument. This
+ * is the low-level function which grubs about in an actual
+ * XFontStruct to see if a given glyph exists.
+ *
+ * We must do this ourselves rather than letting Xlib's
+ * XTextExtents16 do the job, because XTextExtents will helpfully
+ * substitute the font's default_char for any missing glyph and
+ * not tell us it did so, which precisely won't help us find out
+ * which glyphs _are_ missing.
+ *
+ * The man page for XQueryFont is rather confusing about how the
+ * per_char array in the XFontStruct is laid out, because it gives
+ * formulae for determining the two-byte X character code _from_
+ * an index into the per_char array. Going the other way, it's
+ * rather simpler:
+ *
+ * The valid character codes have byte1 between min_byte1 and
+ * max_byte1 inclusive, and byte2 between min_char_or_byte2 and
+ * max_char_or_byte2 inclusive. This gives a rectangle of size
+ * (max_byte2-min_byte1+1) by
+ * (max_char_or_byte2-min_char_or_byte2+1), which is precisely the
+ * rectangle encoded in the per_char array. Hence, given a
+ * character code which is valid in the sense that it falls
+ * somewhere in that rectangle, its index in per_char is given by
+ * setting
+ *
+ * x = byte2 - min_char_or_byte2
+ * y = byte1 - min_byte1
+ * index = y * (max_char_or_byte2-min_char_or_byte2+1) + x
+ *
+ * If min_byte1 and min_byte2 are both zero, that's a special case
+ * which can be treated as if min_byte2 was 1 instead, i.e. the
+ * per_char array just runs from min_char_or_byte2 to
+ * max_char_or_byte2 inclusive, and byte1 should always be zero.
+ */
+
+ if (byte2 < xfs->min_char_or_byte2 || byte2 > xfs->max_char_or_byte2)
+ return FALSE;
+
+ if (xfs->min_byte1 == 0 && xfs->max_byte1 == 0) {
+ index = byte2 - xfs->min_char_or_byte2;
+ } else {
+ if (byte1 < xfs->min_byte1 || byte1 > xfs->max_byte1)
+ return FALSE;
+ index = ((byte2 - xfs->min_char_or_byte2) +
+ ((byte1 - xfs->min_byte1) *
+ (xfs->max_char_or_byte2 - xfs->min_char_or_byte2 + 1)));
+ }
+
+ if (!xfs->per_char) /* per_char NULL => everything in range exists */
+ return TRUE;
+
+ return (xfs->per_char[index].ascent + xfs->per_char[index].descent > 0 ||
+ xfs->per_char[index].width > 0);
+}
+
static unifont *x11font_create(GtkWidget *widget, const char *name,
int wide, int bold,
int shadowoffset, int shadowalways)
{
struct x11font *xfont;
- GdkFont *font;
XFontStruct *xfs;
- Display *disp;
- Atom charset_registry, charset_encoding;
- unsigned long registry_ret, encoding_ret;
- int pubcs, realcs, sixteen_bit;
+ Display *disp = GDK_DISPLAY();
+ Atom charset_registry, charset_encoding, spacing;
+ unsigned long registry_ret, encoding_ret, spacing_ret;
+ int pubcs, realcs, sixteen_bit, variable;
int i;
- font = gdk_font_load(name);
- if (!font)
+ xfs = XLoadQueryFont(disp, name);
+ if (!xfs)
return NULL;
- xfs = GDK_FONT_XFONT(font);
- disp = GDK_FONT_XDISPLAY(font);
-
charset_registry = XInternAtom(disp, "CHARSET_REGISTRY", False);
charset_encoding = XInternAtom(disp, "CHARSET_ENCODING", False);
pubcs = realcs = CS_NONE;
sixteen_bit = FALSE;
+ variable = TRUE;
if (XGetFontProperty(xfs, charset_registry, ®istry_ret) &&
XGetFontProperty(xfs, charset_encoding, &encoding_ret)) {
}
/*
- * Hack for X line-drawing characters: if the primary
- * font is encoded as ISO-8859-1, and has valid glyphs
- * in the first 32 char positions, it is assumed that
- * those glyphs are the VT100 line-drawing character
- * set.
- *
- * Actually, we'll hack even harder by only checking
- * position 0x19 (vertical line, VT100 linedrawing
- * `x'). Then we can check it easily by seeing if the
- * ascent and descent differ.
+ * Hack for X line-drawing characters: if the primary font
+ * is encoded as ISO-8859-1, and has valid glyphs in the
+ * low character positions, it is assumed that those
+ * glyphs are the VT100 line-drawing character set.
*/
if (pubcs == CS_ISO8859_1) {
- int lb, rb, wid, asc, desc;
- gchar text[2];
-
- text[1] = '\0';
- text[0] = '\x12';
- gdk_string_extents(font, text, &lb, &rb, &wid, &asc, &desc);
- if (asc != desc)
- realcs = CS_ISO8859_1_X11;
- }
+ int ch;
+ for (ch = 1; ch < 32; ch++)
+ if (!x11_font_has_glyph(xfs, 0, ch))
+ break;
+ if (ch == 32)
+ realcs = CS_ISO8859_1_X11;
+ }
sfree(encoding);
}
}
+ spacing = XInternAtom(disp, "SPACING", False);
+ if (XGetFontProperty(xfs, spacing, &spacing_ret)) {
+ char *spc;
+ spc = XGetAtomName(disp, (Atom)spacing_ret);
+
+ if (spc && strchr("CcMm", spc[0]))
+ variable = FALSE;
+ }
+
xfont = snew(struct x11font);
xfont->u.vt = &x11font_vtable;
- xfont->u.width = x11_font_width(font, sixteen_bit);
- xfont->u.ascent = font->ascent;
- xfont->u.descent = font->descent;
+ xfont->u.width = x11_font_width(xfs, sixteen_bit);
+ xfont->u.ascent = xfs->ascent;
+ xfont->u.descent = xfs->descent;
xfont->u.height = xfont->u.ascent + xfont->u.descent;
xfont->u.public_charset = pubcs;
- xfont->u.real_charset = realcs;
- xfont->fonts[0] = font;
+ xfont->u.want_fallback = TRUE;
+ xfont->real_charset = realcs;
+ xfont->fonts[0] = xfs;
xfont->allocated[0] = TRUE;
xfont->sixteen_bit = sixteen_bit;
+ xfont->variable = variable;
xfont->wide = wide;
xfont->bold = bold;
xfont->shadowoffset = shadowoffset;
static void x11font_destroy(unifont *font)
{
+ Display *disp = GDK_DISPLAY();
struct x11font *xfont = (struct x11font *)font;
int i;
for (i = 0; i < lenof(xfont->fonts); i++)
if (xfont->fonts[i])
- gdk_font_unref(xfont->fonts[i]);
+ XFreeFont(disp, xfont->fonts[i]);
sfree(font);
}
static void x11_alloc_subfont(struct x11font *xfont, int sfid)
{
+ Display *disp = GDK_DISPLAY();
char *derived_name = x11_guess_derived_font_name
(xfont->fonts[0], sfid & 1, !!(sfid & 2));
- xfont->fonts[sfid] = gdk_font_load(derived_name); /* may be NULL */
+ xfont->fonts[sfid] = XLoadQueryFont(disp, derived_name);
xfont->allocated[sfid] = TRUE;
sfree(derived_name);
+ /* Note that xfont->fonts[sfid] may still be NULL, if XLQF failed. */
}
-static void x11font_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font,
- int x, int y, const char *string, int len,
+static int x11font_has_glyph(unifont *font, wchar_t glyph)
+{
+ struct x11font *xfont = (struct x11font *)font;
+
+ if (xfont->sixteen_bit) {
+ /*
+ * This X font has 16-bit character indices, which means
+ * we can directly use our Unicode input value.
+ */
+ return x11_font_has_glyph(xfont->fonts[0], glyph >> 8, glyph & 0xFF);
+ } else {
+ /*
+ * This X font has 8-bit indices, so we must convert to the
+ * appropriate character set.
+ */
+ char sbstring[2];
+ int sblen = wc_to_mb(xfont->real_charset, 0, &glyph, 1,
+ sbstring, 2, "", NULL, NULL);
+ if (sblen == 0 || !sbstring[0])
+ return FALSE; /* not even in the charset */
+
+ return x11_font_has_glyph(xfont->fonts[0], 0,
+ (unsigned char)sbstring[0]);
+ }
+}
+
+#if !GTK_CHECK_VERSION(2,0,0)
+#define GDK_DRAWABLE_XID(d) GDK_WINDOW_XWINDOW(d) /* GTK1's name for this */
+#endif
+
+static void x11font_really_draw_text_16(GdkDrawable *target, XFontStruct *xfs,
+ GC gc, int x, int y,
+ const XChar2b *string, int nchars,
+ int shadowoffset,
+ int fontvariable, int cellwidth)
+{
+ Display *disp = GDK_DISPLAY();
+ int step, nsteps, centre;
+
+ if (fontvariable) {
+ /*
+ * In a variable-pitch font, we draw one character at a
+ * time, and centre it in the character cell.
+ */
+ step = 1;
+ nsteps = nchars;
+ centre = TRUE;
+ } else {
+ /*
+ * In a fixed-pitch font, we can draw the whole lot in one go.
+ */
+ step = nchars;
+ nsteps = 1;
+ centre = FALSE;
+ }
+
+ while (nsteps-- > 0) {
+ int X = x;
+ if (centre)
+ X += (cellwidth - XTextWidth16(xfs, string, step)) / 2;
+
+ XDrawString16(disp, GDK_DRAWABLE_XID(target), gc,
+ X, y, string, step);
+ if (shadowoffset)
+ XDrawString16(disp, GDK_DRAWABLE_XID(target), gc,
+ X + shadowoffset, y, string, step);
+
+ x += cellwidth;
+ string += step;
+ }
+}
+
+static void x11font_really_draw_text(GdkDrawable *target, XFontStruct *xfs,
+ GC gc, int x, int y,
+ const char *string, int nchars,
+ int shadowoffset,
+ int fontvariable, int cellwidth)
+{
+ Display *disp = GDK_DISPLAY();
+ int step, nsteps, centre;
+
+ if (fontvariable) {
+ /*
+ * In a variable-pitch font, we draw one character at a
+ * time, and centre it in the character cell.
+ */
+ step = 1;
+ nsteps = nchars;
+ centre = TRUE;
+ } else {
+ /*
+ * In a fixed-pitch font, we can draw the whole lot in one go.
+ */
+ step = nchars;
+ nsteps = 1;
+ centre = FALSE;
+ }
+
+ while (nsteps-- > 0) {
+ int X = x;
+ if (centre)
+ X += (cellwidth - XTextWidth(xfs, string, step)) / 2;
+
+ XDrawString(disp, GDK_DRAWABLE_XID(target), gc,
+ X, y, string, step);
+ if (shadowoffset)
+ XDrawString(disp, GDK_DRAWABLE_XID(target), gc,
+ X + shadowoffset, y, string, step);
+
+ x += cellwidth;
+ string += step;
+ }
+}
+
+static void x11font_draw_text(GdkDrawable *target, GdkGC *gdkgc, unifont *font,
+ int x, int y, const wchar_t *string, int len,
int wide, int bold, int cellwidth)
{
+ Display *disp = GDK_DISPLAY();
struct x11font *xfont = (struct x11font *)font;
+ GC gc = GDK_GC_XGC(gdkgc);
int sfid;
- int shadowbold = FALSE;
+ int shadowoffset = 0;
+ int mult = (wide ? 2 : 1);
wide -= xfont->wide;
bold -= xfont->bold;
* use shadow bold.
*/
if (xfont->shadowalways && bold) {
- shadowbold = TRUE;
+ shadowoffset = xfont->shadowoffset;
bold = 0;
}
sfid = 2 * wide + bold;
x11_alloc_subfont(xfont, sfid);
if (bold && !xfont->fonts[sfid]) {
bold = 0;
- shadowbold = TRUE;
+ shadowoffset = xfont->shadowoffset;
sfid = 2 * wide + bold;
if (!xfont->allocated[sfid])
x11_alloc_subfont(xfont, sfid);
if (!xfont->fonts[sfid])
return; /* we've tried our best, but no luck */
+ XSetFont(disp, gc, xfont->fonts[sfid]->fid);
+
if (xfont->sixteen_bit) {
/*
* This X font has 16-bit character indices, which means
- * we expect our string to have been passed in UTF-8.
+ * we can directly use our Unicode input string.
*/
XChar2b *xcs;
- wchar_t *wcs;
- int nchars, maxchars, i;
+ int i;
- /*
- * Convert the input string to wide-character Unicode.
- */
- maxchars = 0;
- for (i = 0; i < len; i++)
- if ((unsigned char)string[i] <= 0x7F ||
- (unsigned char)string[i] >= 0xC0)
- maxchars++;
- wcs = snewn(maxchars+1, wchar_t);
- nchars = charset_to_unicode((char **)&string, &len, wcs, maxchars,
- CS_UTF8, NULL, NULL, 0);
- assert(nchars <= maxchars);
- wcs[nchars] = L'\0';
-
- xcs = snewn(nchars, XChar2b);
- for (i = 0; i < nchars; i++) {
- xcs[i].byte1 = wcs[i] >> 8;
- xcs[i].byte2 = wcs[i];
+ xcs = snewn(len, XChar2b);
+ for (i = 0; i < len; i++) {
+ xcs[i].byte1 = string[i] >> 8;
+ xcs[i].byte2 = string[i];
}
- gdk_draw_text(target, xfont->fonts[sfid], gc,
- x, y, (gchar *)xcs, nchars*2);
- if (shadowbold)
- gdk_draw_text(target, xfont->fonts[sfid], gc,
- x + xfont->shadowoffset, y, (gchar *)xcs, nchars*2);
+ x11font_really_draw_text_16(target, xfont->fonts[sfid], gc, x, y,
+ xcs, len, shadowoffset,
+ xfont->variable, cellwidth * mult);
sfree(xcs);
- sfree(wcs);
} else {
- gdk_draw_text(target, xfont->fonts[sfid], gc, x, y, string, len);
- if (shadowbold)
- gdk_draw_text(target, xfont->fonts[sfid], gc,
- x + xfont->shadowoffset, y, string, len);
+ /*
+ * This X font has 8-bit indices, so we must convert to the
+ * appropriate character set.
+ */
+ char *sbstring = snewn(len+1, char);
+ int sblen = wc_to_mb(xfont->real_charset, 0, string, len,
+ sbstring, len+1, ".", NULL, NULL);
+ x11font_really_draw_text(target, xfont->fonts[sfid], gc, x, y,
+ sbstring, sblen, shadowoffset,
+ xfont->variable, cellwidth * mult);
+ sfree(sbstring);
}
}
* we'll be using in the font selector.
*/
char *components[14];
- char *p, *font, *style, *charset;
- int j, thistmpsize, fontsize, flags;
+ char *p, *font, *style, *stylekey, *charset;
+ int j, weightkey, slantkey, setwidthkey;
+ int thistmpsize, fontsize, flags;
- thistmpsize = 3 * strlen(fontnames[i]) + 256;
+ thistmpsize = 4 * strlen(fontnames[i]) + 256;
if (tmpsize < thistmpsize) {
tmpsize = thistmpsize;
tmp = sresize(tmp, tmpsize, char);
p += 1 + sprintf(p, "%s-%s", components[12], components[13]);
/*
- * Style is a mixture of the weight, slant, set_width
- * and spacing fields (respectively 2, 3, 4 and 10)
- * with some strange formatting. (Again, cribbed
- * entirely from the GTK 1.2 font selector.)
+ * Style is a mixture of quite a lot of the fields,
+ * with some strange formatting.
*/
style = p;
p += sprintf(p, "%s", components[2][0] ? components[2] :
"regular");
- if (!g_strcasecmp(components[3], "i"))
+ if (!g_ascii_strcasecmp(components[3], "i"))
p += sprintf(p, " italic");
- else if (!g_strcasecmp(components[3], "o"))
+ else if (!g_ascii_strcasecmp(components[3], "o"))
p += sprintf(p, " oblique");
- else if (!g_strcasecmp(components[3], "ri"))
+ else if (!g_ascii_strcasecmp(components[3], "ri"))
p += sprintf(p, " reverse italic");
- else if (!g_strcasecmp(components[3], "ro"))
+ else if (!g_ascii_strcasecmp(components[3], "ro"))
p += sprintf(p, " reverse oblique");
- else if (!g_strcasecmp(components[3], "ot"))
+ else if (!g_ascii_strcasecmp(components[3], "ot"))
p += sprintf(p, " other-slant");
- if (components[4][0] && g_strcasecmp(components[4], "normal"))
+ if (components[4][0] && g_ascii_strcasecmp(components[4], "normal"))
p += sprintf(p, " %s", components[4]);
- if (!g_strcasecmp(components[10], "m"))
+ if (!g_ascii_strcasecmp(components[10], "m"))
p += sprintf(p, " [M]");
- if (!g_strcasecmp(components[10], "c"))
+ if (!g_ascii_strcasecmp(components[10], "c"))
p += sprintf(p, " [C]");
+ if (components[5][0])
+ p += sprintf(p, " %s", components[5]);
+
+ /*
+ * Style key is the same stuff as above, but with a
+ * couple of transformations done on it to make it
+ * sort more sensibly.
+ */
+ p++;
+ stylekey = p;
+ if (!g_ascii_strcasecmp(components[2], "medium") ||
+ !g_ascii_strcasecmp(components[2], "regular") ||
+ !g_ascii_strcasecmp(components[2], "normal") ||
+ !g_ascii_strcasecmp(components[2], "book"))
+ weightkey = 0;
+ else if (!g_ascii_strncasecmp(components[2], "demi", 4) ||
+ !g_ascii_strncasecmp(components[2], "semi", 4))
+ weightkey = 1;
+ else
+ weightkey = 2;
+ if (!g_ascii_strcasecmp(components[3], "r"))
+ slantkey = 0;
+ else if (!g_ascii_strncasecmp(components[3], "r", 1))
+ slantkey = 2;
+ else
+ slantkey = 1;
+ if (!g_ascii_strcasecmp(components[4], "normal"))
+ setwidthkey = 0;
+ else
+ setwidthkey = 1;
+
+ p += sprintf(p, "%04d%04d%s%04d%04d%s%04d%04d%s%04d%s%04d%s",
+ weightkey,
+ (int)strlen(components[2]), components[2],
+ slantkey,
+ (int)strlen(components[3]), components[3],
+ setwidthkey,
+ (int)strlen(components[4]), components[4],
+ (int)strlen(components[10]), components[10],
+ (int)strlen(components[5]), components[5]);
+
+ assert(p - tmp < thistmpsize);
/*
* Size is in pixels, for our application, so we
*/
if (fontsize)
callback(callback_ctx, fontnames[i], font, charset,
- style, fontsize, flags, &x11font_vtable);
+ style, stylekey, fontsize, flags, &x11font_vtable);
} else {
/*
* This isn't an XLFD, so it must be an alias.
* anything but computationally hideous. Ah well.
*/
callback(callback_ctx, fontnames[i], fontnames[i], NULL,
- NULL, 0, FONTFLAG_SERVERALIAS, &x11font_vtable);
+ NULL, NULL, 0, FONTFLAG_SERVERALIAS, &x11font_vtable);
}
}
XFreeFontNames(fontnames);
}
static char *x11font_canonify_fontname(GtkWidget *widget, const char *name,
- int *size)
+ int *size, int *flags,
+ int resolve_aliases)
{
/*
* When given an X11 font name to try to make sense of for a
* font selector, we must attempt to load it (to see if it
* exists), and then canonify it by extracting its FONT
* property, which should give its full XLFD even if what we
- * originally had was an alias.
+ * originally had was a wildcard.
+ *
+ * However, we must carefully avoid canonifying font
+ * _aliases_, unless specifically asked to, because the font
+ * selector treats them as worthwhile in their own right.
*/
- GdkFont *font = gdk_font_load(name);
XFontStruct *xfs;
- Display *disp;
+ Display *disp = GDK_DISPLAY();
Atom fontprop, fontprop2;
unsigned long ret;
- if (!font)
- return NULL; /* didn't make sense to us, sorry */
+ xfs = XLoadQueryFont(disp, name);
- gdk_font_ref(font);
+ if (!xfs)
+ return NULL; /* didn't make sense to us, sorry */
- xfs = GDK_FONT_XFONT(font);
- disp = GDK_FONT_XDISPLAY(font);
fontprop = XInternAtom(disp, "FONT", False);
if (XGetFontProperty(xfs, fontprop, &ret)) {
- char *name = XGetAtomName(disp, (Atom)ret);
- if (name) {
+ char *newname = XGetAtomName(disp, (Atom)ret);
+ if (newname) {
unsigned long fsize = 12;
fontprop2 = XInternAtom(disp, "PIXEL_SIZE", False);
- if (XGetFontProperty(xfs, fontprop2, &fsize)) {
+ if (XGetFontProperty(xfs, fontprop2, &fsize) && fsize > 0) {
*size = fsize;
- gdk_font_unref(font);
- return dupstr(name);
+ XFreeFont(disp, xfs);
+ if (flags) {
+ if (name[0] == '-' || resolve_aliases)
+ *flags = FONTFLAG_SERVERSIDE;
+ else
+ *flags = FONTFLAG_SERVERALIAS;
+ }
+ return dupstr(name[0] == '-' || resolve_aliases ?
+ newname : name);
}
}
}
- gdk_font_unref(font);
+ XFreeFont(disp, xfs);
+
return NULL; /* something went wrong */
}
return NULL; /* shan't */
}
+#if GTK_CHECK_VERSION(2,0,0)
+
/* ----------------------------------------------------------------------
- * Pango font implementation.
+ * Pango font implementation (for GTK 2 only).
*/
+#if defined PANGO_PRE_1POINT4 && !defined PANGO_PRE_1POINT6
+#define PANGO_PRE_1POINT6 /* make life easier for pre-1.4 folk */
+#endif
+
+static int pangofont_has_glyph(unifont *font, wchar_t glyph);
static void pangofont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font,
- int x, int y, const char *string, int len,
+ int x, int y, const wchar_t *string, int len,
int wide, int bold, int cellwidth);
static unifont *pangofont_create(GtkWidget *widget, const char *name,
int wide, int bold,
int shadowoffset, int shadowalways);
+static unifont *pangofont_create_fallback(GtkWidget *widget, int height,
+ int wide, int bold,
+ int shadowoffset, int shadowalways);
static void pangofont_destroy(unifont *font);
static void pangofont_enum_fonts(GtkWidget *widget, fontsel_add_entry callback,
void *callback_ctx);
static char *pangofont_canonify_fontname(GtkWidget *widget, const char *name,
- int *size);
+ int *size, int *flags,
+ int resolve_aliases);
static char *pangofont_scale_fontname(GtkWidget *widget, const char *name,
int size);
static const struct unifont_vtable pangofont_vtable = {
pangofont_create,
+ pangofont_create_fallback,
pangofont_destroy,
+ pangofont_has_glyph,
pangofont_draw_text,
pangofont_enum_fonts,
pangofont_canonify_fontname,
pangofont_scale_fontname,
- "client"
+ "client",
};
-static unifont *pangofont_create(GtkWidget *widget, const char *name,
- int wide, int bold,
- int shadowoffset, int shadowalways)
+/*
+ * This function is used to rigorously validate a
+ * PangoFontDescription. Later versions of Pango have a nasty
+ * habit of accepting _any_ old string as input to
+ * pango_font_description_from_string and returning a font
+ * description which can actually be used to display text, even if
+ * they have to do it by falling back to their most default font.
+ * This is doubtless helpful in some situations, but not here,
+ * because we need to know if a Pango font string actually _makes
+ * sense_ in order to fall back to treating it as an X font name
+ * if it doesn't. So we check that the font family is actually one
+ * supported by Pango.
+ */
+static int pangofont_check_desc_makes_sense(PangoContext *ctx,
+ PangoFontDescription *desc)
+{
+#ifndef PANGO_PRE_1POINT6
+ PangoFontMap *map;
+#endif
+ PangoFontFamily **families;
+ int i, nfamilies, matched;
+
+ /*
+ * Ask Pango for a list of font families, and iterate through
+ * them to see if one of them matches the family in the
+ * PangoFontDescription.
+ */
+#ifndef PANGO_PRE_1POINT6
+ map = pango_context_get_font_map(ctx);
+ if (!map)
+ return FALSE;
+ pango_font_map_list_families(map, &families, &nfamilies);
+#else
+ pango_context_list_families(ctx, &families, &nfamilies);
+#endif
+
+ matched = FALSE;
+ for (i = 0; i < nfamilies; i++) {
+ if (!g_ascii_strcasecmp(pango_font_family_get_name(families[i]),
+ pango_font_description_get_family(desc))) {
+ matched = TRUE;
+ break;
+ }
+ }
+ g_free(families);
+
+ return matched;
+}
+
+static unifont *pangofont_create_internal(GtkWidget *widget,
+ PangoContext *ctx,
+ PangoFontDescription *desc,
+ int wide, int bold,
+ int shadowoffset, int shadowalways)
{
struct pangofont *pfont;
- PangoContext *ctx;
+#ifndef PANGO_PRE_1POINT6
PangoFontMap *map;
- PangoFontDescription *desc;
+#endif
PangoFontset *fset;
PangoFontMetrics *metrics;
- desc = pango_font_description_from_string(name);
- if (!desc)
- return NULL;
- ctx = gtk_widget_get_pango_context(widget);
- if (!ctx) {
- pango_font_description_free(desc);
- return NULL;
- }
+#ifndef PANGO_PRE_1POINT6
map = pango_context_get_font_map(ctx);
if (!map) {
pango_font_description_free(desc);
}
fset = pango_font_map_load_fontset(map, ctx, desc,
pango_context_get_language(ctx));
+#else
+ fset = pango_context_load_fontset(ctx, desc,
+ pango_context_get_language(ctx));
+#endif
if (!fset) {
pango_font_description_free(desc);
return NULL;
pfont->u.ascent = PANGO_PIXELS(pango_font_metrics_get_ascent(metrics));
pfont->u.descent = PANGO_PIXELS(pango_font_metrics_get_descent(metrics));
pfont->u.height = pfont->u.ascent + pfont->u.descent;
+ pfont->u.want_fallback = FALSE;
/* The Pango API is hardwired to UTF-8 */
pfont->u.public_charset = CS_UTF8;
- pfont->u.real_charset = CS_UTF8;
pfont->desc = desc;
pfont->fset = fset;
pfont->widget = widget;
return (unifont *)pfont;
}
+static unifont *pangofont_create(GtkWidget *widget, const char *name,
+ int wide, int bold,
+ int shadowoffset, int shadowalways)
+{
+ PangoContext *ctx;
+ PangoFontDescription *desc;
+
+ desc = pango_font_description_from_string(name);
+ if (!desc)
+ return NULL;
+ ctx = gtk_widget_get_pango_context(widget);
+ if (!ctx) {
+ pango_font_description_free(desc);
+ return NULL;
+ }
+ if (!pangofont_check_desc_makes_sense(ctx, desc)) {
+ pango_font_description_free(desc);
+ return NULL;
+ }
+ return pangofont_create_internal(widget, ctx, desc, wide, bold,
+ shadowoffset, shadowalways);
+}
+
+static unifont *pangofont_create_fallback(GtkWidget *widget, int height,
+ int wide, int bold,
+ int shadowoffset, int shadowalways)
+{
+ PangoContext *ctx;
+ PangoFontDescription *desc;
+
+ desc = pango_font_description_from_string("Monospace");
+ if (!desc)
+ return NULL;
+ ctx = gtk_widget_get_pango_context(widget);
+ if (!ctx) {
+ pango_font_description_free(desc);
+ return NULL;
+ }
+ pango_font_description_set_absolute_size(desc, height * PANGO_SCALE);
+ return pangofont_create_internal(widget, ctx, desc, wide, bold,
+ shadowoffset, shadowalways);
+}
+
static void pangofont_destroy(unifont *font)
{
struct pangofont *pfont = (struct pangofont *)font;
sfree(font);
}
+static int pangofont_has_glyph(unifont *font, wchar_t glyph)
+{
+ /* Pango implements font fallback, so assume it has everything */
+ return TRUE;
+}
+
static void pangofont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font,
- int x, int y, const char *string, int len,
+ int x, int y, const wchar_t *string, int len,
int wide, int bold, int cellwidth)
{
struct pangofont *pfont = (struct pangofont *)font;
PangoLayout *layout;
PangoRectangle rect;
+ char *utfstring, *utfptr;
+ int utflen;
int shadowbold = FALSE;
if (wide)
}
}
- while (len > 0) {
- int clen;
+ /*
+ * Pango always expects UTF-8, so convert the input wide character
+ * string to UTF-8.
+ */
+ utfstring = snewn(len*6+1, char); /* UTF-8 has max 6 bytes/char */
+ utflen = wc_to_mb(CS_UTF8, 0, string, len,
+ utfstring, len*6+1, ".", NULL, NULL);
+
+ utfptr = utfstring;
+ while (utflen > 0) {
+ int clen, n;
/*
- * Extract a single UTF-8 character from the string.
+ * We want to display every character from this string in
+ * the centre of its own character cell. In the worst case,
+ * this requires a separate text-drawing call for each
+ * character; but in the common case where the font is
+ * properly fixed-width, we can draw many characters in one
+ * go which is much faster.
+ *
+ * This still isn't really ideal. If you look at what
+ * happens in the X protocol as a result of all of this, you
+ * find - naturally enough - that each call to
+ * gdk_draw_layout() generates a separate set of X RENDER
+ * operations involving creating a picture, setting a clip
+ * rectangle, doing some drawing and undoing the whole lot.
+ * In an ideal world, we should _always_ be able to turn the
+ * contents of this loop into a single RenderCompositeGlyphs
+ * operation which internally specifies inter-character
+ * deltas to get the spacing right, which would give us full
+ * speed _even_ in the worst case of a non-fixed-width font.
+ * However, Pango's architecture and documentation are so
+ * unhelpful that I have no idea how if at all to persuade
+ * them to do that.
+ */
+
+ /*
+ * Start by extracting a single UTF-8 character from the
+ * string.
*/
clen = 1;
- while (clen < len &&
- (unsigned char)string[clen] >= 0x80 &&
- (unsigned char)string[clen] < 0xC0)
+ while (clen < utflen &&
+ (unsigned char)utfptr[clen] >= 0x80 &&
+ (unsigned char)utfptr[clen] < 0xC0)
clen++;
-
- pango_layout_set_text(layout, string, clen);
+ n = 1;
+
+ /*
+ * If it's a right-to-left character, we must display it on
+ * its own, to stop Pango helpfully re-reversing our already
+ * reversed text.
+ */
+ if (!is_rtl(string[0])) {
+
+ /*
+ * See if that character has the width we expect.
+ */
+ pango_layout_set_text(layout, utfptr, clen);
+ pango_layout_get_pixel_extents(layout, NULL, &rect);
+
+ if (rect.width == cellwidth) {
+ /*
+ * Try extracting more characters, for as long as they
+ * stay well-behaved.
+ */
+ while (clen < utflen) {
+ int oldclen = clen;
+ clen++; /* skip UTF-8 introducer byte */
+ while (clen < utflen &&
+ (unsigned char)utfptr[clen] >= 0x80 &&
+ (unsigned char)utfptr[clen] < 0xC0)
+ clen++;
+ n++;
+ pango_layout_set_text(layout, utfptr, clen);
+ pango_layout_get_pixel_extents(layout, NULL, &rect);
+ if (rect.width != n * cellwidth) {
+ clen = oldclen;
+ n--;
+ break;
+ }
+ }
+ }
+ }
+
+ pango_layout_set_text(layout, utfptr, clen);
pango_layout_get_pixel_extents(layout, NULL, &rect);
- gdk_draw_layout(target, gc, x + (cellwidth - rect.width)/2,
+ gdk_draw_layout(target, gc, x + (n*cellwidth - rect.width)/2,
y + (pfont->u.height - rect.height)/2, layout);
if (shadowbold)
- gdk_draw_layout(target, gc, x + (cellwidth - rect.width)/2 + pfont->shadowoffset,
+ gdk_draw_layout(target, gc, x + (n*cellwidth - rect.width)/2 + pfont->shadowoffset,
y + (pfont->u.height - rect.height)/2, layout);
- len -= clen;
- string += clen;
- x += cellwidth;
+ utflen -= clen;
+ utfptr += clen;
+ string += n;
+ x += n * cellwidth;
}
+ sfree(utfstring);
+
g_object_unref(layout);
}
void *callback_ctx)
{
PangoContext *ctx;
+#ifndef PANGO_PRE_1POINT6
PangoFontMap *map;
+#endif
PangoFontFamily **families;
int i, nfamilies;
- /*
- * Find the active font map.
- */
ctx = gtk_widget_get_pango_context(widget);
if (!ctx)
return;
- map = pango_context_get_font_map(ctx);
- if (!map)
- return;
/*
- * Ask the font map for a list of font families, and iterate
- * through them.
+ * Ask Pango for a list of font families, and iterate through
+ * them.
*/
+#ifndef PANGO_PRE_1POINT6
+ map = pango_context_get_font_map(ctx);
+ if (!map)
+ return;
pango_font_map_list_families(map, &families, &nfamilies);
+#else
+ pango_context_list_families(ctx, &families, &nfamilies);
+#endif
for (i = 0; i < nfamilies; i++) {
PangoFontFamily *family = families[i];
const char *familyname;
* string.
*/
flags = FONTFLAG_CLIENTSIDE;
+#ifndef PANGO_PRE_1POINT4
+ /*
+ * In very early versions of Pango, we can't tell
+ * monospaced fonts from non-monospaced.
+ */
if (!pango_font_family_is_monospace(family))
flags |= FONTFLAG_NONMONOSPACED;
+#endif
familyname = pango_font_family_get_name(family);
/*
/*
* See if this font has a list of specific sizes.
*/
+#ifndef PANGO_PRE_1POINT4
pango_font_face_list_sizes(face, &sizes, &nsizes);
+#else
+ /*
+ * In early versions of Pango, that call wasn't
+ * supported; we just have to assume everything is
+ * scalable.
+ */
+ sizes = NULL;
+#endif
if (!sizes) {
/*
* Write a single entry with a dummy size.
*/
for (k = 0; k < nsizes; k++) {
char *fullname;
+ char stylekey[128];
pango_font_description_set_size(desc, sizes[k]);
fullname = pango_font_description_to_string(desc);
+ /*
+ * Construct the sorting key for font styles.
+ */
+ {
+ char *p = stylekey;
+ int n;
+
+ n = pango_font_description_get_weight(desc);
+ /* Weight: normal, then lighter, then bolder */
+ if (n <= PANGO_WEIGHT_NORMAL)
+ n = PANGO_WEIGHT_NORMAL - n;
+ p += sprintf(p, "%4d", n);
+
+ n = pango_font_description_get_style(desc);
+ p += sprintf(p, " %2d", n);
+
+ n = pango_font_description_get_stretch(desc);
+ /* Stretch: closer to normal sorts earlier */
+ n = 2 * abs(PANGO_STRETCH_NORMAL - n) +
+ (n < PANGO_STRETCH_NORMAL);
+ p += sprintf(p, " %2d", n);
+
+ n = pango_font_description_get_variant(desc);
+ p += sprintf(p, " %2d", n);
+
+ }
+
/*
* Got everything. Hand off to the callback.
* (The charset string is NULL, because only
* server-side X fonts use it.)
*/
callback(callback_ctx, fullname, familyname, NULL, facename,
+ stylekey,
(sizes == &dummysize ? 0 : PANGO_PIXELS(sizes[k])),
flags, &pangofont_vtable);
}
static char *pangofont_canonify_fontname(GtkWidget *widget, const char *name,
- int *size)
+ int *size, int *flags,
+ int resolve_aliases)
{
/*
* When given a Pango font name to try to make sense of for a
* extract its original size (in pixels) into the `size' field.
*/
PangoContext *ctx;
+#ifndef PANGO_PRE_1POINT6
PangoFontMap *map;
+#endif
PangoFontDescription *desc;
PangoFontset *fset;
PangoFontMetrics *metrics;
pango_font_description_free(desc);
return NULL;
}
+ if (!pangofont_check_desc_makes_sense(ctx, desc)) {
+ pango_font_description_free(desc);
+ return NULL;
+ }
+#ifndef PANGO_PRE_1POINT6
map = pango_context_get_font_map(ctx);
if (!map) {
pango_font_description_free(desc);
}
fset = pango_font_map_load_fontset(map, ctx, desc,
pango_context_get_language(ctx));
+#else
+ fset = pango_context_load_fontset(ctx, desc,
+ pango_context_get_language(ctx));
+#endif
if (!fset) {
pango_font_description_free(desc);
return NULL;
}
*size = PANGO_PIXELS(pango_font_description_get_size(desc));
+ *flags = FONTFLAG_CLIENTSIDE;
pango_font_description_set_size(desc, PANGO_DUMMY_SIZE * PANGO_SCALE);
newname = pango_font_description_to_string(desc);
retname = dupstr(newname);
return retname;
}
+#endif /* GTK_CHECK_VERSION(2,0,0) */
+
/* ----------------------------------------------------------------------
* Outermost functions which do the vtable dispatch.
*/
* event that the same font name is valid as both a Pango and an
* X11 font, it will be interpreted as the former in the absence
* of an explicit type-disambiguating prefix.)
+ *
+ * The 'multifont' subclass is omitted here, as discussed above.
*/
static const struct unifont_vtable *unifont_types[] = {
+#if GTK_CHECK_VERSION(2,0,0)
&pangofont_vtable,
+#endif
&x11font_vtable,
};
}
void unifont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font,
- int x, int y, const char *string, int len,
+ int x, int y, const wchar_t *string, int len,
int wide, int bold, int cellwidth)
{
font->vt->draw_text(target, gc, font, x, y, string, len,
}
/* ----------------------------------------------------------------------
- * Implementation of a unified font selector.
+ * Multiple-font wrapper. This is a type of unifont which encapsulates
+ * up to two other unifonts, permitting missing glyphs in the main
+ * font to be filled in by a fallback font.
+ *
+ * This is a type of unifont just like the previous two, but it has a
+ * separate constructor which is manually called by the client, so it
+ * doesn't appear in the list of available font types enumerated by
+ * unifont_create. This means it's not used by unifontsel either, so
+ * it doesn't need to support any methods except draw_text and
+ * destroy.
+ */
+
+static void multifont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font,
+ int x, int y, const wchar_t *string, int len,
+ int wide, int bold, int cellwidth);
+static void multifont_destroy(unifont *font);
+
+struct multifont {
+ struct unifont u;
+ unifont *main;
+ unifont *fallback;
+};
+
+static const struct unifont_vtable multifont_vtable = {
+ NULL, /* creation is done specially */
+ NULL,
+ multifont_destroy,
+ NULL,
+ multifont_draw_text,
+ NULL,
+ NULL,
+ NULL,
+ "client",
+};
+
+unifont *multifont_create(GtkWidget *widget, const char *name,
+ int wide, int bold,
+ int shadowoffset, int shadowalways)
+{
+ int i;
+ unifont *font, *fallback;
+ struct multifont *mfont;
+
+ font = unifont_create(widget, name, wide, bold,
+ shadowoffset, shadowalways);
+ if (!font)
+ return NULL;
+
+ fallback = NULL;
+ if (font->want_fallback) {
+ for (i = 0; i < lenof(unifont_types); i++) {
+ if (unifont_types[i]->create_fallback) {
+ fallback = unifont_types[i]->create_fallback
+ (widget, font->height, wide, bold,
+ shadowoffset, shadowalways);
+ if (fallback)
+ break;
+ }
+ }
+ }
+
+ /*
+ * Construct our multifont. Public members are all copied from the
+ * primary font we're wrapping.
+ */
+ mfont = snew(struct multifont);
+ mfont->u.vt = &multifont_vtable;
+ mfont->u.width = font->width;
+ mfont->u.ascent = font->ascent;
+ mfont->u.descent = font->descent;
+ mfont->u.height = font->height;
+ mfont->u.public_charset = font->public_charset;
+ mfont->u.want_fallback = FALSE; /* shouldn't be needed, but just in case */
+ mfont->main = font;
+ mfont->fallback = fallback;
+
+ return (unifont *)mfont;
+}
+
+static void multifont_destroy(unifont *font)
+{
+ struct multifont *mfont = (struct multifont *)font;
+ unifont_destroy(mfont->main);
+ if (mfont->fallback)
+ unifont_destroy(mfont->fallback);
+ sfree(font);
+}
+
+static void multifont_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font,
+ int x, int y, const wchar_t *string, int len,
+ int wide, int bold, int cellwidth)
+{
+ struct multifont *mfont = (struct multifont *)font;
+ int ok, i;
+
+ while (len > 0) {
+ /*
+ * Find a maximal sequence of characters which are, or are
+ * not, supported by our main font.
+ */
+ ok = mfont->main->vt->has_glyph(mfont->main, string[0]);
+ for (i = 1;
+ i < len &&
+ !mfont->main->vt->has_glyph(mfont->main, string[i]) == !ok;
+ i++);
+
+ /*
+ * Now display it.
+ */
+ unifont_draw_text(target, gc, ok ? mfont->main : mfont->fallback,
+ x, y, string, i, wide, bold, cellwidth);
+ string += i;
+ len -= i;
+ x += i * cellwidth;
+ }
+}
+
+#if GTK_CHECK_VERSION(2,0,0)
+
+/* ----------------------------------------------------------------------
+ * Implementation of a unified font selector. Used on GTK 2 only;
+ * for GTK 1 we still use the standard font selector.
*/
typedef struct fontinfo fontinfo;
GtkListStore *family_model, *style_model, *size_model;
GtkWidget *family_list, *style_list, *size_entry, *size_list;
GtkWidget *filter_buttons[4];
+ GtkWidget *preview_area;
+ GdkPixmap *preview_pixmap;
+ int preview_width, preview_height;
+ GdkColor preview_fg, preview_bg;
int filter_flags;
tree234 *fonts_by_realname, *fonts_by_selorder;
fontinfo *selected;
- int selsize;
+ int selsize, intendedsize;
int inhibit_response; /* inhibit callbacks when we change GUI controls */
} unifontsel_internal;
*/
struct fontinfo {
char *realname;
- char *family, *charset, *style;
+ char *family, *charset, *style, *stylekey;
int size, flags;
/*
* Fallback sorting key, to permit multiple identical entries
const struct unifont_vtable *fontclass;
};
-static int fontinfo_realname_compare(void *av, void *bv)
-{
- fontinfo *a = (fontinfo *)av;
- fontinfo *b = (fontinfo *)bv;
- return g_strcasecmp(a->realname, b->realname);
-}
-
-static int fontinfo_realname_find(void *av, void *bv)
-{
- const char *a = (const char *)av;
- fontinfo *b = (fontinfo *)bv;
- return g_strcasecmp(a, b->realname);
-}
+struct fontinfo_realname_find {
+ const char *realname;
+ int flags;
+};
static int strnullcasecmp(const char *a, const char *b)
{
/*
* Otherwise, ordinary strcasecmp.
*/
- return g_strcasecmp(a, b);
+ return g_ascii_strcasecmp(a, b);
+}
+
+static int fontinfo_realname_compare(void *av, void *bv)
+{
+ fontinfo *a = (fontinfo *)av;
+ fontinfo *b = (fontinfo *)bv;
+ int i;
+
+ if ((i = strnullcasecmp(a->realname, b->realname)) != 0)
+ return i;
+ if ((a->flags & FONTFLAG_SORT_MASK) != (b->flags & FONTFLAG_SORT_MASK))
+ return ((a->flags & FONTFLAG_SORT_MASK) <
+ (b->flags & FONTFLAG_SORT_MASK) ? -1 : +1);
+ return 0;
+}
+
+static int fontinfo_realname_find(void *av, void *bv)
+{
+ struct fontinfo_realname_find *a = (struct fontinfo_realname_find *)av;
+ fontinfo *b = (fontinfo *)bv;
+ int i;
+
+ if ((i = strnullcasecmp(a->realname, b->realname)) != 0)
+ return i;
+ if ((a->flags & FONTFLAG_SORT_MASK) != (b->flags & FONTFLAG_SORT_MASK))
+ return ((a->flags & FONTFLAG_SORT_MASK) <
+ (b->flags & FONTFLAG_SORT_MASK) ? -1 : +1);
+ return 0;
}
static int fontinfo_selorder_compare(void *av, void *bv)
int i;
if ((i = strnullcasecmp(a->family, b->family)) != 0)
return i;
+ /*
+ * Font class comes immediately after family, so that fonts
+ * from different classes with the same family
+ */
+ if ((a->flags & FONTFLAG_SORT_MASK) != (b->flags & FONTFLAG_SORT_MASK))
+ return ((a->flags & FONTFLAG_SORT_MASK) <
+ (b->flags & FONTFLAG_SORT_MASK) ? -1 : +1);
if ((i = strnullcasecmp(a->charset, b->charset)) != 0)
return i;
+ if ((i = strnullcasecmp(a->stylekey, b->stylekey)) != 0)
+ return i;
if ((i = strnullcasecmp(a->style, b->style)) != 0)
return i;
if (a->size != b->size)
return 0;
}
+static void unifontsel_deselect(unifontsel_internal *fs)
+{
+ fs->selected = NULL;
+ gtk_list_store_clear(fs->style_model);
+ gtk_list_store_clear(fs->size_model);
+ gtk_widget_set_sensitive(fs->u.ok_button, FALSE);
+ gtk_widget_set_sensitive(fs->size_entry, FALSE);
+}
+
static void unifontsel_setup_familylist(unifontsel_internal *fs)
{
GtkTreeIter iter;
int i, listindex, minpos = -1, maxpos = -1;
char *currfamily = NULL;
+ int currflags = -1;
fontinfo *info;
gtk_list_store_clear(fs->family_model);
info->familyindex = -1;
continue; /* we're filtering out this font */
}
- if (!info || strnullcasecmp(currfamily, info->family)) {
+ if (!info || strnullcasecmp(currfamily, info->family) ||
+ currflags != (info->flags & FONTFLAG_SORT_MASK)) {
/*
* We've either finished a family, or started a new
* one, or both.
if (info) {
minpos = i;
currfamily = info->family;
+ currflags = info->flags & FONTFLAG_SORT_MASK;
}
}
if (!info)
info->familyindex = listindex;
maxpos = i;
}
+
+ /*
+ * If we've just filtered out the previously selected font,
+ * deselect it thoroughly.
+ */
+ if (fs->selected && fs->selected->familyindex < 0)
+ unifontsel_deselect(fs);
}
static void unifontsel_setup_stylelist(unifontsel_internal *fs,
}
}
+static void unifontsel_draw_preview_text(unifontsel_internal *fs)
+{
+ unifont *font;
+ char *sizename = NULL;
+ fontinfo *info = fs->selected;
+
+ if (info) {
+ sizename = info->fontclass->scale_fontname
+ (GTK_WIDGET(fs->u.window), info->realname, fs->selsize);
+ font = info->fontclass->create(GTK_WIDGET(fs->u.window),
+ sizename ? sizename : info->realname,
+ FALSE, FALSE, 0, 0);
+ } else
+ font = NULL;
+
+ if (fs->preview_pixmap) {
+ GdkGC *gc = gdk_gc_new(fs->preview_pixmap);
+ gdk_gc_set_foreground(gc, &fs->preview_bg);
+ gdk_draw_rectangle(fs->preview_pixmap, gc, 1, 0, 0,
+ fs->preview_width, fs->preview_height);
+ gdk_gc_set_foreground(gc, &fs->preview_fg);
+ if (font) {
+ /*
+ * The pangram used here is rather carefully
+ * constructed: it contains a sequence of very narrow
+ * letters (`jil') and a pair of adjacent very wide
+ * letters (`wm').
+ *
+ * If the user selects a proportional font, it will be
+ * coerced into fixed-width character cells when used
+ * in the actual terminal window. We therefore display
+ * it the same way in the preview pane, so as to show
+ * it the way it will actually be displayed - and we
+ * deliberately pick a pangram which will show the
+ * resulting miskerning at its worst.
+ *
+ * We aren't trying to sell people these fonts; we're
+ * trying to let them make an informed choice. Better
+ * that they find out the problems with using
+ * proportional fonts in terminal windows here than
+ * that they go to the effort of selecting their font
+ * and _then_ realise it was a mistake.
+ */
+ info->fontclass->draw_text(fs->preview_pixmap, gc, font,
+ 0, font->ascent,
+ L"bankrupt jilted showmen quiz convex fogey",
+ 41, FALSE, FALSE, font->width);
+ info->fontclass->draw_text(fs->preview_pixmap, gc, font,
+ 0, font->ascent + font->height,
+ L"BANKRUPT JILTED SHOWMEN QUIZ CONVEX FOGEY",
+ 41, FALSE, FALSE, font->width);
+ /*
+ * The ordering of punctuation here is also selected
+ * with some specific aims in mind. I put ` and '
+ * together because some software (and people) still
+ * use them as matched quotes no matter what Unicode
+ * might say on the matter, so people can quickly
+ * check whether they look silly in a candidate font.
+ * The sequence #_@ is there to let people judge the
+ * suitability of the underscore as an effectively
+ * alphabetic character (since that's how it's often
+ * used in practice, at least by programmers).
+ */
+ info->fontclass->draw_text(fs->preview_pixmap, gc, font,
+ 0, font->ascent + font->height * 2,
+ L"0123456789!?,.:;<>()[]{}\\/`'\"+*-=~#_@|%&^$",
+ 42, FALSE, FALSE, font->width);
+ }
+ gdk_gc_unref(gc);
+ gdk_window_invalidate_rect(fs->preview_area->window, NULL, FALSE);
+ }
+ if (font)
+ info->fontclass->destroy(font);
+
+ sfree(sizename);
+}
+
static void unifontsel_select_font(unifontsel_internal *fs,
- fontinfo *info, int size, int leftlist)
+ fontinfo *info, int size, int leftlist,
+ int size_is_explicit)
{
int index;
int minval, maxval;
fs->selected = info;
fs->selsize = size;
+ if (size_is_explicit)
+ fs->intendedsize = size;
+
+ gtk_widget_set_sensitive(fs->u.ok_button, TRUE);
/*
* Find the index of this fontinfo in the selorder list.
gtk_entry_set_editable(GTK_ENTRY(fs->size_entry), fs->selected->size == 0);
gtk_widget_set_sensitive(fs->size_entry, fs->selected->size == 0);
+ unifontsel_draw_preview_text(fs);
+
fs->inhibit_response = FALSE;
}
static void unifontsel_add_entry(void *ctx, const char *realfontname,
const char *family, const char *charset,
- const char *style, int size, int flags,
+ const char *style, const char *stylekey,
+ int size, int flags,
const struct unifont_vtable *fontclass)
{
unifontsel_internal *fs = (unifontsel_internal *)ctx;
totalsize = sizeof(fontinfo) + strlen(realfontname) +
(family ? strlen(family) : 0) + (charset ? strlen(charset) : 0) +
- (style ? strlen(style) : 0) + 10;
+ (style ? strlen(style) : 0) + (stylekey ? strlen(stylekey) : 0) + 10;
info = (fontinfo *)smalloc(totalsize);
info->fontclass = fontclass;
p = (char *)info + sizeof(fontinfo);
p += 1+strlen(p);
} else
info->style = NULL;
+ if (stylekey) {
+ info->stylekey = p;
+ strcpy(p, stylekey);
+ p += 1+strlen(p);
+ } else
+ info->stylekey = NULL;
assert(p - (char *)info <= totalsize);
info->size = size;
info->flags = flags;
add234(fs->fonts_by_selorder, info);
}
+static fontinfo *update_for_intended_size(unifontsel_internal *fs,
+ fontinfo *info)
+{
+ fontinfo info2, *below, *above;
+ int pos;
+
+ /*
+ * Copy the info structure. This doesn't copy its dynamic
+ * string fields, but that's unimportant because all we're
+ * going to do is to adjust the size field and use it in one
+ * tree search.
+ */
+ info2 = *info;
+ info2.size = fs->intendedsize;
+
+ /*
+ * Search in the tree to find the fontinfo structure which
+ * best approximates the size the user last requested.
+ */
+ below = findrelpos234(fs->fonts_by_selorder, &info2, NULL,
+ REL234_LE, &pos);
+ if (!below)
+ pos = -1;
+ above = index234(fs->fonts_by_selorder, pos+1);
+
+ /*
+ * See if we've found it exactly, which is an easy special
+ * case. If we have, it'll be in `below' and not `above',
+ * because we did a REL234_LE rather than REL234_LT search.
+ */
+ if (below && !fontinfo_selorder_compare(&info2, below))
+ return below;
+
+ /*
+ * Now we've either found two suitable fonts, one smaller and
+ * one larger, or we're at one or other extreme end of the
+ * scale. Find out which, by NULLing out either of below and
+ * above if it differs from this one in any respect but size
+ * (and the disambiguating index field). Bear in mind, also,
+ * that either one might _already_ be NULL if we're at the
+ * extreme ends of the font list.
+ */
+ if (below) {
+ info2.size = below->size;
+ info2.index = below->index;
+ if (fontinfo_selorder_compare(&info2, below))
+ below = NULL;
+ }
+ if (above) {
+ info2.size = above->size;
+ info2.index = above->index;
+ if (fontinfo_selorder_compare(&info2, above))
+ above = NULL;
+ }
+
+ /*
+ * Now return whichever of above and below is non-NULL, if
+ * that's unambiguous.
+ */
+ if (!above)
+ return below;
+ if (!below)
+ return above;
+
+ /*
+ * And now we really do have to make a choice about whether to
+ * round up or down. We'll do it by rounding to nearest,
+ * breaking ties by rounding up.
+ */
+ if (above->size - fs->intendedsize <= fs->intendedsize - below->size)
+ return above;
+ else
+ return below;
+}
+
static void family_changed(GtkTreeSelection *treeselection, gpointer data)
{
unifontsel_internal *fs = (unifontsel_internal *)data;
gtk_tree_model_get(treemodel, &treeiter, 1, &minval, -1);
info = (fontinfo *)index234(fs->fonts_by_selorder, minval);
- unifontsel_select_font(fs, info, info->size ? info->size : fs->selsize, 1);
+ info = update_for_intended_size(fs, info);
+ if (!info)
+ return; /* _shouldn't_ happen unless font list is completely funted */
+ if (!info->size)
+ fs->selsize = fs->intendedsize; /* font is scalable */
+ unifontsel_select_font(fs, info, info->size ? info->size : fs->selsize,
+ 1, FALSE);
}
static void style_changed(GtkTreeSelection *treeselection, gpointer data)
return;
gtk_tree_model_get(treemodel, &treeiter, 1, &minval, -1);
+ if (minval < 0)
+ return; /* somehow a charset heading got clicked */
info = (fontinfo *)index234(fs->fonts_by_selorder, minval);
- unifontsel_select_font(fs, info, info->size ? info->size : fs->selsize, 2);
+ info = update_for_intended_size(fs, info);
+ if (!info)
+ return; /* _shouldn't_ happen unless font list is completely funted */
+ if (!info->size)
+ fs->selsize = fs->intendedsize; /* font is scalable */
+ unifontsel_select_font(fs, info, info->size ? info->size : fs->selsize,
+ 2, FALSE);
}
static void size_changed(GtkTreeSelection *treeselection, gpointer data)
gtk_tree_model_get(treemodel, &treeiter, 1, &minval, 2, &size, -1);
info = (fontinfo *)index234(fs->fonts_by_selorder, minval);
- unifontsel_select_font(fs, info, info->size ? info->size : size, 3);
+ unifontsel_select_font(fs, info, info->size ? info->size : size, 3, TRUE);
}
static void size_entry_changed(GtkEditable *ed, gpointer data)
if (size > 0) {
assert(fs->selected->size == 0);
- unifontsel_select_font(fs, fs->selected, size, 3);
+ unifontsel_select_font(fs, fs->selected, size, 3, TRUE);
+ }
+}
+
+static void alias_resolve(GtkTreeView *treeview, GtkTreePath *path,
+ GtkTreeViewColumn *column, gpointer data)
+{
+ unifontsel_internal *fs = (unifontsel_internal *)data;
+ GtkTreeIter iter;
+ int minval, newsize;
+ fontinfo *info, *newinfo;
+ char *newname;
+
+ if (fs->inhibit_response) /* we made this change ourselves */
+ return;
+
+ gtk_tree_model_get_iter(GTK_TREE_MODEL(fs->family_model), &iter, path);
+ gtk_tree_model_get(GTK_TREE_MODEL(fs->family_model), &iter, 1,&minval, -1);
+ info = (fontinfo *)index234(fs->fonts_by_selorder, minval);
+ if (info) {
+ int flags;
+ struct fontinfo_realname_find f;
+
+ newname = info->fontclass->canonify_fontname
+ (GTK_WIDGET(fs->u.window), info->realname, &newsize, &flags, TRUE);
+
+ f.realname = newname;
+ f.flags = flags;
+ newinfo = find234(fs->fonts_by_realname, &f, fontinfo_realname_find);
+
+ sfree(newname);
+ if (!newinfo)
+ return; /* font name not in our index */
+ if (newinfo == info)
+ return; /* didn't change under canonification => not an alias */
+ unifontsel_select_font(fs, newinfo,
+ newinfo->size ? newinfo->size : newsize,
+ 1, TRUE);
+ }
+}
+
+static gint unifontsel_expose_area(GtkWidget *widget, GdkEventExpose *event,
+ gpointer data)
+{
+ unifontsel_internal *fs = (unifontsel_internal *)data;
+
+ if (fs->preview_pixmap) {
+ gdk_draw_pixmap(widget->window,
+ widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
+ fs->preview_pixmap,
+ event->area.x, event->area.y,
+ event->area.x, event->area.y,
+ event->area.width, event->area.height);
+ }
+ return TRUE;
+}
+
+static gint unifontsel_configure_area(GtkWidget *widget,
+ GdkEventConfigure *event, gpointer data)
+{
+ unifontsel_internal *fs = (unifontsel_internal *)data;
+ int ox, oy, nx, ny, x, y;
+
+ /*
+ * Enlarge the pixmap, but never shrink it.
+ */
+ ox = fs->preview_width;
+ oy = fs->preview_height;
+ x = event->width;
+ y = event->height;
+ if (x > ox || y > oy) {
+ if (fs->preview_pixmap)
+ gdk_pixmap_unref(fs->preview_pixmap);
+
+ nx = (x > ox ? x : ox);
+ ny = (y > oy ? y : oy);
+ fs->preview_pixmap = gdk_pixmap_new(widget->window, nx, ny, -1);
+ fs->preview_width = nx;
+ fs->preview_height = ny;
+
+ unifontsel_draw_preview_text(fs);
}
+
+ gdk_window_invalidate_rect(widget->window, NULL, FALSE);
+
+ return TRUE;
}
unifontsel *unifontsel_new(const char *wintitle)
{
unifontsel_internal *fs = snew(unifontsel_internal);
- GtkWidget *table, *label, *w, *scroll;
+ GtkWidget *table, *label, *w, *ww, *scroll;
GtkListStore *model;
GtkTreeViewColumn *column;
- int lists_height, font_width, style_width, size_width;
+ int lists_height, preview_height, font_width, style_width, size_width;
int i;
fs->inhibit_response = FALSE;
+ fs->selected = NULL;
{
/*
gtk_widget_size_request(label, &req);
font_width = req.width;
lists_height = 14 * req.height;
+ preview_height = 5 * req.height;
gtk_label_set_text(GTK_LABEL(label), "Italic Extra Condensed");
gtk_widget_size_request(label, &req);
style_width = req.width;
gtk_label_set_text(GTK_LABEL(label), "48000");
gtk_widget_size_request(label, &req);
size_width = req.width;
+#if GTK_CHECK_VERSION(2,10,0)
g_object_ref_sink(label);
g_object_unref(label);
+#else
+ gtk_object_sink(GTK_OBJECT(label));
+#endif
}
/*
* Now set up the internal fields, including in particular all
* the controls that actually allow the user to select fonts.
*/
- table = gtk_table_new(3, 8, FALSE);
+ table = gtk_table_new(8, 3, FALSE);
gtk_widget_show(table);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
+#if GTK_CHECK_VERSION(2,4,0)
+ /* GtkAlignment seems to be the simplest way to put padding round things */
+ w = gtk_alignment_new(0, 0, 1, 1);
+ gtk_alignment_set_padding(GTK_ALIGNMENT(w), 8, 8, 8, 8);
+ gtk_container_add(GTK_CONTAINER(w), table);
+ gtk_widget_show(w);
+#else
+ w = table;
+#endif
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(fs->u.window)->vbox),
- table, TRUE, TRUE, 0);
+ w, TRUE, TRUE, 0);
label = gtk_label_new_with_mnemonic("_Font:");
gtk_widget_show(label);
gtk_tree_view_append_column(GTK_TREE_VIEW(w), column);
g_signal_connect(G_OBJECT(gtk_tree_view_get_selection(GTK_TREE_VIEW(w))),
"changed", G_CALLBACK(family_changed), fs);
+ g_signal_connect(G_OBJECT(w), "row-activated",
+ G_CALLBACK(alias_resolve), fs);
scroll = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll),
+ GTK_SHADOW_IN);
gtk_container_add(GTK_CONTAINER(scroll), w);
gtk_widget_show(scroll);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
gtk_widget_set_size_request(scroll, font_width, lists_height);
- gtk_table_attach(GTK_TABLE(table), scroll, 0, 1, 1, 3, GTK_FILL, 0, 0, 0);
+ gtk_table_attach(GTK_TABLE(table), scroll, 0, 1, 1, 3, GTK_FILL,
+ GTK_EXPAND | GTK_FILL, 0, 0);
fs->family_model = model;
fs->family_list = w;
"changed", G_CALLBACK(style_changed), fs);
scroll = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll),
+ GTK_SHADOW_IN);
gtk_container_add(GTK_CONTAINER(scroll), w);
gtk_widget_show(scroll);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
gtk_widget_set_size_request(scroll, style_width, lists_height);
- gtk_table_attach(GTK_TABLE(table), scroll, 1, 2, 1, 3, GTK_FILL, 0, 0, 0);
+ gtk_table_attach(GTK_TABLE(table), scroll, 1, 2, 1, 3, GTK_FILL,
+ GTK_EXPAND | GTK_FILL, 0, 0);
fs->style_model = model;
fs->style_list = w;
"changed", G_CALLBACK(size_changed), fs);
scroll = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll),
+ GTK_SHADOW_IN);
gtk_container_add(GTK_CONTAINER(scroll), w);
gtk_widget_show(scroll);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
fs->size_list = w;
/*
- * FIXME: preview widget
+ * Preview widget.
*/
+ fs->preview_area = gtk_drawing_area_new();
+ fs->preview_pixmap = NULL;
+ fs->preview_width = 0;
+ fs->preview_height = 0;
+ fs->preview_fg.pixel = fs->preview_bg.pixel = 0;
+ fs->preview_fg.red = fs->preview_fg.green = fs->preview_fg.blue = 0x0000;
+ fs->preview_bg.red = fs->preview_bg.green = fs->preview_bg.blue = 0xFFFF;
+ gdk_colormap_alloc_color(gdk_colormap_get_system(), &fs->preview_fg,
+ FALSE, FALSE);
+ gdk_colormap_alloc_color(gdk_colormap_get_system(), &fs->preview_bg,
+ FALSE, FALSE);
+ gtk_signal_connect(GTK_OBJECT(fs->preview_area), "expose_event",
+ GTK_SIGNAL_FUNC(unifontsel_expose_area), fs);
+ gtk_signal_connect(GTK_OBJECT(fs->preview_area), "configure_event",
+ GTK_SIGNAL_FUNC(unifontsel_configure_area), fs);
+ gtk_widget_set_size_request(fs->preview_area, 1, preview_height);
+ gtk_widget_show(fs->preview_area);
+ ww = fs->preview_area;
+ w = gtk_frame_new(NULL);
+ gtk_container_add(GTK_CONTAINER(w), ww);
+ gtk_widget_show(w);
+#if GTK_CHECK_VERSION(2,4,0)
+ ww = w;
+ /* GtkAlignment seems to be the simplest way to put padding round things */
+ w = gtk_alignment_new(0, 0, 1, 1);
+ gtk_alignment_set_padding(GTK_ALIGNMENT(w), 8, 8, 8, 8);
+ gtk_container_add(GTK_CONTAINER(w), ww);
+ gtk_widget_show(w);
+#endif
+ ww = w;
+ w = gtk_frame_new("Preview of font");
+ gtk_container_add(GTK_CONTAINER(w), ww);
+ gtk_widget_show(w);
+ gtk_table_attach(GTK_TABLE(table), w, 0, 3, 3, 4,
+ GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 8);
+
i = 0;
w = gtk_check_button_new_with_label("Show client-side fonts");
gtk_object_set_data(GTK_OBJECT(w), "user-data",
gtk_table_attach(GTK_TABLE(table), w, 0, 3, 7, 8, GTK_FILL, 0, 0, 0);
assert(i == lenof(fs->filter_buttons));
- fs->filter_flags = FONTFLAG_CLIENTSIDE | FONTFLAG_SERVERSIDE;
+ fs->filter_flags = FONTFLAG_CLIENTSIDE | FONTFLAG_SERVERSIDE |
+ FONTFLAG_SERVERALIAS;
unifontsel_set_filter_buttons(fs);
/*
*/
unifontsel_setup_familylist(fs);
- fs->selected = NULL;
+ fs->selsize = fs->intendedsize = 13; /* random default */
+ gtk_widget_set_sensitive(fs->u.ok_button, FALSE);
return (unifontsel *)fs;
}
unifontsel_internal *fs = (unifontsel_internal *)fontsel;
fontinfo *info;
+ if (fs->preview_pixmap)
+ gdk_pixmap_unref(fs->preview_pixmap);
+
freetree234(fs->fonts_by_selorder);
while ((info = delpos234(fs->fonts_by_realname, 0)) != NULL)
sfree(info);
void unifontsel_set_name(unifontsel *fontsel, const char *fontname)
{
unifontsel_internal *fs = (unifontsel_internal *)fontsel;
- int i, start, end, size;
- const char *fontname2;
+ int i, start, end, size, flags;
+ const char *fontname2 = NULL;
fontinfo *info;
/*
* Provide a default if given an empty or null font name.
*/
if (!fontname || !*fontname)
- fontname = "fixed"; /* Pango zealots might prefer "Monospace 12" */
+ fontname = "server:fixed";
/*
* Call the canonify_fontname function.
fontname = unifont_do_prefix(fontname, &start, &end);
for (i = start; i < end; i++) {
fontname2 = unifont_types[i]->canonify_fontname
- (GTK_WIDGET(fs->u.window), fontname, &size);
+ (GTK_WIDGET(fs->u.window), fontname, &size, &flags, FALSE);
if (fontname2)
break;
}
/*
* Now look up the canonified font name in our index.
*/
- info = find234(fs->fonts_by_realname, (char *)fontname2,
- fontinfo_realname_find);
+ {
+ struct fontinfo_realname_find f;
+ f.realname = fontname2;
+ f.flags = flags;
+ info = find234(fs->fonts_by_realname, &f, fontinfo_realname_find);
+ }
/*
* If we've found the font, and its size field is either
* font name instead.
*/
if (!info || (info->size != size && info->size != 0)) {
- info = find234(fs->fonts_by_realname, (char *)fontname,
- fontinfo_realname_find);
+ struct fontinfo_realname_find f;
+ f.realname = fontname;
+ f.flags = flags;
+
+ info = find234(fs->fonts_by_realname, &f, fontinfo_realname_find);
if (!info || info->size != size)
return; /* font name not in our index */
}
* know everything we need to fill in all the fields in the
* dialog.
*/
- unifontsel_select_font(fs, info, size, 0);
+ unifontsel_select_font(fs, info, size, 0, TRUE);
}
char *unifontsel_get_name(unifontsel *fontsel)
unifontsel_internal *fs = (unifontsel_internal *)fontsel;
char *name;
- assert(fs->selected);
+ if (!fs->selected)
+ return NULL;
if (fs->selected->size == 0) {
name = fs->selected->fontclass->scale_fontname
(GTK_WIDGET(fs->u.window), fs->selected->realname, fs->selsize);
- if (name)
- return name;
+ if (name) {
+ char *ret = dupcat(fs->selected->fontclass->prefix, ":",
+ name, NULL);
+ sfree(name);
+ return ret;
+ }
}
- return dupstr(fs->selected->realname);
+ return dupcat(fs->selected->fontclass->prefix, ":",
+ fs->selected->realname, NULL);
}
+
+#endif /* GTK_CHECK_VERSION(2,0,0) */
projects / PuTTY.git / blobdiff