Changeset 4157

Timestamp:

09/03/06 18:01:41 (2 years ago)

Author:

miyoshi

Message:

(mw32_draw_glyph_string_foreground): Take account of
horizontal offsets of the glyph string. This code is moved from
xdisp.c.

Files:

• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/mw32term.c (modified) (3 diffs)

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2006-09-03  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * mw32term.c (mw32_draw_glyph_string_foreground): Take account of
+        horizontal offsets of the glyph string. This code is moved from
+        xdisp.c.
+
-2006-09-02  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

trunk/src/mw32term.c

@@ -1653 +1653 @@
-      char *char1b = (char *) s->char2b;
-      int charset_dim = s->two_byte_p ? 2 : 1;
+      int *pdx = (int*) alloca (s->nchars * sizeof (int) * MAXBYTES1FCP);
+      int *p = pdx;
+      int option;
-
-      if (s->font_info->vertical_centering)
@@ -1674 +1677 @@
-          }
-
+      memset (pdx, 0, (s->nchars * sizeof (int) * MAXBYTES1FCP));
+      for (i = 0; i < s->nchars; ++i)
+        {
+          struct glyph *g = s->first_glyph + i;
+          *p = g->pixel_width;
+          /* Strip off extra width of a box line */
+          if (i == 0
+              && s->face->box != FACE_NO_BOX
+              && s->first_glyph->left_box_line_p)
+            *p -= abs (s->face->box_line_width);
+          p += charset_dim;
+        }
+
-      /* Draw text.  If background has already been filled, don't fill
-         background.  But when drawing the cursor, always fill background
@@ -1680 +1696 @@
-      if (s->for_overlaps
-          || (s->background_filled_p && s->hl != DRAW_CURSOR))
-
-
-
-
-
+
-      else
-{
-
-                                 x, s->ybase - boff
-         s->nchars * charset_dim, 0, &r, ETO_OPAQUE);
-}
+option = ETO_OPAQUE;
+
+      MW32_INVOKE_OUTPUTPROC (s->font, s->hdc, s->char2b
+      x, s->ybase - boff,
+                     s->nchars * charset_dim, pdx, &r, option);
-    }
-}