comparison src/w32font.c @ 90964:269d87dc10d9

(Qgdi): Rename from Qw32.
author Jason Rumney <jasonr@gnu.org>
date Sun, 24 Jun 2007 20:49:24 +0000
parents bd1251472ab9
children 8be09e8e2c97
comparison
equal deleted inserted replaced
90963:28e2fa3c7ca3 90964:269d87dc10d9
37 TEXTMETRIC metrics; 37 TEXTMETRIC metrics;
38 }; 38 };
39 39
40 extern struct font_driver w32font_driver; 40 extern struct font_driver w32font_driver;
41 41
42 Lisp_Object Qw32, QCfamily; 42 Lisp_Object Qgdi, QCfamily;
43 static Lisp_Object Qmonospace, Qsans_serif, Qserif, Qmono, Qsans, Qsans__serif; 43 static Lisp_Object Qmonospace, Qsans_serif, Qserif, Qmono, Qsans, Qsans__serif;
44 static Lisp_Object Qscript, Qdecorative, Qraster, Qoutline, Qunknown; 44 static Lisp_Object Qscript, Qdecorative, Qraster, Qoutline, Qunknown;
45 45
46 /* scripts */ 46 /* scripts */
47 static Lisp_Object Qlatin, Qgreek, Qcoptic, Qcyrillic, Qarmenian, Qhebrew; 47 static Lisp_Object Qlatin, Qgreek, Qcoptic, Qcyrillic, Qarmenian, Qhebrew;
293 font->font.default_ascent = w32_font->metrics.tmAscent; 293 font->font.default_ascent = w32_font->metrics.tmAscent;
294 font->font.font_encoder = NULL; 294 font->font.font_encoder = NULL;
295 font->entity = font_entity; 295 font->entity = font_entity;
296 font->pixel_size = size; 296 font->pixel_size = size;
297 font->driver = &w32font_driver; 297 font->driver = &w32font_driver;
298 font->format = Qw32; 298 font->format = Qgdi;
299 font->file_name = NULL; 299 font->file_name = NULL;
300 font->encoding_charset = -1; 300 font->encoding_charset = -1;
301 font->repertory_charset = -1; 301 font->repertory_charset = -1;
302 font->min_width = 0; 302 font->min_width = 0;
303 font->ascent = w32_font->metrics.tmAscent; 303 font->ascent = w32_font->metrics.tmAscent;
630 LOGFONT *lf = (LOGFONT*) logical_font; 630 LOGFONT *lf = (LOGFONT*) logical_font;
631 BYTE generic_type; 631 BYTE generic_type;
632 632
633 entity = Fmake_vector (make_number (FONT_ENTITY_MAX), Qnil); 633 entity = Fmake_vector (make_number (FONT_ENTITY_MAX), Qnil);
634 634
635 ASET (entity, FONT_TYPE_INDEX, Qw32); 635 ASET (entity, FONT_TYPE_INDEX, Qgdi);
636 ASET (entity, FONT_FRAME_INDEX, frame); 636 ASET (entity, FONT_FRAME_INDEX, frame);
637 ASET (entity, FONT_REGISTRY_INDEX, w32_registry (lf->lfCharSet)); 637 ASET (entity, FONT_REGISTRY_INDEX, w32_registry (lf->lfCharSet));
638 ASET (entity, FONT_OBJLIST_INDEX, Qnil); 638 ASET (entity, FONT_OBJLIST_INDEX, Qnil);
639 639
640 /* Foundry is difficult to get in readable form on Windows. 640 /* Foundry is difficult to get in readable form on Windows.
1246 } 1246 }
1247 1247
1248 1248
1249 struct font_driver w32font_driver = 1249 struct font_driver w32font_driver =
1250 { 1250 {
1251 0, /* Qw32 */ 1251 0, /* Qgdi */
1252 w32font_get_cache, 1252 w32font_get_cache,
1253 w32font_list, 1253 w32font_list,
1254 w32font_match, 1254 w32font_match,
1255 w32font_list_family, 1255 w32font_list_family,
1256 NULL, /* free_entity */ 1256 NULL, /* free_entity */
1275 /* Initialize state that does not change between invocations. This is only 1275 /* Initialize state that does not change between invocations. This is only
1276 called when Emacs is dumped. */ 1276 called when Emacs is dumped. */
1277 void 1277 void
1278 syms_of_w32font () 1278 syms_of_w32font ()
1279 { 1279 {
1280 DEFSYM (Qw32, "w32"); 1280 DEFSYM (Qgdi, "gdi");
1281 1281
1282 /* Generic font families. */ 1282 /* Generic font families. */
1283 DEFSYM (Qmonospace, "monospace"); 1283 DEFSYM (Qmonospace, "monospace");
1284 DEFSYM (Qserif, "serif"); 1284 DEFSYM (Qserif, "serif");
1285 DEFSYM (Qsans_serif, "sans-serif"); 1285 DEFSYM (Qsans_serif, "sans-serif");
1343 DEFSYM (Qyi, "yi"); 1343 DEFSYM (Qyi, "yi");
1344 DEFSYM (Qbyzantine_musical_symbol, "byzantine-musical-symbol"); 1344 DEFSYM (Qbyzantine_musical_symbol, "byzantine-musical-symbol");
1345 DEFSYM (Qmusical_symbol, "musical-symbol"); 1345 DEFSYM (Qmusical_symbol, "musical-symbol");
1346 DEFSYM (Qmathematical, "mathematical"); 1346 DEFSYM (Qmathematical, "mathematical");
1347 1347
1348 w32font_driver.type = Qw32; 1348 w32font_driver.type = Qgdi;
1349 register_font_driver (&w32font_driver, NULL); 1349 register_font_driver (&w32font_driver, NULL);
1350 } 1350 }
1351 1351
1352 /* arch-tag: 65b8a3cd-46aa-4c0d-a1f3-99e75b9c07ee 1352 /* arch-tag: 65b8a3cd-46aa-4c0d-a1f3-99e75b9c07ee
1353 (do not change this comment) */ 1353 (do not change this comment) */