- BitmapRec *bmp = bitmap + glyph_rec.glyphs[i];
- char buf[5];
-
- XCopyArea (display, bmp->pixmap, raw_pixmap, gc,
- 0, 0, glyph_width, glyph_height,
- (glyph_width + 4) * i + 1, 1);
- XDrawRectangle (display, raw_pixmap, gc_set,
- (glyph_width + 4) * i, 0,
- glyph_width + 1, glyph_height + 1);
- XDrawLine (display, raw_pixmap, gc_set,
- (glyph_width + 4) * i + 1 + glyph_x, 1,
- (glyph_width + 4) * i + 1 + glyph_x, glyph_height + 1);
- XDrawLine (display, raw_pixmap, gc_set,
- (glyph_width + 4) * i + 1 + glyph_x + bmp->advance, 1,
- (glyph_width + 4) * i + 1 + glyph_x + bmp->advance,
- glyph_height + 1);
-
- sprintf (buf, "%04X", glyph_rec.codes[i]);
- XDrawString (display, raw_pixmap, gc_inv,
- (glyph_width + 1) * i + 1
- + (glyph_width - XTextWidth (font, buf, 4)) / 2,
- glyph_height + 2 + FONT_HEIGHT, buf, 4);
+ if (glyph_rec.glyphs[i] >= 0)
+ {
+ BitmapRec *bmp = bitmap + glyph_rec.glyphs[i];
+ char buf[5];
+
+ XCopyArea (display, bmp->pixmap, raw_pixmap, gc,
+ 0, 0, glyph_width, glyph_height,
+ (glyph_width + 4) * i + 1, 1);
+ XDrawRectangle (display, raw_pixmap, gc_set,
+ (glyph_width + 4) * i, 0,
+ glyph_width + 1, glyph_height + 1);
+ XDrawLine (display, raw_pixmap, gc_set,
+ (glyph_width + 4) * i + 1 + glyph_x, 1,
+ (glyph_width + 4) * i + 1 + glyph_x, glyph_height + 1);
+ XDrawLine (display, raw_pixmap, gc_set,
+ (glyph_width + 4) * i + 1 + glyph_x + bmp->advance, 1,
+ (glyph_width + 4) * i + 1 + glyph_x + bmp->advance,
+ glyph_height + 1);
+
+ sprintf (buf, "%04X", glyph_rec.codes[i]);
+ XDrawString (display, raw_pixmap, gc_inv,
+ (glyph_width + 4) * i + 1
+ + (glyph_width - XTextWidth (font, buf, 4)) / 2,
+ glyph_height + 2 + FONT_HEIGHT, buf, 4);
+ }
+ else
+ {
+ /* Variation Selector */
+ int idx = - glyph_rec.glyphs[i];
+ char buf[4];
+
+ sprintf (buf, "%03d", idx);
+ XDrawRectangle (display, raw_pixmap, gc_set,
+ (glyph_width + 4) * i, 0,
+ glyph_width + 1, glyph_height + 1);
+ XDrawString (display, raw_pixmap, gc_set,
+ (glyph_width + 4) * i + 1
+ + (glyph_width - XTextWidth (font, "VS", 2)) / 2,
+ 1 + glyph_height / 2, "VS", 2);
+ XDrawString (display, raw_pixmap, gc_set,
+ (glyph_width + 4) * i + 1
+ + (glyph_width - XTextWidth (font, buf, 3)) / 2,
+ 1 + glyph_height / 2 + FONT_ASCENT, buf, 3);
+ }