Mercurial > emacs

changeset 41133:e75b04a40358

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fringe cleanup. Comment fixes. Use renamed symbols. (fringes_extra): Renamed from flags_areas_extra. (FRAME_FRINGE_BITMAP_WIDTH): Renamed from FRAME_FLAGS_BITMAP_WIDTH. (FRAME_FRINGE_BITMAP_HEIGHT): Renamed from FRAME_FLAGS_BITMAP_HEIGHT. (FRAME_X_FRINGE_COLS): Renamed from FRAME_X_FLAGS_AREA_COLS. (FRAME_X_FRINGE_WIDTH): Renamed from FRAME_X_FLAGS_AREA_WIDTH. (FRAME_X_LEFT_FRINGE_WIDTH): Renamed from FRAME_X_LEFT_FLAGS_AREA_WIDTH. (FRAME_X_RIGHT_FRINGE_WIDTH): Renamed from FRAME_X_RIGHT_FLAGS_AREA_WIDTH.
author Kim F. Storm <storm@cua.dk>
date Fri, 16 Nov 2001 13:19:19 +0000
parents 2203939cc090
children 04a7db64864b
files mac/inc/macterm.h src/w32term.h src/xterm.h
diffstat 3 files changed, 54 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/mac/inc/macterm.h	Fri Nov 16 13:18:38 2001 +0000
+++ b/mac/inc/macterm.h	Fri Nov 16 13:19:19 2001 +0000
@@ -358,7 +358,7 @@
   /* The extra width currently allotted for the areas in which
      truncation marks, continuation marks, and overlay arrows are
      displayed.  */
-  int flags_areas_extra;
+  int fringes_extra;
 
   /* This is the gravity value for the specified window position.  */
   int win_gravity;
@@ -451,38 +451,38 @@
 #define FRAME_X_IMAGE_CACHE(F) FRAME_MAC_DISPLAY_INFO ((F))->image_cache
 
 
-/* Pixel width of the bitmaps drawn to indicate truncation,
+/* Pixel width of the fringe bitmaps drawn to indicate truncation,
    continuation etc.  */
 
-#define FRAME_FLAGS_BITMAP_WIDTH(f)	8
-#define FRAME_FLAGS_BITMAP_HEIGHT(f)	8
+#define FRAME_FRINGE_BITMAP_WIDTH(f)	8
+#define FRAME_FRINGE_BITMAP_HEIGHT(f)	8
 
-/* Total width of areas reserved for drawing truncation bitmaps,
+/* Total width of fringes reserved for drawing truncation bitmaps,
    continuation bitmaps and alike.  The width is in canonical char
    units of the frame.  This must currently be the case because window
    sizes aren't pixel values.  If it weren't the case, we wouldn't be
    able to split windows horizontally nicely.  */
 
-#define FRAME_X_FLAGS_AREA_COLS(F)				\
-     ((2 * FRAME_FLAGS_BITMAP_WIDTH ((F)) + CANON_X_UNIT ((F)) - 1)	\
+#define FRAME_X_FRINGE_COLS(F)				\
+     ((2 * FRAME_FRINGE_BITMAP_WIDTH ((F)) + CANON_X_UNIT ((F)) - 1)	\
       / CANON_X_UNIT ((F)))
 
-/* Total width of flags areas in pixels.  */
+/* Total width of fringes in pixels.  */
 
-#define FRAME_X_FLAGS_AREA_WIDTH(F) \
-     (FRAME_X_FLAGS_AREA_COLS ((F)) * CANON_X_UNIT ((F)))
+#define FRAME_X_FRINGE_WIDTH(F) \
+     (FRAME_X_FRINGE_COLS ((F)) * CANON_X_UNIT ((F)))
 
-/* Pixel-width of the left flags area.  */
+/* Pixel-width of the left fringe.  */
 
-#define FRAME_X_LEFT_FLAGS_AREA_WIDTH(F) \
-     (FRAME_X_FLAGS_AREA_WIDTH (F) / 2)
+#define FRAME_X_LEFT_FRINGE_WIDTH(F) \
+     (FRAME_X_FRINGE_WIDTH (F) / 2)
 
-/* Pixel-width of the right flags area.  Note that we are doing
+/* Pixel-width of the right fringe.  Note that we are doing
    integer arithmetic here, so don't loose a pixel if the total
    width is an odd number.  */
 
-#define FRAME_X_RIGHT_FLAGS_AREA_WIDTH(F) 	\
-     (FRAME_X_FLAGS_AREA_WIDTH (F) - FRAME_X_FLAGS_AREA_WIDTH (F) / 2)
+#define FRAME_X_RIGHT_FRINGE_WIDTH(F) 	\
+     (FRAME_X_FRINGE_WIDTH (F) - FRAME_X_FRINGE_WIDTH (F) / 2)
 
 
 
@@ -632,7 +632,7 @@
 #define CHAR_TO_PIXEL_WIDTH(f, width) \
   (CHAR_TO_PIXEL_COL (f, width) \
    + (f)->output_data.mac->vertical_scroll_bar_extra \
-   + (f)->output_data.mac->flags_areas_extra \
+   + (f)->output_data.mac->fringes_extra \
    + (f)->output_data.mac->internal_border_width)
 #define CHAR_TO_PIXEL_HEIGHT(f, height) \
   (CHAR_TO_PIXEL_ROW (f, height) \
@@ -653,7 +653,7 @@
 #define PIXEL_TO_CHAR_WIDTH(f, width) \
   (PIXEL_TO_CHAR_COL (f, ((width) \
 			  - (f)->output_data.mac->internal_border_width \
-			  - (f)->output_data.mac->flags_areas_extra \
+			  - (f)->output_data.mac->fringes_extra \
 			  - (f)->output_data.mac->vertical_scroll_bar_extra)))
 #define PIXEL_TO_CHAR_HEIGHT(f, height) \
   (PIXEL_TO_CHAR_ROW (f, ((height) \
--- a/src/w32term.h	Fri Nov 16 13:18:38 2001 +0000
+++ b/src/w32term.h	Fri Nov 16 13:19:19 2001 +0000
@@ -385,7 +385,7 @@
   /* The extra width currently allotted for the areas in which
      truncation marks, continuation marks, and overlay arrows are
      displayed.  */
-  int flags_areas_extra;
+  int fringes_extra;
 
   /* This is the gravity value for the specified window position.  */
   int win_gravity;
@@ -468,38 +468,38 @@
 #define FRAME_X_IMAGE_CACHE(F) FRAME_W32_DISPLAY_INFO ((F))->image_cache
 
 
-/* Pixel width of the bitmaps drawn to indicate truncation,
+/* Pixel width of the fringe bitmaps drawn to indicate truncation,
    continuation etc.  */
 
-#define FRAME_FLAGS_BITMAP_WIDTH(f)	8
-#define FRAME_FLAGS_BITMAP_HEIGHT(f)	8
+#define FRAME_FRINGE_BITMAP_WIDTH(f)	8
+#define FRAME_FRINGE_BITMAP_HEIGHT(f)	8
 
-/* Total width of areas reserved for drawing truncation bitmaps,
+/* Total width of fringes reserved for drawing truncation bitmaps,
    continuation bitmaps and alike.  The width is in canonical char
    units of the frame.  This must currently be the case because window
    sizes aren't pixel values.  If it weren't the case, we wouldn't be
    able to split windows horizontally nicely.  */
 
-#define FRAME_X_FLAGS_AREA_COLS(F)				\
-     ((2 * FRAME_FLAGS_BITMAP_WIDTH ((F)) + CANON_X_UNIT ((F)) - 1)	\
+#define FRAME_X_FRINGE_COLS(F)				\
+     ((2 * FRAME_FRINGE_BITMAP_WIDTH ((F)) + CANON_X_UNIT ((F)) - 1)	\
       / CANON_X_UNIT ((F)))
 
-/* Total width of flags areas in pixels.  */
+/* Total width of fringes in pixels.  */
 
-#define FRAME_X_FLAGS_AREA_WIDTH(F) \
-     (FRAME_X_FLAGS_AREA_COLS ((F)) * CANON_X_UNIT ((F)))
+#define FRAME_X_FRINGE_WIDTH(F) \
+     (FRAME_X_FRINGE_COLS ((F)) * CANON_X_UNIT ((F)))
 
-/* Pixel-width of the left flags area.  */
+/* Pixel-width of the left fringe.  */
 
-#define FRAME_X_LEFT_FLAGS_AREA_WIDTH(F) \
-     (FRAME_X_FLAGS_AREA_WIDTH (F) / 2)
+#define FRAME_X_LEFT_FRINGE_WIDTH(F) \
+     (FRAME_X_FRINGE_WIDTH (F) / 2)
 
-/* Pixel-width of the right flags area.  Note that we are doing
+/* Pixel-width of the right fringe.  Note that we are doing
    integer arithmetic here, so don't loose a pixel if the total
    width is an odd number.  */
 
-#define FRAME_X_RIGHT_FLAGS_AREA_WIDTH(F) 	\
-     (FRAME_X_FLAGS_AREA_WIDTH (F) - FRAME_X_FLAGS_AREA_WIDTH (F) / 2)
+#define FRAME_X_RIGHT_FRINGE_WIDTH(F) 	\
+     (FRAME_X_FRINGE_WIDTH (F) - FRAME_X_FRINGE_WIDTH (F) / 2)
 
 
 
@@ -657,7 +657,7 @@
 #define CHAR_TO_PIXEL_WIDTH(f, width) \
   (CHAR_TO_PIXEL_COL (f, width) \
    + (f)->output_data.w32->vertical_scroll_bar_extra \
-   + (f)->output_data.w32->flags_areas_extra \
+   + (f)->output_data.w32->fringes_extra \
    + (f)->output_data.w32->internal_border_width)
 #define CHAR_TO_PIXEL_HEIGHT(f, height) \
   (CHAR_TO_PIXEL_ROW (f, height) \
@@ -678,7 +678,7 @@
 #define PIXEL_TO_CHAR_WIDTH(f, width) \
   (PIXEL_TO_CHAR_COL (f, ((width) \
 			  - (f)->output_data.w32->internal_border_width \
-			  - (f)->output_data.w32->flags_areas_extra \
+			  - (f)->output_data.w32->fringes_extra \
 			  - (f)->output_data.w32->vertical_scroll_bar_extra)))
 #define PIXEL_TO_CHAR_HEIGHT(f, height) \
   (PIXEL_TO_CHAR_ROW (f, ((height) \
--- a/src/xterm.h	Fri Nov 16 13:18:38 2001 +0000
+++ b/src/xterm.h	Fri Nov 16 13:19:19 2001 +0000
@@ -537,7 +537,7 @@
   /* The extra width currently allotted for the areas in which
      truncation marks, continuation marks, and overlay arrows are
      displayed.  */
-  int flags_areas_extra;
+  int fringes_extra;
 
   /* This is the gravity value for the specified window position.  */
   int win_gravity;
@@ -661,38 +661,38 @@
 #define FRAME_X_IMAGE_CACHE(F) FRAME_X_DISPLAY_INFO ((F))->image_cache
 
 
-/* Pixel width of the bitmaps drawn to indicate truncation,
+/* Pixel width of the fringe bitmaps drawn to indicate truncation,
    continuation etc.  */
 
-#define FRAME_FLAGS_BITMAP_WIDTH(f)	8
-#define FRAME_FLAGS_BITMAP_HEIGHT(f)	8
+#define FRAME_FRINGE_BITMAP_WIDTH(f)	8
+#define FRAME_FRINGE_BITMAP_HEIGHT(f)	8
 
-/* Total width of a areas reserved for drawing truncation bitmaps,
+/* Total width of fringes reserved for drawing truncation bitmaps,
    continuation bitmaps and alike.  The width is in canonical char
    units of the frame.  This must currently be the case because window
    sizes aren't pixel values.  If it weren't the case, we wouldn't be
    able to split windows horizontally nicely.  */
 
-#define FRAME_X_FLAGS_AREA_COLS(F)					\
-     ((2 * FRAME_FLAGS_BITMAP_WIDTH ((F)) + CANON_X_UNIT ((F)) - 1)	\
+#define FRAME_X_FRINGE_COLS(F)					\
+     ((2 * FRAME_FRINGE_BITMAP_WIDTH ((F)) + CANON_X_UNIT ((F)) - 1)	\
       / CANON_X_UNIT ((F)))
 
-/* Total width of flags areas in pixels.  */
+/* Total width of fringes in pixels.  */
 
-#define FRAME_X_FLAGS_AREA_WIDTH(F) \
-     (FRAME_X_FLAGS_AREA_COLS ((F)) * CANON_X_UNIT ((F)))
+#define FRAME_X_FRINGE_WIDTH(F) \
+     (FRAME_X_FRINGE_COLS ((F)) * CANON_X_UNIT ((F)))
 
-/* Pixel-width of the left flags area.  */
+/* Pixel-width of the left fringe.  */
 
-#define FRAME_X_LEFT_FLAGS_AREA_WIDTH(F) \
-     (FRAME_X_FLAGS_AREA_WIDTH (F) / 2)
+#define FRAME_X_LEFT_FRINGE_WIDTH(F) \
+     (FRAME_X_FRINGE_WIDTH (F) / 2)
 
-/* Pixel-width of the right flags area.  Note that we are doing
+/* Pixel-width of the right fringe.  Note that we are doing
    integer arithmetic here, so don't loose a pixel if the total
    width is an odd number.  */
 
-#define FRAME_X_RIGHT_FLAGS_AREA_WIDTH(F) 	\
-     (FRAME_X_FLAGS_AREA_WIDTH (F) - FRAME_X_FLAGS_AREA_WIDTH (F) / 2)
+#define FRAME_X_RIGHT_FRINGE_WIDTH(F) 	\
+     (FRAME_X_FRINGE_WIDTH (F) - FRAME_X_FRINGE_WIDTH (F) / 2)
 
 
 
@@ -855,7 +855,7 @@
 #define CHAR_TO_PIXEL_WIDTH(f, width) \
   (CHAR_TO_PIXEL_COL (f, width) \
    + (f)->output_data.x->vertical_scroll_bar_extra \
-   + (f)->output_data.x->flags_areas_extra \
+   + (f)->output_data.x->fringes_extra \
    + (f)->output_data.x->internal_border_width)
 #define CHAR_TO_PIXEL_HEIGHT(f, height) \
   (CHAR_TO_PIXEL_ROW (f, height) \
@@ -876,7 +876,7 @@
 #define PIXEL_TO_CHAR_WIDTH(f, width) \
   (PIXEL_TO_CHAR_COL (f, ((width) \
 			  - (f)->output_data.x->internal_border_width \
-			  - (f)->output_data.x->flags_areas_extra \
+			  - (f)->output_data.x->fringes_extra \
 			  - (f)->output_data.x->vertical_scroll_bar_extra)))
 #define PIXEL_TO_CHAR_HEIGHT(f, height) \
   (PIXEL_TO_CHAR_ROW (f, ((height) \