Mercurial > hg > xemacs-beta

comparison src/glyphs.h @ 5120:d1247f3cc363 ben-lisp-object

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
latest work on lisp-object workspace; more changes eliminating LCRECORD in place of LISP_OBJECT; now compiles and runs.
author Ben Wing <ben@xemacs.org>
date Mon, 28 Dec 2009 01:15:52 -0600
parents e0db3c197671
children b5df3737028a
comparison
equal deleted inserted replaced
5119:d877c14318b3 5120:d1247f3cc363
592 unsigned int action_occurred : 1; 592 unsigned int action_occurred : 1;
593 }; 593 };
594 594
595 struct Lisp_Image_Instance 595 struct Lisp_Image_Instance
596 { 596 {
597 struct LCRECORD_HEADER header; 597 LISP_OBJECT_HEADER header;
598 Lisp_Object domain; /* The domain in which we were cached. */ 598 Lisp_Object domain; /* The domain in which we were cached. */
599 Lisp_Object device; /* The device of the domain. Recorded 599 Lisp_Object device; /* The device of the domain. Recorded
600 since the domain may get deleted 600 since the domain may get deleted
601 before us. */ 601 before us. */
602 Lisp_Object name; 602 Lisp_Object name;
944 GLYPH_ICON 944 GLYPH_ICON
945 }; 945 };
946 946
947 struct Lisp_Glyph 947 struct Lisp_Glyph
948 { 948 {
949 struct LCRECORD_HEADER header; 949 LISP_OBJECT_HEADER header;
950 950
951 enum glyph_type type; 951 enum glyph_type type;
952 952
953 /* specifiers: */ 953 /* specifiers: */
954 Lisp_Object image; /* the actual image */ 954 Lisp_Object image; /* the actual image */
1066 1066
1067 typedef struct glyph_cachel glyph_cachel; 1067 typedef struct glyph_cachel glyph_cachel;
1068 struct glyph_cachel 1068 struct glyph_cachel
1069 { 1069 {
1070 #ifdef NEW_GC 1070 #ifdef NEW_GC
1071 struct lrecord_header header; 1071 LISP_OBJECT_HEADER header;
1072 #endif /* NEW_GC */ 1072 #endif /* NEW_GC */
1073 Lisp_Object glyph; 1073 Lisp_Object glyph;
1074 1074
1075 unsigned int dirty :1; /* I'm copying faces here. I'm not 1075 unsigned int dirty :1; /* I'm copying faces here. I'm not
1076 sure why we need two dirty 1076 sure why we need two dirty
1194 Lisp_Object value, void* finalize); 1194 Lisp_Object value, void* finalize);
1195 1195
1196 struct expose_ignore 1196 struct expose_ignore
1197 { 1197 {
1198 #ifdef NEW_GC 1198 #ifdef NEW_GC
1199 struct lrecord_header header; 1199 LISP_OBJECT_HEADER header;
1200 #endif /* NEW_GC */ 1200 #endif /* NEW_GC */
1201 int x, y; 1201 int x, y;
1202 int width, height; 1202 int width, height;
1203 struct expose_ignore *next; 1203 struct expose_ignore *next;
1204 }; 1204 };