* and in particular whether it's client- or server-side,
* during the progress of the font selector.
*
- * - 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 if we could move the processing of
* underline and VT100 double width into this module, so that
* instead of using the ghastly pixmap-stretching technique
int shadowoffset, int shadowalways);
void (*destroy)(unifont *font);
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);
};
/* ----------------------------------------------------------------------
- * GDK-based X11 font implementation.
+ * X11 font implementation, directly using Xlib calls.
*/
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,
* 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;
/*
*/
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().
*/
int wide, bold, shadowoffset, shadowalways;
"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)) {
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 = '0';
- return gdk_text_width(font, (const gchar *)&space, 2);
+ return XTextWidth16(xfs, &space, 1);
} else {
- return gdk_char_width(font, '0');
+ return XTextWidth(xfs, "0", 1);
}
}
int shadowoffset, int shadowalways)
{
struct x11font *xfont;
- GdkFont *font;
XFontStruct *xfs;
- Display *disp;
+ 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);
* ascent and descent differ.
*/
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)
+ int dir, asc, desc;
+ XCharStruct cs;
+ XChar2b text;
+
+ text.byte1 = '\0';
+ text.byte2 = '\x12';
+ XTextExtents16(xfs, &text, 1, &dir, &asc, &desc, &cs);
+ if (asc != desc)
realcs = CS_ISO8859_1_X11;
}
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->real_charset = realcs;
+ xfont->fonts[0] = xfs;
xfont->allocated[0] = TRUE;
xfont->sixteen_bit = sixteen_bit;
xfont->variable = variable;
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_really_draw_text(GdkDrawable *target, GdkFont *font,
- GdkGC *gc, int x, int y,
- const gchar *string, int clen, int nchars,
- int shadowbold, int shadowoffset,
- int fontvariable, int cellwidth)
+#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)
{
- int step = clen * nchars, nsteps = 1, centre = FALSE;
+ 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 = clen;
+ 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 - gdk_text_width(font, string, step)) / 2;
+ X += (cellwidth - XTextWidth16(xfs, string, step)) / 2;
- gdk_draw_text(target, font, gc, X, y, string, step);
- if (shadowbold)
- gdk_draw_text(target, font, gc, X + shadowoffset, y, string, step);
+ 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_draw_text(GdkDrawable *target, GdkGC *gc, unifont *font,
- int x, int y, const char *string, int len,
+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;
* 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];
}
- x11font_really_draw_text(target, xfont->fonts[sfid], gc, x, y,
- (gchar *)xcs, 2, nchars,
- shadowbold, xfont->shadowoffset,
- xfont->variable, cellwidth * mult);
+ x11font_really_draw_text_16(target, xfont->fonts[sfid], gc, x, y,
+ xcs, len, shadowoffset,
+ xfont->variable, cellwidth * mult);
sfree(xcs);
- sfree(wcs);
} else {
+ /*
+ * 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,
- string, 1, len,
- shadowbold, xfont->shadowoffset,
+ sbstring, sblen, shadowoffset,
xfont->variable, cellwidth * mult);
+ sfree(sbstring);
}
}
* _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)) {
fontprop2 = XInternAtom(disp, "PIXEL_SIZE", False);
if (XGetFontProperty(xfs, fontprop2, &fsize) && fsize > 0) {
*size = fsize;
- gdk_font_unref(font);
+ XFreeFont(disp, xfs);
if (flags) {
if (name[0] == '-' || resolve_aliases)
*flags = FONTFLAG_SERVERSIDE;
}
}
- gdk_font_unref(font);
+ XFreeFont(disp, xfs);
+
return NULL; /* something went wrong */
}
#endif
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,
pfont->u.height = pfont->u.ascent + pfont->u.descent;
/* 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;
}
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) {
+ /*
+ * 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;
/*
* 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++;
n = 1;
/*
* See if that character has the width we expect.
*/
- pango_layout_set_text(layout, string, clen);
+ 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 < len) {
+ while (clen < utflen) {
int oldclen = clen;
clen++; /* skip UTF-8 introducer byte */
- 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++;
n++;
- pango_layout_set_text(layout, string, clen);
+ pango_layout_set_text(layout, utfptr, clen);
pango_layout_get_pixel_extents(layout, NULL, &rect);
if (rect.width != n * cellwidth) {
clen = oldclen;
}
}
- pango_layout_set_text(layout, string, clen);
+ pango_layout_set_text(layout, utfptr, clen);
pango_layout_get_pixel_extents(layout, NULL, &rect);
gdk_draw_layout(target, gc, x + (n*cellwidth - rect.width)/2,
y + (pfont->u.height - rect.height)/2, layout);
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;
+ utflen -= clen;
+ utfptr += clen;
x += n * cellwidth;
}
+ sfree(utfstring);
+
g_object_unref(layout);
}
}
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,
*/
info->fontclass->draw_text(fs->preview_pixmap, gc, font,
0, font->ascent,
- "bankrupt jilted showmen quiz convex fogey",
+ 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,
- "BANKRUPT JILTED SHOWMEN QUIZ CONVEX FOGEY",
+ L"BANKRUPT JILTED SHOWMEN QUIZ CONVEX FOGEY",
41, FALSE, FALSE, font->width);
/*
* The ordering of punctuation here is also selected
*/
info->fontclass->draw_text(fs->preview_pixmap, gc, font,
0, font->ascent + font->height * 2,
- "0123456789!?,.:;<>()[]{}\\/`'\"+*-=~#_@|%&^$",
+ L"0123456789!?,.:;<>()[]{}\\/`'\"+*-=~#_@|%&^$",
42, FALSE, FALSE, font->width);
}
gdk_gc_unref(gc);