comparison src/fontcolor-impl.h @ 5178:97eb4942aec8

merge
author Ben Wing <ben@xemacs.org>
date Mon, 29 Mar 2010 21:28:13 -0500
parents src/objects-impl.h@7be849cb8828 src/objects-impl.h@8b2f75cecb89
children 308d34e9f07d
comparison
equal deleted inserted replaced
5177:b785049378e3 5178:97eb4942aec8
1 /* Generic object functions -- header implementation. 1 /* Generic object functions -- header implementation.
2 Copyright (C) 1995 Board of Trustees, University of Illinois. 2 Copyright (C) 1995 Board of Trustees, University of Illinois.
3 Copyright (C) 1995, 1996, 2002 Ben Wing. 3 Copyright (C) 1995, 1996, 2002 Ben Wing.
4 Copyright (C) 2010 Didier Verna
4 5
5 This file is part of XEmacs. 6 This file is part of XEmacs.
6 7
7 XEmacs is free software; you can redistribute it and/or modify it 8 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 9 under the terms of the GNU General Public License as published by the
91 #define CHECK_FACE_BOOLEAN_SPECIFIER(x) \ 92 #define CHECK_FACE_BOOLEAN_SPECIFIER(x) \
92 CHECK_SPECIFIER_TYPE (x, face_boolean) 93 CHECK_SPECIFIER_TYPE (x, face_boolean)
93 #define CONCHECK_FACE_BOOLEAN_SPECIFIER(x) \ 94 #define CONCHECK_FACE_BOOLEAN_SPECIFIER(x) \
94 CONCHECK_SPECIFIER_TYPE (x, face_boolean) 95 CONCHECK_SPECIFIER_TYPE (x, face_boolean)
95 96
97 /*****************************************************************************
98 * Background Placement Specifier Object *
99 *****************************************************************************/
100
101 struct face_background_placement_specifier
102 {
103 Lisp_Object face; /* face this is attached to, or nil */
104 };
105
106 #define FACE_BACKGROUND_PLACEMENT_SPECIFIER_DATA(g) \
107 SPECIFIER_TYPE_DATA (g, face_background_placement)
108 #define FACE_BACKGROUND_PLACEMENT_SPECIFIER_FACE(g) \
109 (FACE_BACKGROUND_PLACEMENT_SPECIFIER_DATA (g)->face)
110
111 DECLARE_SPECIFIER_TYPE (face_background_placement);
112 extern Lisp_Object Qface_background_placement, Qabsolute, Qrelative;
113 #define XFACE_BACKGROUND_PLACEMENT_SPECIFIER(x) \
114 XSPECIFIER_TYPE (x, face_background_placement)
115 #define FACE_BACKGROUND_PLACEMENT_SPECIFIERP(x) \
116 SPECIFIER_TYPEP (x, face_background_placement)
117 #define CHECK_FACE_BACKGROUND_PLACEMENT_SPECIFIER(x) \
118 CHECK_SPECIFIER_TYPE (x, face_background_placement)
119 #define CONCHECK_FACE_BACKGROUND_PLACEMENT_SPECIFIER(x) \
120 CONCHECK_SPECIFIER_TYPE (x, face_background_placement)
121
96 /**************************************************************************** 122 /****************************************************************************
97 * Color Instance Object * 123 * Color Instance Object *
98 ****************************************************************************/ 124 ****************************************************************************/
99 125
100 struct Lisp_Color_Instance 126 struct Lisp_Color_Instance
101 { 127 {
102 struct LCRECORD_HEADER header; 128 NORMAL_LISP_OBJECT_HEADER header;
103 Lisp_Object name; 129 Lisp_Object name;
104 Lisp_Object device; 130 Lisp_Object device;
105 131
106 /* See comment in struct console about console variants. */ 132 /* See comment in struct console about console variants. */
107 enum console_variant color_instance_type; 133 enum console_variant color_instance_type;
117 * Font Instance Object * 143 * Font Instance Object *
118 ****************************************************************************/ 144 ****************************************************************************/
119 145
120 struct Lisp_Font_Instance 146 struct Lisp_Font_Instance
121 { 147 {
122 struct LCRECORD_HEADER header; 148 NORMAL_LISP_OBJECT_HEADER header;
123 Lisp_Object name; /* the instantiator used to create the font instance */ 149 Lisp_Object name; /* the instantiator used to create the font instance */
124 Lisp_Object truename; /* used by the device-specific methods; we need to 150 Lisp_Object truename; /* used by the device-specific methods; we need to
125 call them to get the truename (#### in reality, 151 call them to get the truename (#### in reality,
126 they all probably just store the truename here 152 they all probably just store the truename here
127 if they know it, and nil otherwise; we should 153 if they know it, and nil otherwise; we should