From: Kenichi Handa <handa@m17n.org>
Date: Thu, 13 Sep 2007 10:46:21 +0000 (+0000)
Subject: (struct glyph_row): New member clip.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~338
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7cd30fff0b05530104be8081bddc8cb115557ec0;p=emacs.git

(struct glyph_row): New member clip.
(struct glyph_string): Delete members clip_x, clip_y, clip_width,
clip_height, new member clip, and num_clips.
---

diff --git a/src/dispextern.h b/src/dispextern.h
index c07b4b36f92..7aab192448d 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -852,6 +852,10 @@ struct glyph_row
 
   /* Continuation lines width at the start of the row.  */
   int continuation_lines_width;
+
+  /* Non-NULL means the current clipping area.  This is temporarily
+     set while exposing a region.  Coordinates are frame-relative.  */
+  XRectangle *clip;
 };
 
 
@@ -1220,10 +1224,11 @@ struct glyph_string
      *clip_tail, not including their overhangs.  */
   struct glyph_string *clip_head, *clip_tail;
 
-#ifdef USE_FONT_BACKEND
-  /* The current clipping area.  */
-  int clip_x, clip_y, clip_width, clip_height;
-#endif	/* USE_FONT_BACKEND */
+  /* The current clipping areas.  */
+  NativeRectangle clip[2];
+
+  /* Number of clipping areas. */
+  int num_clips;
 
   struct glyph_string *next, *prev;
 };