XEmacs 21.2.27 "Hera".

[chise/xemacs-chise.git.1] / src / redisplay.h

diff --git a/src/redisplay.h b/src/redisplay.h
index f79847c..b9772bf 100644 (file)
--- a/src/redisplay.h
+++ b/src/redisplay.h
@@ -97,7 +97,7 @@ typedef struct
 
    #### This should really be made smaller.
 */
-   
+
 typedef struct rune rune;
 struct rune
 {
@@ -121,12 +121,12 @@ struct rune
                                   this. */
                                 /* #### This isn't used as an rvalue anywhere!
                                    remove! */
-                                   
-  
+
+
   short xpos;                  /* horizontal starting position in pixels */
   short width;                 /* pixel width of rune */
-       
-  
+
+
   unsigned char cursor_type;   /* is this rune covered by the cursor? */
   unsigned char type;          /* type of rune object */
                                 /* We used to do bitfields here, but if I
@@ -560,7 +560,7 @@ extern int windows_structure_changed;
   gutter_changed = 0;                          \
   glyphs_changed = 0;                          \
   subwindows_changed = 0;                      \
-  subwindows_state_changed = 0;                        \
+  subwindows_state_changed = 0;                \
   windows_changed = 0;                         \
   windows_structure_changed = 0;               \
 } while (0)
@@ -578,6 +578,7 @@ extern int windows_structure_changed;
     (p)->toolbar_changed ||                    \
     (p)->gutter_changed ||                     \
     (p)->glyphs_changed ||                     \
+    (p)->size_changed ||                               \
     (p)->subwindows_changed ||                 \
     (p)->subwindows_state_changed ||           \
     (p)->windows_changed ||                    \
@@ -596,6 +597,7 @@ extern int windows_structure_changed;
     toolbar_changed ||                         \
     gutter_changed ||                          \
     glyphs_changed ||                          \
+    size_changed ||                            \
     subwindows_changed ||                      \
     subwindows_state_changed ||                        \
     windows_changed ||                         \
@@ -694,13 +696,18 @@ int window_half_pixpos (struct window *w);
 void redisplay_echo_area (void);
 void free_display_structs (struct window_mirror *mir);
 void free_display_lines (display_line_dynarr *dla);
-Bufbyte *generate_formatted_string (struct window *w, Lisp_Object format_str,
-                                    Lisp_Object result_str, face_index findex,
-                                    int type);
 void generate_displayable_area (struct window *w, Lisp_Object disp_string,
                                int xpos, int ypos, int width, int height,
                                display_line_dynarr* dl,
                                Bufpos start_pos, face_index default_face);
+/* `generate_title_string' in frame.c needs this */
+void generate_formatted_string_db (Lisp_Object format_str,
+                                  Lisp_Object result_str,
+                                  struct window *w,
+                                  struct display_line *dl,
+                                  struct display_block *db,
+                                  face_index findex,
+                                  int min_pixpos, int max_pixpos, int type);
 int real_current_modeline_height (struct window *w);
 int pixel_to_glyph_translation (struct frame *f, int x_coord,
                                int y_coord, int *col, int *row,