emacs: src/w32font.c comparison

comparison src/w32font.c @ 90879:82b86c925f88

* w32font.c (w32font_open): Handle size, height and pixel_size better. (w32font_draw): Use options. (w32_enumfont_pattern_entity): Set size to 0 for scalable fonts. Fix detection of truetype fonts. (registry_to_w32_charset): Handle charsets other than iso8859-1 expressed as lisp symbols. (w32_registry): Express charset as lisp symbol. (fill_in_logfont): Reverse pixel and point height logic. Don't set width here. Set quality to default. * w32font.c: New file for w32 font backend.

author	Jason Rumney <jasonr@gnu.org>
date	Thu, 31 May 2007 13:20:11 +0000
parents	9a1ccf2dfd96
children	aa7f1d212e78

comparison

equal deleted inserted replaced

-:efe9a1312ac6
+:82b86c925f88
 Open a font specified by FONT_ENTITY on frame F.
 If the font is scalable, open it with PIXEL_SIZE.  */
 static struct font* w32font_open (FRAME_PTR f, Lisp_Object font_entity,
 int pixel_size)
 {
-int len;
+int len, size;
 LOGFONT logfont;
 HDC dc;
 HFONT hfont, old_font;
 Lisp_Object val;
 /* For backwards compatibility.  */
 return NULL;
 bzero (&logfont, sizeof (logfont));
 fill_in_logfont (f, &logfont, font_entity);
+size = XINT (AREF (font_entity, FONT_SIZE_INDEX));
+if (size == 0)
+size = pixel_size;
+logfont.lfHeight = size;
 hfont = CreateFontIndirect (&logfont);
 if (hfont == NULL)
 {
 xfree (w32_font);
 bcopy (logfont.lfFaceName, font->font.name, len);
 font->font.name[len] = '\0';
 font->font.full_name = font->font.name;
 font->font.charset = 0;
 font->font.codepage = 0;
-font->font.size = logfont.lfWidth;
+font->font.size = w32_font->metrics.tmMaxCharWidth;
-font->font.height = w32_font->metrics.tmHeight;
+font->font.height = w32_font->metrics.tmHeight
++ w32_font->metrics.tmExternalLeading;
 font->font.space_width = font->font.average_width
 = w32_font->metrics.tmAveCharWidth;
 font->font.vertical_centering = 0;
 font->font.encoding_type = 0;
 font->font.baseline_offset = 0;
 font->font.relative_compose = 0;
 font->font.default_ascent = w32_font->metrics.tmAscent;
 font->font.font_encoder = NULL;
 font->entity = font_entity;
-font->pixel_size = pixel_size;
+font->pixel_size = size;
 font->driver = &w32font_driver;
 font->format = Qw32;
 font->file_name = NULL;
 font->encoding_charset = -1;
 font->repertory_charset = -1;
 is nonzero, fill the background in advance.  It is assured that
 WITH_BACKGROUND is zero when (FROM > 0 || TO < S->nchars).  */
 static int w32font_draw (struct glyph_string *s, int from, int to,
 int x, int y, int with_background)
 {
+/* TODO: Do we need to specify ETO_GLYPH_INDEX or is char2b always utf-16?  */
 UINT options = 0;
 if (with_background)
 {
 options = ETO_OPAQUE;
 SetBkColor (s->hdc, s->gc->background);
 }
 else
 SetBkMode (s->hdc, TRANSPARENT);
-ExtTextOutW (s->hdc, x, y, 0, NULL, s->char2b + from, to - from + 1, NULL);
+ExtTextOutW (s->hdc, x, y, options, NULL, s->char2b + from, to - from, NULL);
 }
 /* w32 implementation of free_entity for font backend.
 Optional (if FONT_EXTRA_INDEX is not Lisp_Save_Value).
 Free FONT_EXTRA_INDEX field of FONT_ENTITY.
 ASET (entity, FONT_WEIGHT_INDEX, make_number (lf->lfWeight));
 ASET (entity, FONT_SLANT_INDEX, make_number (lf->lfItalic ? 200 : 100));
 ASET (entity, FONT_WIDTH_INDEX,
 make_number (physical_font->ntmTm.tmAveCharWidth));
-ASET (entity, FONT_SIZE_INDEX, make_number (abs (lf->lfHeight)));
+if (font_type & RASTER_FONTTYPE)
+ASET (entity, FONT_SIZE_INDEX, make_number (physical_font->ntmTm.tmHeight));
+else
+ASET (entity, FONT_SIZE_INDEX, make_number (0));
 /* Cache unicode codepoints covered by this font, as there is no other way
 of getting this information easily.  */
-if (font_type == TRUETYPE_FONTTYPE)
+if (font_type & TRUETYPE_FONTTYPE)
 {
 DWORD *subranges = xmalloc(16);
 memcpy (subranges, physical_font->ntmFontSig.fsUsb, 16);
 ASET (entity, FONT_EXTRA_INDEX, make_save_value (subranges, 0));
 }
 if (EQ (charset, Qiso10646_1) || EQ (charset, Qunicode_bmp)
 || EQ (charset, Qunicode_sip))
 return DEFAULT_CHARSET; /* UNICODE_CHARSET not defined in MingW32 */
 else if (EQ (charset, Qiso8859_1))
 return ANSI_CHARSET;
+else if (SYMBOLP (charset))
+return x_to_w32_charset (SDATA (SYMBOL_NAME (charset)));
 else if (STRINGP (charset))
 return x_to_w32_charset (SDATA (charset));
 else
 return DEFAULT_CHARSET;
 }
 static Lisp_Object w32_registry (LONG w32_charset)
 {
 if (w32_charset == ANSI_CHARSET)
 return Qiso8859_1;
 else
-return build_string (w32_to_x_charset (w32_charset, NULL));
+{
+char * charset = w32_to_x_charset (w32_charset, NULL);
+return intern_downcase (charset, strlen(charset));
+}
 }
 static void set_fonts_frame (Lisp_Object fontlist, Lisp_Object frame)
 {
 if (VECTORP (fontlist))
 /* TODO: Allow user to override dpi settings.  */
 /* Height  */
 tmp = AREF (font_spec, FONT_SIZE_INDEX);
 if (INTEGERP (tmp))
-logfont->lfHeight = -1 * dpi / 720 * XINT (tmp);
+logfont->lfHeight = -1 * XINT (tmp);
 else if (FLOATP (tmp))
-logfont->lfHeight = -1 * (int) XFLOAT(tmp);
+logfont->lfHeight = (int) (-1.0 *  dpi * XFLOAT_DATA (tmp) / 72.0);
-/* Width  */
+/* Width  TODO: makes fonts look distorted.
 tmp = AREF (font_spec, FONT_WIDTH_INDEX);
 if (INTEGERP (tmp))
 logfont->lfWidth = XINT (tmp);
+*/
 /* Escapement  */
 /* Orientation  */
 logfont->lfCharSet = registry_to_w32_charset (tmp);
 }
 /* Out Precision  */
 /* Clip Precision  */
-/* Quality  */
+/* Quality  TODO: Allow different quality to be specified, so user
+can enable/disable anti-aliasing for individual fonts.  */
+logfont->lfQuality = DEFAULT_QUALITY;
 /* Pitch and Family  */
 /* Facename  TODO: handle generic names  */
 tmp = AREF (font_spec, FONT_FAMILY_INDEX);
 /* Font families are interned  */
 if (SYMBOLP (tmp))

Mercurial > emacs

comparison src/w32font.c @ 90879:82b86c925f88