Mercurial > emacs
comparison src/w32font.c @ 95315:3d4da4481f75
(w32_weight_table): Remove unused variable.
(w32_enumfont_pattern_entity): Use FONT_SPACING_CHARCELL for
backwards compatibility.
author | Jason Rumney <jasonr@gnu.org> |
---|---|
date | Mon, 26 May 2008 14:05:38 +0000 |
parents | 525a75a42888 |
children | 48f990d65758 |
comparison
equal
deleted
inserted
replaced
95314:325b3c8ac762 | 95315:3d4da4481f75 |
---|---|
982 ASET (entity, FONT_ADSTYLE_INDEX, tem); | 982 ASET (entity, FONT_ADSTYLE_INDEX, tem); |
983 | 983 |
984 if (physical_font->ntmTm.tmPitchAndFamily & 0x01) | 984 if (physical_font->ntmTm.tmPitchAndFamily & 0x01) |
985 ASET (entity, FONT_SPACING_INDEX, make_number (FONT_SPACING_PROPORTIONAL)); | 985 ASET (entity, FONT_SPACING_INDEX, make_number (FONT_SPACING_PROPORTIONAL)); |
986 else | 986 else |
987 ASET (entity, FONT_SPACING_INDEX, make_number (FONT_SPACING_MONO)); | 987 ASET (entity, FONT_SPACING_INDEX, make_number (FONT_SPACING_CHARCELL)); |
988 | 988 |
989 if (requested_font->lfQuality != DEFAULT_QUALITY) | 989 if (requested_font->lfQuality != DEFAULT_QUALITY) |
990 { | 990 { |
991 font_put_extra (entity, QCantialias, | 991 font_put_extra (entity, QCantialias, |
992 lispy_antialias_type (requested_font->lfQuality)); | 992 lispy_antialias_type (requested_font->lfQuality)); |
1388 char * charset = w32_to_x_charset (w32_charset, NULL); | 1388 char * charset = w32_to_x_charset (w32_charset, NULL); |
1389 return font_intern_prop (charset, strlen(charset)); | 1389 return font_intern_prop (charset, strlen(charset)); |
1390 } | 1390 } |
1391 } | 1391 } |
1392 | 1392 |
1393 static struct | |
1394 { | |
1395 unsigned w32_numeric; | |
1396 unsigned numeric; | |
1397 } w32_weight_table[] = | |
1398 { { FW_THIN, 0 }, | |
1399 { FW_EXTRALIGHT, 40 }, | |
1400 { FW_LIGHT, 50}, | |
1401 { FW_NORMAL, 100}, | |
1402 { FW_MEDIUM, 100}, | |
1403 { FW_SEMIBOLD, 180}, | |
1404 { FW_BOLD, 200}, | |
1405 { FW_EXTRABOLD, 205}, | |
1406 { FW_HEAVY, 210} }; | |
1407 | |
1408 static int | 1393 static int |
1409 w32_decode_weight (fnweight) | 1394 w32_decode_weight (fnweight) |
1410 int fnweight; | 1395 int fnweight; |
1411 { | 1396 { |
1412 if (fnweight >= FW_HEAVY) return 210; | 1397 if (fnweight >= FW_HEAVY) return 210; |