Mercurial > emacs
comparison src/w32term.c @ 23638:e6fb9ffee4f4
(dumpglyphs): Use FRAME_FONT for w32_fill_area.
| author | Geoff Voelker <voelker@cs.washington.edu> |
|---|---|
| date | Wed, 04 Nov 1998 23:38:42 +0000 |
| parents | 104ab9156299 |
| children | 516fc58a7b7b |
comparison
equal
deleted
inserted
replaced
| 23637:54b22e0a1f7b | 23638:e6fb9ffee4f4 |
|---|---|
| 1103 | 1103 |
| 1104 i = 1; | 1104 i = 1; |
| 1105 | 1105 |
| 1106 /* Draw the first character at the normal position. */ | 1106 /* Draw the first character at the normal position. */ |
| 1107 if (print_via_unicode) | 1107 if (print_via_unicode) |
| 1108 ExtTextOutW (hdc, left + x_offset, top /*+ baseline*/, | 1108 ExtTextOutW (hdc, left + x_offset, |
| 1109 top /*+ baseline*/, | |
| 1109 fuOptions, clip_region, | 1110 fuOptions, clip_region, |
| 1110 x_2byte_buffer, 1, NULL); | 1111 x_2byte_buffer, 1, NULL); |
| 1111 else if (CHARSET_DIMENSION (charset) > 1) | 1112 else if (CHARSET_DIMENSION (charset) > 1) |
| 1112 { | 1113 { |
| 1113 /* Keep character together */ | 1114 /* Keep character together */ |
| 1114 int n = CHARSET_DIMENSION (charset) ; | 1115 int n = CHARSET_DIMENSION (charset) ; |
| 1115 ExtTextOut (hdc, left + x_offset, top /*+ baseline*/, | 1116 ExtTextOut (hdc, left + x_offset, |
| 1117 top /*+ baseline*/, | |
| 1116 fuOptions, clip_region, | 1118 fuOptions, clip_region, |
| 1117 x_1byte_buffer, n, NULL); | 1119 x_1byte_buffer, n, NULL); |
| 1118 /* fiddle i. */ | 1120 /* fiddle i. */ |
| 1119 i += n - 1; | 1121 i += n - 1; |
| 1120 } | 1122 } |
| 1121 else | 1123 else |
| 1122 ExtTextOut (hdc, left + x_offset, top /*+ baseline*/, | 1124 ExtTextOut (hdc, left + x_offset, |
| 1125 top /*+ baseline*/, | |
| 1123 fuOptions, clip_region, | 1126 fuOptions, clip_region, |
| 1124 x_1byte_buffer, 1, NULL); | 1127 x_1byte_buffer, 1, NULL); |
| 1125 gidx++; | 1128 gidx++; |
| 1126 } | 1129 } |
| 1127 else | 1130 else |
| 1254 if (FRAME_FONT (f)->tm.tmDescent <= underline_position) | 1257 if (FRAME_FONT (f)->tm.tmDescent <= underline_position) |
| 1255 underline_position = FRAME_FONT (f)->tm.tmDescent - 1; | 1258 underline_position = FRAME_FONT (f)->tm.tmDescent - 1; |
| 1256 | 1259 |
| 1257 if (face->underline) | 1260 if (face->underline) |
| 1258 w32_fill_area (f, hdc, fg, left, | 1261 w32_fill_area (f, hdc, fg, left, |
| 1259 top + FONT_BASE (font) + underline_position, | 1262 top + FONT_BASE (FRAME_FONT (f)) |
| 1263 + underline_position, | |
| 1260 run_width, 1); | 1264 run_width, 1); |
| 1261 } | 1265 } |
| 1262 | 1266 |
| 1263 if (!cmpcharp) | 1267 if (!cmpcharp) |
| 1264 left += run_width; | 1268 left += run_width; |
| 5162 &Vw32_recognize_altgr, | 5166 &Vw32_recognize_altgr, |
| 5163 "Recognize right-alt and left-ctrl as AltGr.\n\ | 5167 "Recognize right-alt and left-ctrl as AltGr.\n\ |
| 5164 When nil, the right-alt and left-ctrl key combination is\n\ | 5168 When nil, the right-alt and left-ctrl key combination is\n\ |
| 5165 interpreted normally."); | 5169 interpreted normally."); |
| 5166 Vw32_recognize_altgr = Qt; | 5170 Vw32_recognize_altgr = Qt; |
| 5171 | |
| 5167 DEFVAR_BOOL ("w32-no-unicode-output", | 5172 DEFVAR_BOOL ("w32-no-unicode-output", |
| 5168 &w32_no_unicode_output, | 5173 &w32_no_unicode_output, |
| 5169 "Disable the use of Unicode for text output if non-nil.\n\ | 5174 "Disable the use of Unicode for text output if non-nil.\n\ |
| 5170 Unicode output may prevent some third party applications for displaying\n\ | 5175 Unicode output may prevent some third party applications for displaying\n\ |
| 5171 Far-East Languages on Windows 95/98 from working properly.\n\ | 5176 Far-East Languages on Windows 95/98 from working properly.\n\ |