Changeset 4156

Timestamp:

2006年09月02日 13時44分49秒 (2 years ago)

Author:

miyoshi

Message:

* mw32term.c (mw32_draw_glyph_string_foreground): Don't use `pstr'
and `nbytes' of of the glyph string.

* xdisp.c (init_glyph_string): Removed arguments `pstr' and
`nbytes'.
(fill_glyph_string): Don't call SERIALIZE_FONTCP().
(INIT_GLYPH_STRING): Removed argument `pstr'.
(BUILD_STRETCH_GLYPH_STRING): Ditto.
(BUILD_IMAGE_GLYPH_STRING): Ditto.
(BUILD_CHAR_GLYPH_STRINGS): Ditto.
(BUILD_COMPOSITE_GLYPH_STRING): Ditto.

* dispextern.h (struct glyph_string): Removed members `pstr' and
`nbytes'.

Files:

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

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2006-09-02  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * mw32term.c (mw32_draw_glyph_string_foreground): Don't use `pstr'
+        and `nbytes' of of the glyph string.
+
+        * xdisp.c (init_glyph_string): Removed arguments `pstr' and
+        `nbytes'.
+        (fill_glyph_string): Don't call SERIALIZE_FONTCP().
+        (INIT_GLYPH_STRING): Removed argument `pstr'.
+        (BUILD_STRETCH_GLYPH_STRING): Ditto.
+        (BUILD_IMAGE_GLYPH_STRING): Ditto.
+        (BUILD_CHAR_GLYPH_STRINGS): Ditto.
+        (BUILD_COMPOSITE_GLYPH_STRING): Ditto.
+
+        * dispextern.h (struct glyph_string): Removed members `pstr' and
+        `nbytes'.
+
-2006-09-02  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

trunk/src/dispextern.h

@@ -1152 +1152 @@
-  XChar2b *char2b;
-  int nchars;
-#ifdef MEADOW
-  unsigned char *pstr;
-  int nbytes;
-#endif
-
-  /* A face-override for drawing cursors, mouse face and similar.  */

trunk/src/mw32term.c

@@ -1651 +1651 @@
-      RECT r;
-      int boff = s->font_info->baseline_offset;
+      char *char1b = (char *) s->char2b;
+      int charset_dim = s->two_byte_p ? 2 : 1;
-
-      if (s->font_info->vertical_centering)
@@ -1659 +1661 @@
-      r.right = s->x + s->width;
-      r.bottom = s->y + s->height;
+
+      /* If we can use 8-bit functions, condense S->char2b.  */
+      if (!s->two_byte_p)
+        for (i = 0; i < s->nchars; ++i)
+          *char1b++ = XCHAR2B_BYTE2 (&s->char2b[i]);
+      else
+        for (i = 0; i < s->nchars; ++i)
+          {
+            int c = s->char2b[i];
+            *char1b++ = XCHAR2B_BYTE1 (&c);
+            *char1b++ = XCHAR2B_BYTE2 (&c);
+          }
-
-      /* Draw text.  If background has already been filled, don't fill
@@ -1667 +1681 @@
-          || (s->background_filled_p && s->hl != DRAW_CURSOR))
-        {
-pstr
+char2b
-                                  x, s->ybase - boff,
-bytes
+chars * charset_dim
-        }
-      else
-        {
-pstr
+char2b
-                                  x, s->ybase - boff,
-bytes
+chars * charset_dim
-        }
-    }

trunk/src/xdisp.c

@@ -18654 +18654 @@
-
-static void
-
-
-
-
-
+
-     struct glyph_string *s;
-     DECLARE_HDC (hdc)
-     XChar2b *char2b;
-#ifdef MEADOW
-     unsigned char *pstr;
-#endif
-     struct window *w;
-     struct glyph_row *row;
@@ -18680 +18673 @@
-  s->window = FRAME_X_WINDOW (s->f);
-  s->char2b = char2b;
-#ifdef MEADOW
-  s->pstr = pstr;
-#endif
-  s->hl = hl;
-  s->row = row;
@@ -18895 +18885 @@
-  int voffset;
-  int glyph_not_available_p;
-#ifdef MEADOW
-/* Note for MW32 implementation.
-   This function also sets metrics of each character, which will
-   be used by textout method(ExtTextOut()) and glyph overhang
-   operations.  */
-  unsigned char *pstr = s->pstr;
-#endif
-
-  xassert (s->f == XFRAME (s->w->frame));
@@ -18926 +18909 @@
-                                             s->char2b + s->nchars,
-                                             &two_byte_p);
-#ifdef MEADOW
-      SERIALIZE_FONTCP (pstr, s->char2b[s->nchars]);
-#endif
-      s->two_byte_p = two_byte_p;
-      ++s->nchars;
@@ -18935 +18915 @@
-      ++glyph;
-    }
-#ifdef MEADOW
-  s->nbytes = pstr - s->pstr;
-#endif
-
-  s->font = s->face->font;
@@ -19318 +19295 @@
-/* On W32, silently add local `hdc' variable to argument list of
-   init_glyph_string.  */
-pstr, 
-pstr, 
+
+
-#else
-#define INIT_GLYPH_STRING(s, char2b, w, row, area, start, hl) \
@@ -19339 +19316 @@
-       {                                                                    \
-         s = (struct glyph_string *) alloca (sizeof *s);                    \
-NULL, w, row, area, START, HL);
+w, row, area, START, HL); 
-         START = fill_stretch_glyph_string (s, row, area, START, END);      \
-         append_glyph_string (&HEAD, &TAIL, s);                             \
@@ -19359 +19336 @@
-       {                                                                \
-         s = (struct glyph_string *) alloca (sizeof *s);                \
-NULL, w, row, area, START, HL);
+w, row, area, START, HL); 
-         fill_image_glyph_string (s);                                   \
-         append_glyph_string (&HEAD, &TAIL, s);                         \
@@ -19382 +19359 @@
-         int c, face_id;                                                   \
-         XChar2b *char2b;                                                  \
-         unsigned char *pstr;                                              \
-                                                                           \
-         c = (row)->glyphs[area][START].u.ch;                              \
@@ -19388 +19364 @@
-                                                                           \
-         s = (struct glyph_string *) alloca (sizeof *s);                   \
-
-
-
+
+
-         append_glyph_string (&HEAD, &TAIL, s);                            \
-         s->x = (X);                                                       \
-  
+
-       }                                                                   \
-     while (0)
@@ -19437 +19412 @@
-      {                                                                   \
-        s = (struct glyph_string *) alloca (sizeof *s);                   \
-NULL, w, row, area, START, HL);
+w, row, area, START, HL);     
-        append_glyph_string (&(HEAD), &(TAIL), s);                        \
-        s->cmp = cmp;                                                     \