aboutsummaryrefslogtreecommitdiffstats
path: root/src/dispextern.h
diff options
context:
space:
mode:
authorPaul Eggert2012-08-27 17:33:56 -0700
committerPaul Eggert2012-08-27 17:33:56 -0700
commit59ea14cde3090fe0bef42d646682b3801859be14 (patch)
treefc45ed91028b2720c2e1e8ebda4ee6e5c4684d51 /src/dispextern.h
parent95072a9468d22a66a22481722bc2f46ce30863d2 (diff)
downloademacs-59ea14cde3090fe0bef42d646682b3801859be14.tar.gz
emacs-59ea14cde3090fe0bef42d646682b3801859be14.zip
* dispnew.c: Use bool for boolean.
(frame_garbaged, display_completed, delayed_size_change) (fonts_changed_p, add_window_display_history) (add_frame_display_history, verify_row_hash) (adjust_glyph_matrix, clear_window_matrices, glyph_row_slice_p) (row_equal_p, realloc_glyph_pool) (allocate_matrices_for_frame_redisplay) (showing_window_margins_p) (adjust_frame_glyphs_for_frame_redisplay) (build_frame_matrix_from_leaf_window, make_current) (mirrored_line_dance, mirror_line_dance, update_frame) (update_window_tree, update_single_window) (check_current_matrix_flags, update_window, update_text_area) (update_window_line, set_window_update_flags, scrolling_window) (update_frame_1, scrolling, buffer_posn_from_coords) (do_pending_window_change, change_frame_size) (change_frame_size_1, sit_for): Use bool for boolean. (clear_glyph_matrix_rows): Rename from enable_glyph_matrix_rows, and remove last int (actually boolean) argument, which was always 0. All callers changed. * dispextern.h, frame.h, lisp.h: Reflect above API changes. * dispextern.h (struct composition_it): Use bool for boolean. (struct glyph_matrix): Don't assume buffer sizes can fit in 'int'. (struct bidi_it): Use unsigned:1, not int, for boolean prev_was_pdf. * dired.c (file_name_completion): Use bool for boolean. (This was missed in an earlier change.)
Diffstat (limited to 'src/dispextern.h')
-rw-r--r--src/dispextern.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/dispextern.h b/src/dispextern.h
index 6fe5e249836..1140d98f8a7 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -671,7 +671,7 @@ struct glyph_matrix
671 671
672 /* Values of BEGV and ZV as of last redisplay. Set in 672 /* Values of BEGV and ZV as of last redisplay. Set in
673 mark_window_display_accurate_1. */ 673 mark_window_display_accurate_1. */
674 int begv, zv; 674 ptrdiff_t begv, zv;
675}; 675};
676 676
677 677
@@ -1126,11 +1126,11 @@ struct glyph_row *matrix_row (struct glyph_matrix *, int);
1126 ((ROW)->phys_height - (ROW)->phys_ascent \ 1126 ((ROW)->phys_height - (ROW)->phys_ascent \
1127 > (ROW)->height - (ROW)->ascent) 1127 > (ROW)->height - (ROW)->ascent)
1128 1128
1129/* Non-zero means that fonts have been loaded since the last glyph 1129/* True means that fonts have been loaded since the last glyph
1130 matrix adjustments. The function redisplay_internal adjusts glyph 1130 matrix adjustments. The function redisplay_internal adjusts glyph
1131 matrices when this flag is non-zero. */ 1131 matrices when this flag is true. */
1132 1132
1133extern int fonts_changed_p; 1133extern bool fonts_changed_p;
1134 1134
1135/* A glyph for a space. */ 1135/* A glyph for a space. */
1136 1136
@@ -1149,7 +1149,7 @@ extern int updated_area;
1149/* Non-zero means last display completed. Zero means it was 1149/* Non-zero means last display completed. Zero means it was
1150 preempted. */ 1150 preempted. */
1151 1151
1152extern int display_completed; 1152extern bool display_completed;
1153 1153
1154 1154
1155 1155
@@ -1415,7 +1415,7 @@ struct glyph_string
1415 && !NILP (BVAR (XBUFFER (W->buffer), mode_line_format)) \ 1415 && !NILP (BVAR (XBUFFER (W->buffer), mode_line_format)) \
1416 && WINDOW_TOTAL_LINES (W) > 1) 1416 && WINDOW_TOTAL_LINES (W) > 1)
1417 1417
1418/* Value is non-zero if window W wants a header line. */ 1418/* Value is true if window W wants a header line. */
1419 1419
1420#define WINDOW_WANTS_HEADER_LINE_P(W) \ 1420#define WINDOW_WANTS_HEADER_LINE_P(W) \
1421 (!MINI_WINDOW_P ((W)) \ 1421 (!MINI_WINDOW_P ((W)) \
@@ -1856,7 +1856,6 @@ struct bidi_it {
1856 int resolved_level; /* final resolved level of this character */ 1856 int resolved_level; /* final resolved level of this character */
1857 int invalid_levels; /* how many PDFs to ignore */ 1857 int invalid_levels; /* how many PDFs to ignore */
1858 int invalid_rl_levels; /* how many PDFs from RLE/RLO to ignore */ 1858 int invalid_rl_levels; /* how many PDFs from RLE/RLO to ignore */
1859 int prev_was_pdf; /* if non-zero, previous char was PDF */
1860 struct bidi_saved_info prev; /* info about previous character */ 1859 struct bidi_saved_info prev; /* info about previous character */
1861 struct bidi_saved_info last_strong; /* last-seen strong directional char */ 1860 struct bidi_saved_info last_strong; /* last-seen strong directional char */
1862 struct bidi_saved_info next_for_neutral; /* surrounding characters for... */ 1861 struct bidi_saved_info next_for_neutral; /* surrounding characters for... */
@@ -1879,6 +1878,7 @@ struct bidi_it {
1879 struct bidi_string_data string; /* string to reorder */ 1878 struct bidi_string_data string; /* string to reorder */
1880 bidi_dir_t paragraph_dir; /* current paragraph direction */ 1879 bidi_dir_t paragraph_dir; /* current paragraph direction */
1881 ptrdiff_t separator_limit; /* where paragraph separator should end */ 1880 ptrdiff_t separator_limit; /* where paragraph separator should end */
1881 unsigned prev_was_pdf : 1; /* if non-zero, previous char was PDF */
1882 unsigned first_elt : 1; /* if non-zero, examine current char first */ 1882 unsigned first_elt : 1; /* if non-zero, examine current char first */
1883 unsigned new_paragraph : 1; /* if non-zero, we expect a new paragraph */ 1883 unsigned new_paragraph : 1; /* if non-zero, we expect a new paragraph */
1884 unsigned frame_window_p : 1; /* non-zero if displaying on a GUI frame */ 1884 unsigned frame_window_p : 1; /* non-zero if displaying on a GUI frame */
@@ -2085,10 +2085,10 @@ struct composition_it
2085 ptrdiff_t lookback; 2085 ptrdiff_t lookback;
2086 /* If non-negative, number of glyphs of the glyph-string. */ 2086 /* If non-negative, number of glyphs of the glyph-string. */
2087 int nglyphs; 2087 int nglyphs;
2088 /* Nonzero iff the composition is created while buffer is scanned in 2088 /* True iff the composition is created while buffer is scanned in
2089 reverse order, and thus the grapheme clusters must be rendered 2089 reverse order, and thus the grapheme clusters must be rendered
2090 from the last to the first. */ 2090 from the last to the first. */
2091 int reversed_p; 2091 bool reversed_p;
2092 2092
2093 /** The following members contain information about the current 2093 /** The following members contain information about the current
2094 grapheme cluster. */ 2094 grapheme cluster. */
@@ -3304,7 +3304,7 @@ extern Lisp_Object marginal_area_string (struct window *, enum window_part,
3304extern void redraw_frame (struct frame *); 3304extern void redraw_frame (struct frame *);
3305extern void cancel_line (int, struct frame *); 3305extern void cancel_line (int, struct frame *);
3306extern void init_desired_glyphs (struct frame *); 3306extern void init_desired_glyphs (struct frame *);
3307extern int update_frame (struct frame *, int, int); 3307extern bool update_frame (struct frame *, bool, bool);
3308extern void bitch_at_user (void); 3308extern void bitch_at_user (void);
3309void adjust_glyphs (struct frame *); 3309void adjust_glyphs (struct frame *);
3310void free_glyphs (struct frame *); 3310void free_glyphs (struct frame *);
@@ -3320,13 +3320,13 @@ void rotate_matrix (struct glyph_matrix *, int, int, int);
3320void increment_matrix_positions (struct glyph_matrix *, 3320void increment_matrix_positions (struct glyph_matrix *,
3321 int, int, ptrdiff_t, ptrdiff_t); 3321 int, int, ptrdiff_t, ptrdiff_t);
3322void blank_row (struct window *, struct glyph_row *, int); 3322void blank_row (struct window *, struct glyph_row *, int);
3323void enable_glyph_matrix_rows (struct glyph_matrix *, int, int, int); 3323void clear_glyph_matrix_rows (struct glyph_matrix *, int, int);
3324void clear_glyph_row (struct glyph_row *); 3324void clear_glyph_row (struct glyph_row *);
3325void prepare_desired_row (struct glyph_row *); 3325void prepare_desired_row (struct glyph_row *);
3326void set_window_update_flags (struct window *, int); 3326void set_window_update_flags (struct window *, bool);
3327void update_single_window (struct window *, int); 3327void update_single_window (struct window *, bool);
3328void do_pending_window_change (int); 3328void do_pending_window_change (bool);
3329void change_frame_size (struct frame *, int, int, int, int, int); 3329void change_frame_size (struct frame *, int, int, bool, bool, bool);
3330void init_display (void); 3330void init_display (void);
3331void syms_of_display (void); 3331void syms_of_display (void);
3332extern Lisp_Object Qredisplay_dont_pause; 3332extern Lisp_Object Qredisplay_dont_pause;