emacs: src/w32font.c comparison

comparison src/w32font.c @ 91260:75f89f349f70

(w32font_text_extents): Dereference selected_frame. (w32_enumfont_pattern_entity): Map generic family to adstyle using most common hyphenless variation. (logfonts_match): Check generic family. (font_matches_spec): Don't check generic family here. (fill_in_logfont): Set generic family based on adstyle. + changes to sans-serif constants to avoid hyphen (for xfld compatibility)

author	Jason Rumney <jasonr@gnu.org>
date	Thu, 20 Dec 2007 00:10:57 +0000
parents	51863d34f0f1
children	9112e263c11f

comparison

equal deleted inserted replaced

-:51863d34f0f1
+:75f89f349f70
 #endif
 extern struct font_driver w32font_driver;
 Lisp_Object Qgdi;
-extern Lisp_Object QCfamily; /* reuse from xfaces.c  */
+static Lisp_Object Qmonospace, Qsansserif, Qmono, Qsans, Qsans_serif;
-static Lisp_Object Qmonospace, Qsans_serif, Qserif, Qmono, Qsans, Qsans__serif;
+static Lisp_Object Qserif, Qscript, Qdecorative;
-static Lisp_Object Qscript, Qdecorative, Qraster, Qoutline, Qunknown;
+static Lisp_Object Qraster, Qoutline, Qunknown;
 /* antialiasing  */
 extern Lisp_Object QCantialias; /* defined in font.c  */
 extern Lisp_Object Qnone; /* reuse from w32fns.c  */
 static Lisp_Object Qstandard, Qsubpixel, Qnatural;
 #if 0
 /* Frames can come and go, and their fonts outlive them. This is
 particularly troublesome with tooltip frames, and causes crashes.  */
 f = ((struct w32font_info *)font)->owning_frame;
 #else
-f = selected_frame;
+f = XFRAME (selected_frame);
 #endif
 dc = get_frame_dc (f);
 old_font = SelectObject (dc, ((W32FontStruct *)(font->font.font))->hfont);
 useful to users looking for a close match.  */
 generic_type = physical_font->ntmTm.tmPitchAndFamily & 0xF0;
 if (generic_type == FF_DECORATIVE)
 tem = Qdecorative;
 else if (generic_type == FF_MODERN)
-tem = Qmonospace;
+tem = Qmono;
 else if (generic_type == FF_ROMAN)
 tem = Qserif;
 else if (generic_type == FF_SCRIPT)
 tem = Qscript;
 else if (generic_type == FF_SWISS)
-tem = Qsans_serif;
+tem = Qsans;
 else
-tem = Qnil;
+tem = null_string;
-if (! NILP (tem))
+ASET (entity, FONT_ADSTYLE_INDEX, tem);
-font_put_extra (entity, QCfamily, tem);
 if (physical_font->ntmTm.tmPitchAndFamily & 0x01)
 font_put_extra (entity, QCspacing, make_number (FONT_SPACING_PROPORTIONAL));
 else
 font_put_extra (entity, QCspacing, make_number (FONT_SPACING_MONO));
 w32_generic_family (Lisp_Object name)
 {
 /* Generic families.  */
 if (EQ (name, Qmonospace) || EQ (name, Qmono))
 return FF_MODERN;
-else if (EQ (name, Qsans_serif) || EQ (name, Qsans__serif)
+else if (EQ (name, Qsans) || EQ (name, Qsans_serif) || EQ (name, Qsansserif))
-|| EQ (name, Qsans))
 return FF_SWISS;
 else if (EQ (name, Qserif))
 return FF_ROMAN;
 else if (EQ (name, Qdecorative))
 return FF_DECORATIVE;
 if (pattern->lfWeight
 && ((font->lfWeight < (pattern->lfWeight - 150))
 || font->lfWeight > (pattern->lfWeight + 150)))
 return 0;
+if (pattern->lfPitchAndFamily & 0xF0 != FF_DONTCARE
+&& pattern->lfPitchAndFamily & 0xF0 != font->lfPitchAndFamily & 0xF0)
+return 0;
 /* Charset and face should be OK.  Italic has to be checked
 against the original spec, in case we don't have any preference.  */
 return 1;
 }
 extra_entry = XCAR (extra);
 if (CONSP (extra_entry))
 {
 Lisp_Object key = XCAR (extra_entry);
 val = XCDR (extra_entry);
-if (EQ (key, QCfamily))
+if (EQ (key, QCspacing))
-{
-/* Generic family. Most useful when there is no font name
-specified. eg, if a script does not exist in the default
-font, we could look for a font with the same generic family
-that does support the script. Full PANOSE support would
-be better, but we need to open the font to get that.  */
-BYTE w32_family = w32_generic_family (val);
-/* Reject if FF_DONTCARE is returned, as it means the
-font spec is bad.  */
-if (w32_family == FF_DONTCARE
-|| w32_family != (font->ntmTm.tmPitchAndFamily & 0xF0))
-return 0;
-}
-else if (EQ (key, QCspacing))
 {
 int proportional;
 if (INTEGERP (val))
 {
 int spacing = XINT (val);
 strncpy (logfont->lfFaceName, SDATA (SYMBOL_NAME (tmp)), LF_FACESIZE);
 else if (STRINGP (tmp))
 strncpy (logfont->lfFaceName, SDATA (tmp), LF_FACESIZE);
 }
+tmp = AREF (font_spec, FONT_ADSTYLE_INDEX);
+if (!NILP (tmp))
+{
+/* Override generic family.  */
+BYTE family = w32_generic_family (tmp);
+if (family != FF_DONTCARE)
+logfont->lfPitchAndFamily = family | DEFAULT_PITCH;
+}
 /* Process EXTRA info.  */
 for ( ; CONSP (extra); extra = XCDR (extra))
 {
 tmp = XCAR (extra);
 if (CONSP (tmp))
 {
 Lisp_Object key, val;
 key = XCAR (tmp), val = XCDR (tmp);
-if (EQ (key, QCfamily))
+if (EQ (key, QCspacing))
-{
-/* Override generic family.  */
-BYTE family = w32_generic_family (val);
-if (family != FF_DONTCARE)
-logfont->lfPitchAndFamily
-= logfont->lfPitchAndFamily & 0x0F | family;
-}
-else if (EQ (key, QCspacing))
 {
 /* Set pitch based on the spacing property.  */
 if (INTEGERP (val))
 {
 int spacing = XINT (val);
 DEFSYM (Qgdi, "gdi");
 /* Generic font families.  */
 DEFSYM (Qmonospace, "monospace");
 DEFSYM (Qserif, "serif");
-DEFSYM (Qsans_serif, "sans-serif");
+DEFSYM (Qsansserif, "sansserif");
 DEFSYM (Qscript, "script");
 DEFSYM (Qdecorative, "decorative");
 /* Aliases.  */
-DEFSYM (Qsans__serif, "sans_serif");
+DEFSYM (Qsans_serif, "sans_serif");
 DEFSYM (Qsans, "sans");
 DEFSYM (Qmono, "mono");
 /* Fake foundries.  */
 DEFSYM (Qraster, "raster");

Mercurial > emacs

comparison src/w32font.c @ 91260:75f89f349f70