Changeset 4153

Timestamp:

2006年08月31日 21時28分44秒 (2 years ago)

Author:

miyoshi

Message:

* xdisp.c: Use FONT_INFO_FROM_ID instead of
MW32_FONT_INFO_FROM_FONT.

* fontset.h (FONT_INFO_FROM_ID): Call mw32_get_font_info().

Files:

• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/fontset.h (modified) (1 diff)
• trunk/src/xdisp.c (modified) (13 diffs)

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2006-08-31  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * xdisp.c: Use FONT_INFO_FROM_ID instead of
+        MW32_FONT_INFO_FROM_FONT.
+
+        * fontset.h (FONT_INFO_FROM_ID): Call mw32_get_font_info().
+
-2006-08-29  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

trunk/src/fontset.h

@@ -237 +237 @@
-   structure on frame F.  If ID is invalid, return null.  */
-
+#ifdef MEADOW
+#define FONT_INFO_FROM_ID(F, ID) mw32_get_font_info (F, ID)
+#else
-#define FONT_INFO_FROM_ID(F, ID)                                        \
-     (((ID) >= 0 && (ID) < FRAME_X_DISPLAY_INFO ((F))->font_table_size) \
-      ? (FRAME_X_DISPLAY_INFO ((F))->font_table + (ID))                 \
-      : 0)
+#endif
-
-extern Lisp_Object fontset_name P_ ((int));

trunk/src/xdisp.c

@@ -13105 +13105 @@
-                   && XFASTINT (w->last_overlay_modified) >= OVERLAY_MODIFF)))
-    {
+
-      /* If first window line is a continuation line, and window start
-         is inside the modified region, but the first change is before
@@ -18799 +18800 @@
-      if (charset != CHARSET_ASCII)
-        {
-#ifdef MEADOW
-          struct font_info *font_info = 0;
-          if (face->font)
-            {
-              font_info = MW32_FONT_INFO_FROM_FONT (face->font);
-              rif->encode_char (glyph->u.ch, char2b, font_info, two_byte_p);
-            }
-#else /* not MEADOW */
-          struct font_info *font_info
-            = FONT_INFO_FROM_ID (f, face->font_info_id);
@@ -18812 +18805 @@
-            glyph->font_type
-              = rif->encode_char (glyph->u.ch, char2b, font_info, two_byte_p);
-#endif /* not MEADOW */
-        }
-    }
@@ -18847 +18839 @@
-  s->face = faces[s->gidx];
-  s->font = s->face->font;
-#ifdef MEADOW
-  if (s->font)
-    s->font_info = MW32_FONT_INFO_FROM_FONT (s->font);
-#else /* not MEADOW */
-  s->font_info = FONT_INFO_FROM_ID (s->f, s->face->font_info_id);
-
-
+
-  /* For all glyphs of this composition, starting at the offset
-     S->gidx, until we reach the end of the definition or encounter a
@@ -18959 +18946 @@
-                                               s->char2b + s->nchars,
-                                               &two_byte_p);
- 
+
-      s->two_byte_p = two_byte_p;
-      ++s->nchars;
@@ -18971 +18958 @@
-
-  s->font = s->face->font;
-#ifdef MEADOW
-  if (s->font)
-    s->font_info = MW32_FONT_INFO_FROM_FONT (s->font);
-#else /* not MEADOW */
-  s->font_info = FONT_INFO_FROM_ID (s->f, s->face->font_info_id);
-#endif /* not MEADOW */
-
-  /* If the specified font could not be loaded, use the frame's font,
@@ -18992 +18974 @@
-                          s->pdx, &s->left_overhang, &s->right_overhang);
-#endif
-
+
-  /* Adjust base line for subscript/superscript text.  */
-  s->ybase += voffset;
@@ -19049 +19031 @@
-  s->face = FACE_FROM_ID (s->f, face_id);
-  s->font = s->face->font;
-#ifdef MEADOW
-  if (s->font)
-    s->font_info = MW32_FONT_INFO_FROM_FONT (s->font);
-#else /* not MEADOW */
-  s->font_info = FONT_INFO_FROM_ID (s->f, s->face->font_info_id);
-#endif /* not MEADOW */
-  s->width = glyph->pixel_width;
-  s->nchars = 1;
@@ -19100 +19077 @@
-      face = get_glyph_face_and_encoding (f, glyph, &char2b, NULL);
-      font = face->font;
-#ifdef MEADOW
-      if (font)
-        font_info = MW32_FONT_INFO_FROM_FONT (font);
-#else /* not MEADOW */
-      font_info = FONT_INFO_FROM_ID (f, face->font_info_id);
-#endif /* not MEADOW */
-      if (font  /* ++KFS: Should this be font_info ?  */
-          && (pcm = rif->per_char_metric (font, &char2b, glyph->font_type)))
@@ -19272 +19244 @@
-      if (face->font != NULL)
-        {
-#ifdef MEADOW
-          struct font_info *font_info
-            = MW32_FONT_INFO_FROM_FONT (face->font);
-#else /* not MEADOW */
-          struct font_info *font_info
-            = FONT_INFO_FROM_ID (f, face->font_info_id);
-#endif /* not MEADOW */
-          if (font_info)
-            rif->encode_char (c, char2b, font_info, 0);
@@ -20409 +20376 @@
-      else
-        {
-#ifdef MEADOW
-          font_info = MW32_FONT_INFO_FROM_FONT (font);
-#else /* not MEADOW */
-          font_info = FONT_INFO_FROM_ID (it->f, face->font_info_id);
-#endif /* not MEADOW */
-          boff = font_info->baseline_offset;
-          if (font_info->vertical_centering)
@@ -20756 +20719 @@
-      else
-        {
-#ifdef MEADOW
-          font_info = MW32_FONT_INFO_FROM_FONT (font);
-#else /* not MEADOW */
-          font_info = FONT_INFO_FROM_ID (it->f, face->font_info_id);
-#endif /* not MEADOW */
-          boff = font_info->baseline_offset;
-          if (font_info->vertical_centering)
@@ -20847 +20806 @@
-                {
-                  font_info
-#ifdef MEADOW
-                    = MW32_FONT_INFO_FROM_FONT (font);
-#else /* not MEADOW */
-                    = FONT_INFO_FROM_ID (it->f, face->font_info_id);
-#endif /* not MEADOW */
-                  boff = font_info->baseline_offset;
-                  if (font_info->vertical_centering)