Mercurial > emacs

comparison src/dispextern.h @ 83212:f70dc61a797f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged in changes from CVS trunk. 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 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-583 Update from CVS * 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/emacs--cvs-trunk--0--patch-587 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-588 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-589 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-590 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-591 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-592 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-38 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-39 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-40 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-41 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-252
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 03 Oct 2004 13:08:55 +0000
parents b85b19b8eb65 db333b320b67
children 4f2f1522636c
comparison
equal deleted inserted replaced
83211:b85b19b8eb65 83212:f70dc61a797f
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. */
2041 int hpos; 2041 int hpos;
2042 2042
2043 /* Left fringe bitmap number (enum fringe_bitmap_type). */ 2043 /* Left fringe bitmap number (enum fringe_bitmap_type). */
2044 unsigned left_user_fringe_bitmap : FRINGE_ID_BITS; 2044 unsigned left_user_fringe_bitmap : FRINGE_ID_BITS;
2045 2045
2046 /* Right fringe bitmap number (enum fringe_bitmap_type). */
2047 unsigned right_user_fringe_bitmap : FRINGE_ID_BITS;
2048
2046 /* Face of the left fringe glyph. */ 2049 /* Face of the left fringe glyph. */
2047 unsigned left_user_fringe_face_id : FACE_ID_BITS; 2050 unsigned left_user_fringe_face_id : FACE_ID_BITS;
2048
2049 /* Right fringe bitmap number (enum fringe_bitmap_type). */
2050 unsigned right_user_fringe_bitmap : FRINGE_ID_BITS;
2051 2051
2052 /* Face of the right fringe glyph. */ 2052 /* Face of the right fringe glyph. */
2053 unsigned right_user_fringe_face_id : FACE_ID_BITS; 2053 unsigned right_user_fringe_face_id : FACE_ID_BITS;
2054 }; 2054 };
2055 2055
2628 XRectangle *)); 2628 XRectangle *));
2629 #endif 2629 #endif
2630 2630
2631 /* Defined in fringe.c */ 2631 /* Defined in fringe.c */
2632 2632
2633 int valid_fringe_bitmap_p (Lisp_Object); 2633 int lookup_fringe_bitmap (Lisp_Object);
2634 void draw_fringe_bitmap P_ ((struct window *, struct glyph_row *, int)); 2634 void draw_fringe_bitmap P_ ((struct window *, struct glyph_row *, int));
2635 void draw_row_fringe_bitmaps P_ ((struct window *, struct glyph_row *)); 2635 void draw_row_fringe_bitmaps P_ ((struct window *, struct glyph_row *));
2636 void draw_window_fringes P_ ((struct window *)); 2636 void draw_window_fringes P_ ((struct window *));
2637 int update_window_fringes P_ ((struct window *, int)); 2637 int update_window_fringes P_ ((struct window *, int));
2638 void compute_fringe_widths P_ ((struct frame *, int)); 2638 void compute_fringe_widths P_ ((struct frame *, int));