Mercurial > emacs

comparison src/dispextern.h @ 89991:6c1af301b455

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-48 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-581 Fix exec-shield autoconf test * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-582 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-584 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-585 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-586 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-38 Update from CVS
author Miles Bader <miles@gnu.org>
date Thu, 30 Sep 2004 01:20:39 +0000
parents e23928ac5a97 db333b320b67
children ff0e824afa37
comparison
equal deleted inserted replaced
89990:9cdfbf04b9ea 89991:6c1af301b455
102 ON_RIGHT_MARGIN, 102 ON_RIGHT_MARGIN,
103 ON_SCROLL_BAR 103 ON_SCROLL_BAR
104 }; 104 };
105 105
106 /* Number of bits allocated to store fringe bitmap numbers. */ 106 /* Number of bits allocated to store fringe bitmap numbers. */
107 #define FRINGE_ID_BITS 8 107 #define FRINGE_ID_BITS 16
108 108
109 109
110 110
111 /*********************************************************************** 111 /***********************************************************************
112 Debugging 112 Debugging
712 struct display_pos end; 712 struct display_pos end;
713 713
714 /* Left fringe bitmap number (enum fringe_bitmap_type). */ 714 /* Left fringe bitmap number (enum fringe_bitmap_type). */
715 unsigned left_user_fringe_bitmap : FRINGE_ID_BITS; 715 unsigned left_user_fringe_bitmap : FRINGE_ID_BITS;
716 716
717 /* Right fringe bitmap number (enum fringe_bitmap_type). */
718 unsigned right_user_fringe_bitmap : FRINGE_ID_BITS;
719
720 /* Left fringe bitmap number (enum fringe_bitmap_type). */
721 unsigned left_fringe_bitmap : FRINGE_ID_BITS;
722
723 /* Right fringe bitmap number (enum fringe_bitmap_type). */
724 unsigned right_fringe_bitmap : FRINGE_ID_BITS;
725
717 /* Face of the left fringe glyph. */ 726 /* Face of the left fringe glyph. */
718 unsigned left_user_fringe_face_id : FACE_ID_BITS; 727 unsigned left_user_fringe_face_id : FACE_ID_BITS;
719 728
720 /* Right fringe bitmap number (enum fringe_bitmap_type). */
721 unsigned right_user_fringe_bitmap : FRINGE_ID_BITS;
722
723 /* Face of the right fringe glyph. */ 729 /* Face of the right fringe glyph. */
724 unsigned right_user_fringe_face_id : FACE_ID_BITS; 730 unsigned right_user_fringe_face_id : FACE_ID_BITS;
725 731
726 /* Left fringe bitmap number (enum fringe_bitmap_type). */
727 unsigned left_fringe_bitmap : FRINGE_ID_BITS;
728
729 /* Face of the left fringe glyph. */ 732 /* Face of the left fringe glyph. */
730 unsigned left_fringe_face_id : FACE_ID_BITS; 733 unsigned left_fringe_face_id : FACE_ID_BITS;
731
732 /* Right fringe bitmap number (enum fringe_bitmap_type). */
733 unsigned right_fringe_bitmap : FRINGE_ID_BITS;
734 734
735 /* Face of the right fringe glyph. */ 735 /* Face of the right fringe glyph. */
736 unsigned right_fringe_face_id : FACE_ID_BITS; 736 unsigned right_fringe_face_id : FACE_ID_BITS;
737 737
738 /* 1 means that we must draw the bitmaps of this row. */ 738 /* 1 means that we must draw the bitmaps of this row. */
2039 int hpos; 2039 int hpos;
2040 2040
2041 /* Left fringe bitmap number (enum fringe_bitmap_type). */ 2041 /* Left fringe bitmap number (enum fringe_bitmap_type). */
2042 unsigned left_user_fringe_bitmap : FRINGE_ID_BITS; 2042 unsigned left_user_fringe_bitmap : FRINGE_ID_BITS;
2043 2043
2044 /* Right fringe bitmap number (enum fringe_bitmap_type). */
2045 unsigned right_user_fringe_bitmap : FRINGE_ID_BITS;
2046
2044 /* Face of the left fringe glyph. */ 2047 /* Face of the left fringe glyph. */
2045 unsigned left_user_fringe_face_id : FACE_ID_BITS; 2048 unsigned left_user_fringe_face_id : FACE_ID_BITS;
2046
2047 /* Right fringe bitmap number (enum fringe_bitmap_type). */
2048 unsigned right_user_fringe_bitmap : FRINGE_ID_BITS;
2049 2049
2050 /* Face of the right fringe glyph. */ 2050 /* Face of the right fringe glyph. */
2051 unsigned right_user_fringe_face_id : FACE_ID_BITS; 2051 unsigned right_user_fringe_face_id : FACE_ID_BITS;
2052 }; 2052 };
2053 2053
2632 XRectangle *)); 2632 XRectangle *));
2633 #endif 2633 #endif
2634 2634
2635 /* Defined in fringe.c */ 2635 /* Defined in fringe.c */
2636 2636
2637 int valid_fringe_bitmap_p (Lisp_Object); 2637 int lookup_fringe_bitmap (Lisp_Object);
2638 void draw_fringe_bitmap P_ ((struct window *, struct glyph_row *, int)); 2638 void draw_fringe_bitmap P_ ((struct window *, struct glyph_row *, int));
2639 void draw_row_fringe_bitmaps P_ ((struct window *, struct glyph_row *)); 2639 void draw_row_fringe_bitmaps P_ ((struct window *, struct glyph_row *));
2640 void draw_window_fringes P_ ((struct window *)); 2640 void draw_window_fringes P_ ((struct window *));
2641 int update_window_fringes P_ ((struct window *, int)); 2641 int update_window_fringes P_ ((struct window *, int));
2642 void compute_fringe_widths P_ ((struct frame *, int)); 2642 void compute_fringe_widths P_ ((struct frame *, int));