Mercurial > emacs
comparison src/w32term.c @ 24480:f9d3288b66c3
(W32_TEXTOUT): Do not multiply nchars by
charset_dim.
(dumpglyphs): Formatting fixes.
author | Geoff Voelker <voelker@cs.washington.edu> |
---|---|
date | Sun, 14 Mar 1999 05:27:21 +0000 |
parents | c5f1a1deffbb |
children | d0dee612f8e3 |
comparison
equal
deleted
inserted
replaced
24479:3b2c3636bf0e | 24480:f9d3288b66c3 |
---|---|
547 int charset_dim = CHARSET_DIMENSION(charset); \ | 547 int charset_dim = CHARSET_DIMENSION(charset); \ |
548 if (font->bdf) \ | 548 if (font->bdf) \ |
549 w32_BDF_TextOut (font->bdf, hdc, left + xoffset, \ | 549 w32_BDF_TextOut (font->bdf, hdc, left + xoffset, \ |
550 top + yoffset, \ | 550 top + yoffset, \ |
551 x_1byte_buffer + start_offset, \ | 551 x_1byte_buffer + start_offset, \ |
552 charset_dim, charset_dim * nchars, 0); \ | 552 charset_dim, nchars, 0); \ |
553 else if (print_via_unicode) \ | 553 else if (print_via_unicode) \ |
554 ExtTextOutW (hdc, left + xoffset, top + yoffset, \ | 554 ExtTextOutW (hdc, left + xoffset, top + yoffset, \ |
555 fuOptions, clip_region, \ | 555 fuOptions, clip_region, \ |
556 x_2byte_buffer + start_offset, nchars, NULL); \ | 556 x_2byte_buffer + start_offset, nchars, NULL); \ |
557 else \ | 557 else \ |
769 | 769 |
770 font = (XFontStruct *) (fontp->font); | 770 font = (XFontStruct *) (fontp->font); |
771 codepage = w32_codepage_for_font (fontp->name); | 771 codepage = w32_codepage_for_font (fontp->name); |
772 | 772 |
773 if ( font && !font->bdf ) | 773 if ( font && !font->bdf ) |
774 print_via_unicode = w32_use_unicode_for_codepage (codepage); | 774 print_via_unicode = w32_use_unicode_for_codepage (codepage); |
775 | 775 |
776 baseline = FONT_BASE (font) + fontp->baseline_offset; | 776 baseline = FONT_BASE (font) + fontp->baseline_offset; |
777 | 777 |
778 if (cmpcharp && cmpcharp->cmp_rule == NULL) | 778 if (cmpcharp && cmpcharp->cmp_rule == NULL) |
779 { | 779 { |
970 SetBkMode (hdc, background_filled ? TRANSPARENT : OPAQUE); | 970 SetBkMode (hdc, background_filled ? TRANSPARENT : OPAQUE); |
971 SetTextColor (hdc, fg); | 971 SetTextColor (hdc, fg); |
972 SetBkColor (hdc, bg); | 972 SetBkColor (hdc, bg); |
973 SetTextAlign (hdc, TA_BASELINE | TA_LEFT); | 973 SetTextAlign (hdc, TA_BASELINE | TA_LEFT); |
974 | 974 |
975 if ( print_via_unicode ) | 975 if (print_via_unicode) |
976 n_chars = MultiByteToWideChar | 976 n_chars = MultiByteToWideChar |
977 (codepage, 0, x_1byte_buffer, n_chars, | 977 (codepage, 0, x_1byte_buffer, n_chars, |
978 x_2byte_buffer, FRAME_WINDOW_WIDTH (f)); | 978 x_2byte_buffer, FRAME_WINDOW_WIDTH (f)); |
979 | 979 |
980 if (font) | 980 if (font) |