comparison src/faces.h @ 771:943eaba38521

[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.
author ben
date Wed, 13 Mar 2002 08:54:06 +0000
parents af57a77cbc92
children e38acbeb1cae
comparison
equal deleted inserted replaced
770:336a418893b5 771:943eaba38521
1 /* Face data structures. 1 /* Face data structures.
2 Copyright (C) 1995 Board of Trustees, University of Illinois. 2 Copyright (C) 1995 Board of Trustees, University of Illinois.
3 Copyright (C) 1995 Ben Wing 3 Copyright (C) 1995, 2002 Ben Wing
4 4
5 This file is part of XEmacs. 5 This file is part of XEmacs.
6 6
7 XEmacs is free software; you can redistribute it and/or modify it 7 XEmacs is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
22 /* Synched up with: Not in FSF. */ 22 /* Synched up with: Not in FSF. */
23 23
24 #ifndef INCLUDED_faces_h_ 24 #ifndef INCLUDED_faces_h_
25 #define INCLUDED_faces_h_ 25 #define INCLUDED_faces_h_
26 26
27 #include "buffer.h" /* for NUM_LEADING_BYTES */ 27 #include "charset.h" /* for NUM_LEADING_BYTES */
28 28
29 /* a Lisp_Face is the C object corresponding to a face. There is one 29 /* a Lisp_Face is the C object corresponding to a face. There is one
30 of these per face. It basically contains all of the specifiers for 30 of these per face. It basically contains all of the specifiers for
31 the built-in face properties, plus the plist of user-specified 31 the built-in face properties, plus the plist of user-specified
32 properties. */ 32 properties. */
154 as "unspecified" during merging and is overridden by lower-priority 154 as "unspecified" during merging and is overridden by lower-priority
155 faces. This is what the _specified flags below are for. */ 155 faces. This is what the _specified flags below are for. */
156 156
157 Lisp_Object foreground; 157 Lisp_Object foreground;
158 Lisp_Object background; 158 Lisp_Object background;
159 /* There are currently 128 possible charsets under Mule. For the 159 /* There are currently 128 or 129 possible charsets under Mule. For the
160 moment we just take the easy way out and allocate space for each 160 moment we just take the easy way out and allocate space for each
161 of them. This avoids messing with Dynarrs. 161 of them. This avoids messing with Dynarrs.
162 162
163 #### We should look into this and probably clean it up 163 #### We should look into this and probably clean it up
164 to use Dynarrs. This may be a big space hog as is. */ 164 to use Dynarrs. This may be a big space hog as is. */
278 int *height, int *width); 278 int *height, int *width);
279 void default_face_height_and_width_1 (Lisp_Object domain, 279 void default_face_height_and_width_1 (Lisp_Object domain,
280 int *height, int *width); 280 int *height, int *width);
281 281
282 #define FACE_CACHEL_FONT(cachel, charset) \ 282 #define FACE_CACHEL_FONT(cachel, charset) \
283 (cachel->font[XCHARSET_LEADING_BYTE (charset) - 128]) 283 (cachel->font[XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE])
284 284
285 #define WINDOW_FACE_CACHEL(window, index) \ 285 #define WINDOW_FACE_CACHEL(window, index) \
286 Dynarr_atp ((window)->face_cachels, index) 286 Dynarr_atp ((window)->face_cachels, index)
287 287
288 #define FACE_CACHEL_FINDEX_UNSAFE(cachel, offset) \ 288 #define FACE_CACHEL_FINDEX_UNSAFE(cachel, offset) \