emacs: src/w32term.c comparison

comparison src/w32term.c @ 23806:b59294a6167e

(dumpglyphs): Use unsigned char arrays. Use FONT_MAX_WIDTH to detect and fudge proportional fonts for various languages. Compensate for fonts that have underhangs (e.g., Thai).

author	Geoff Voelker <voelker@cs.washington.edu>
date	Thu, 03 Dec 1998 00:06:03 +0000
parents	70999481c915
children	ef1cba882819

comparison

equal deleted inserted replaced

-:44ad68548ff9
+:b59294a6167e
 wchar_t *x_2byte_buffer
 = (wchar_t *) alloca (FRAME_WINDOW_WIDTH (f) * sizeof (*x_2byte_buffer));
 register wchar_t *cp;         /* Steps through x_2byte_buffer[].  */
 /* Allocate double the window width, as this buffer may contain MBCS
-characters under w32.  */
+characters under w32.  Unsigned to let GetCharABCWidths work.  */
-char *x_1byte_buffer
+unsigned char *x_1byte_buffer
-= (char *) alloca (2 * FRAME_WINDOW_WIDTH (f) * sizeof (*x_1byte_buffer));
+= (unsigned char *) alloca (2 * FRAME_WINDOW_WIDTH (f)
-register char *bp;            /* Steps through x_1byte_buffer[].  */
+* sizeof (*x_1byte_buffer));
+register unsigned char *bp;       /* Steps through x_1byte_buffer[]. */
 register int tlen = GLYPH_TABLE_LENGTH;
 register Lisp_Object *tbase = GLYPH_TABLE_BASE;
 Window window = FRAME_W32_WINDOW (f);
 HDC hdc = get_frame_dc (f);
 int orig_left = left;
 	  require_clipping = (!NILP (Vclip_large_size_font)
 			      && (font->tm.tmAscent > baseline
 				  || font->tm.tmDescent >
 line_height - baseline
 				  || (!cmpcharp
-				      && FONT_WIDTH (font) > glyph_width)));
+				      && FONT_MAX_WIDTH (font) > glyph_width)));
 if (font && (just_foreground || (cmpcharp && gidx > 0)))
 background_filled = 1;
 /* Stippling not supported under w32.  */
 else if (!font
 || FONT_HEIGHT (font) < line_height
 || FONT_WIDTH (font) < glyph_width
+|| FONT_MAX_WIDTH (font) != FONT_WIDTH (font)
 || cmpcharp)
 {
 	    /* Fill in the background for the current run.  */
 w32_fill_area (f, hdc, bg,
 left,
 	    SelectObject (hdc, font->hfont);
 if (!cmpcharp)
 	      {
 int multibyte_pos_offset = 0;
-if (require_clipping || FONT_WIDTH (font) != glyph_width)
+if (require_clipping || FONT_WIDTH (font) != glyph_width
+|| FONT_MAX_WIDTH (font) != FONT_WIDTH (font))
 {
 RECT clip_rectangle;
 LPRECT clip_region = NULL;
 UINT fuOptions = 0;
 {
 /* Handle composite characters.  */
 RECT clip_rectangle;
 LPRECT clip_region = NULL;
 UINT fuOptions = 0;
+ABC char_placement;
+int char_width = 0;
 if (require_clipping)
 		  {
 /* Set up a clipping rectangle for ExtTextOut */
 fuOptions |= ETO_CLIPPED;
 		    if (cmpcharp->cmp_rule)
 		      x_offset = (cmpcharp->col_offset[0]
 				  * FONT_WIDTH (FRAME_FONT (f)));
 i = 1;
+/* Truetype fonts often contain underhangs to
+handle composition characters. This works
+against our attempts to position the characters
+manually, so we need to compensate for this.
+*/
+if (print_via_unicode ?
+GetCharABCWidthsW (hdc, *x_2byte_buffer,
+*x_2byte_buffer,
+&char_placement)
+: GetCharABCWidths (hdc, *x_1byte_buffer,
+*x_1byte_buffer,
+&char_placement))
+{
+char_width = char_placement.abcA
++ char_placement.abcB + char_placement.abcC;
+x_offset += FONT_WIDTH (font) - char_width;
+}
+/* Don't let characters go beyond the glyph
+boundary whatever their over/underhangs. */
+if (x_offset > glyph_width - char_width)
+x_offset = glyph_width - char_width;
+if (x_offset < 0)
+x_offset = 0;
 		    /* Draw the first character at the normal position.  */
 if (print_via_unicode)
 ExtTextOutW (hdc, left + x_offset,
 top /*+ baseline*/,
 			  lowest = bottom;
 			y_offset = bottom + font->tm.tmDescent;
 			x_offset = (cmpcharp->col_offset[gidx]
 				    * FONT_WIDTH (FRAME_FONT(f)));
 		      }
+/* Truetype fonts often contain underhangs to
+handle composition characters. This works
+against our attempts to position the characters
+manually, so we need to compensate for this.
+*/
+if (print_via_unicode ?
+GetCharABCWidthsW (hdc, *(x_2byte_buffer + i),
+*(x_2byte_buffer + i),
+&char_placement)
+: GetCharABCWidths (hdc, *(x_1byte_buffer + i),
+*(x_1byte_buffer + i),
+&char_placement))
+{
+char_width = char_placement.abcA
++ char_placement.abcB + char_placement.abcC;
+x_offset += FONT_WIDTH (font) - char_width;
+}
+/* Don't let characters go beyond the glyph
+boundary whatever their over/underhangs. */
+if (x_offset > glyph_width - char_width)
+x_offset = glyph_width - char_width;
+if (x_offset < 0)
+x_offset = 0;
 if (print_via_unicode)
 ExtTextOutW (hdc, left + x_offset,
 top /*+ baseline - y_offset*/,
 fuOptions, clip_region,

Mercurial > emacs

comparison src/w32term.c @ 23806:b59294a6167e