Lisp_Object Qcolor_instancep;
static Lisp_Object
-mark_color_instance (Lisp_Object obj, void (*markobj) (Lisp_Object))
+mark_color_instance (Lisp_Object obj)
{
- struct Lisp_Color_Instance *c = XCOLOR_INSTANCE (obj);
- markobj (c->name);
+ Lisp_Color_Instance *c = XCOLOR_INSTANCE (obj);
+ mark_object (c->name);
if (!NILP (c->device)) /* Vthe_null_color_instance */
- MAYBE_DEVMETH (XDEVICE (c->device), mark_color_instance, (c, markobj));
+ MAYBE_DEVMETH (XDEVICE (c->device), mark_color_instance, (c));
return c->device;
}
int escapeflag)
{
char buf[100];
- struct Lisp_Color_Instance *c = XCOLOR_INSTANCE (obj);
+ Lisp_Color_Instance *c = XCOLOR_INSTANCE (obj);
if (print_readably)
error ("printing unreadable object #<color-instance 0x%x>",
c->header.uid);
static void
finalize_color_instance (void *header, int for_disksave)
{
- struct Lisp_Color_Instance *c = (struct Lisp_Color_Instance *) header;
+ Lisp_Color_Instance *c = (Lisp_Color_Instance *) header;
if (!NILP (c->device))
{
static int
color_instance_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
{
- struct Lisp_Color_Instance *c1 = XCOLOR_INSTANCE (obj1);
- struct Lisp_Color_Instance *c2 = XCOLOR_INSTANCE (obj2);
+ Lisp_Color_Instance *c1 = XCOLOR_INSTANCE (obj1);
+ Lisp_Color_Instance *c2 = XCOLOR_INSTANCE (obj2);
return (c1 == c2) ||
- ((EQ (c1->device, c2->device)) &&
+ (EQ (c1->device, c2->device) &&
DEVICEP (c1->device) &&
HAS_DEVMETH_P (XDEVICE (c1->device), color_instance_equal) &&
DEVMETH (XDEVICE (c1->device), color_instance_equal, (c1, c2, depth)));
static unsigned long
color_instance_hash (Lisp_Object obj, int depth)
{
- struct Lisp_Color_Instance *c = XCOLOR_INSTANCE (obj);
+ Lisp_Color_Instance *c = XCOLOR_INSTANCE (obj);
struct device *d = DEVICEP (c->device) ? XDEVICE (c->device) : 0;
return HASH2 ((unsigned long) d,
mark_color_instance, print_color_instance,
finalize_color_instance, color_instance_equal,
color_instance_hash, 0,
- struct Lisp_Color_Instance);
+ Lisp_Color_Instance);
\f
DEFUN ("make-color-instance", Fmake_color_instance, 1, 3, 0, /*
Return a new `color-instance' object named NAME (a string).
*/
(name, device, no_error))
{
- struct Lisp_Color_Instance *c;
+ Lisp_Color_Instance *c;
Lisp_Object val;
int retval;
CHECK_STRING (name);
XSETDEVICE (device, decode_device (device));
- c = alloc_lcrecord_type (struct Lisp_Color_Instance, &lrecord_color_instance);
+ c = alloc_lcrecord_type (Lisp_Color_Instance, &lrecord_color_instance);
c->name = name;
c->device = device;
c->data = 0;
*/
(color_instance))
{
- struct Lisp_Color_Instance *c;
+ Lisp_Color_Instance *c;
CHECK_COLOR_INSTANCE (color_instance);
c = XCOLOR_INSTANCE (color_instance);
Error_behavior errb);
static Lisp_Object
-mark_font_instance (Lisp_Object obj, void (*markobj) (Lisp_Object))
+mark_font_instance (Lisp_Object obj)
{
- struct Lisp_Font_Instance *f = XFONT_INSTANCE (obj);
+ Lisp_Font_Instance *f = XFONT_INSTANCE (obj);
- markobj (f->name);
+ mark_object (f->name);
if (!NILP (f->device)) /* Vthe_null_font_instance */
- MAYBE_DEVMETH (XDEVICE (f->device), mark_font_instance, (f, markobj));
+ MAYBE_DEVMETH (XDEVICE (f->device), mark_font_instance, (f));
return f->device;
}
print_font_instance (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
{
char buf[200];
- struct Lisp_Font_Instance *f = XFONT_INSTANCE (obj);
+ Lisp_Font_Instance *f = XFONT_INSTANCE (obj);
if (print_readably)
error ("printing unreadable object #<font-instance 0x%x>", f->header.uid);
write_c_string ("#<font-instance ", printcharfun);
static void
finalize_font_instance (void *header, int for_disksave)
{
- struct Lisp_Font_Instance *f = (struct Lisp_Font_Instance *) header;
+ Lisp_Font_Instance *f = (Lisp_Font_Instance *) header;
if (!NILP (f->device))
{
DEFINE_LRECORD_IMPLEMENTATION ("font-instance", font_instance,
mark_font_instance, print_font_instance,
finalize_font_instance, font_instance_equal,
- font_instance_hash, 0, struct Lisp_Font_Instance);
+ font_instance_hash, 0, Lisp_Font_Instance);
\f
DEFUN ("make-font-instance", Fmake_font_instance, 1, 3, 0, /*
Return a new `font-instance' object named NAME.
*/
(name, device, no_error))
{
- struct Lisp_Font_Instance *f;
+ Lisp_Font_Instance *f;
Lisp_Object val;
int retval = 0;
Error_behavior errb = decode_error_behavior_flag (no_error);
XSETDEVICE (device, decode_device (device));
- f = alloc_lcrecord_type (struct Lisp_Font_Instance, &lrecord_font_instance);
+ f = alloc_lcrecord_type (Lisp_Font_Instance, &lrecord_font_instance);
f->name = name;
f->device = device;
font_instance_truename_internal (Lisp_Object font_instance,
Error_behavior errb)
{
- struct Lisp_Font_Instance *f = XFONT_INSTANCE (font_instance);
-
+ Lisp_Font_Instance *f = XFONT_INSTANCE (font_instance);
+
if (NILP (f->device))
{
maybe_signal_simple_error ("Couldn't determine font truename",
font_instance, Qfont, errb);
return Qnil;
}
-
+
return DEVMETH_OR_GIVEN (XDEVICE (f->device),
font_instance_truename, (f, errb), f->name);
}
*/
(font_instance))
{
- struct Lisp_Font_Instance *f;
+ Lisp_Font_Instance *f;
CHECK_FONT_INSTANCE (font_instance);
f = XFONT_INSTANCE (font_instance);
static void
color_create (Lisp_Object obj)
{
- struct Lisp_Specifier *color = XCOLOR_SPECIFIER (obj);
+ Lisp_Specifier *color = XCOLOR_SPECIFIER (obj);
COLOR_SPECIFIER_FACE (color) = Qnil;
COLOR_SPECIFIER_FACE_PROPERTY (color) = Qnil;
}
static void
-color_mark (Lisp_Object obj, void (*markobj) (Lisp_Object))
+color_mark (Lisp_Object obj)
{
- struct Lisp_Specifier *color = XCOLOR_SPECIFIER (obj);
+ Lisp_Specifier *color = XCOLOR_SPECIFIER (obj);
- markobj (COLOR_SPECIFIER_FACE (color));
- markobj (COLOR_SPECIFIER_FACE_PROPERTY (color));
+ mark_object (COLOR_SPECIFIER_FACE (color));
+ mark_object (COLOR_SPECIFIER_FACE_PROPERTY (color));
}
/* No equal or hash methods; ignore the face the color is based off
void
set_color_attached_to (Lisp_Object obj, Lisp_Object face, Lisp_Object property)
{
- struct Lisp_Specifier *color = XCOLOR_SPECIFIER (obj);
+ Lisp_Specifier *color = XCOLOR_SPECIFIER (obj);
COLOR_SPECIFIER_FACE (color) = face;
COLOR_SPECIFIER_FACE_PROPERTY (color) = property;
static void
font_create (Lisp_Object obj)
{
- struct Lisp_Specifier *font = XFONT_SPECIFIER (obj);
+ Lisp_Specifier *font = XFONT_SPECIFIER (obj);
FONT_SPECIFIER_FACE (font) = Qnil;
FONT_SPECIFIER_FACE_PROPERTY (font) = Qnil;
}
static void
-font_mark (Lisp_Object obj, void (*markobj) (Lisp_Object))
+font_mark (Lisp_Object obj)
{
- struct Lisp_Specifier *font = XFONT_SPECIFIER (obj);
+ Lisp_Specifier *font = XFONT_SPECIFIER (obj);
- markobj (FONT_SPECIFIER_FACE (font));
- markobj (FONT_SPECIFIER_FACE_PROPERTY (font));
+ mark_object (FONT_SPECIFIER_FACE (font));
+ mark_object (FONT_SPECIFIER_FACE_PROPERTY (font));
}
/* No equal or hash methods; ignore the face the font is based off
int
font_spec_matches_charset (struct device *d, Lisp_Object charset,
- CONST Bufbyte *nonreloc, Lisp_Object reloc,
+ const Bufbyte *nonreloc, Lisp_Object reloc,
Bytecount offset, Bytecount length)
{
return DEVMETH_OR_GIVEN (d, font_spec_matches_charset,
void
set_font_attached_to (Lisp_Object obj, Lisp_Object face, Lisp_Object property)
{
- struct Lisp_Specifier *font = XFONT_SPECIFIER (obj);
+ Lisp_Specifier *font = XFONT_SPECIFIER (obj);
FONT_SPECIFIER_FACE (font) = face;
FONT_SPECIFIER_FACE_PROPERTY (font) = property;
static void
face_boolean_create (Lisp_Object obj)
{
- struct Lisp_Specifier *face_boolean = XFACE_BOOLEAN_SPECIFIER (obj);
+ Lisp_Specifier *face_boolean = XFACE_BOOLEAN_SPECIFIER (obj);
FACE_BOOLEAN_SPECIFIER_FACE (face_boolean) = Qnil;
FACE_BOOLEAN_SPECIFIER_FACE_PROPERTY (face_boolean) = Qnil;
}
static void
-face_boolean_mark (Lisp_Object obj, void (*markobj) (Lisp_Object))
+face_boolean_mark (Lisp_Object obj)
{
- struct Lisp_Specifier *face_boolean = XFACE_BOOLEAN_SPECIFIER (obj);
+ Lisp_Specifier *face_boolean = XFACE_BOOLEAN_SPECIFIER (obj);
- markobj (FACE_BOOLEAN_SPECIFIER_FACE (face_boolean));
- markobj (FACE_BOOLEAN_SPECIFIER_FACE_PROPERTY (face_boolean));
+ mark_object (FACE_BOOLEAN_SPECIFIER_FACE (face_boolean));
+ mark_object (FACE_BOOLEAN_SPECIFIER_FACE_PROPERTY (face_boolean));
}
/* No equal or hash methods; ignore the face the face-boolean is based off
set_face_boolean_attached_to (Lisp_Object obj, Lisp_Object face,
Lisp_Object property)
{
- struct Lisp_Specifier *face_boolean = XFACE_BOOLEAN_SPECIFIER (obj);
+ Lisp_Specifier *face_boolean = XFACE_BOOLEAN_SPECIFIER (obj);
FACE_BOOLEAN_SPECIFIER_FACE (face_boolean) = face;
FACE_BOOLEAN_SPECIFIER_FACE_PROPERTY (face_boolean) = property;
void
syms_of_objects (void)
{
+ INIT_LRECORD_IMPLEMENTATION (color_instance);
+ INIT_LRECORD_IMPLEMENTATION (font_instance);
+
DEFSUBR (Fcolor_specifier_p);
DEFSUBR (Ffont_specifier_p);
DEFSUBR (Fface_boolean_specifier_p);
defsymbol (&Qface_boolean, "face-boolean");
}
+static const struct lrecord_description color_specifier_description[] = {
+ { XD_LISP_OBJECT, specifier_data_offset + offsetof (struct color_specifier, face) },
+ { XD_LISP_OBJECT, specifier_data_offset + offsetof (struct color_specifier, face_property) },
+ { XD_END }
+};
+
+static const struct lrecord_description font_specifier_description[] = {
+ { XD_LISP_OBJECT, specifier_data_offset + offsetof (struct font_specifier, face) },
+ { XD_LISP_OBJECT, specifier_data_offset + offsetof (struct font_specifier, face_property) },
+ { XD_END }
+};
+
+static const struct lrecord_description face_boolean_specifier_description[] = {
+ { XD_LISP_OBJECT, specifier_data_offset + offsetof (struct face_boolean_specifier, face) },
+ { XD_LISP_OBJECT, specifier_data_offset + offsetof (struct face_boolean_specifier, face_property) },
+ { XD_END }
+};
+
void
specifier_type_create_objects (void)
{
}
void
-vars_of_objects (void)
+reinit_specifier_type_create_objects (void)
+{
+ REINITIALIZE_SPECIFIER_TYPE (color);
+ REINITIALIZE_SPECIFIER_TYPE (font);
+ REINITIALIZE_SPECIFIER_TYPE (face_boolean);
+}
+
+void
+reinit_vars_of_objects (void)
{
- staticpro (&Vthe_null_color_instance);
+ staticpro_nodump (&Vthe_null_color_instance);
{
- struct Lisp_Color_Instance *c =
- alloc_lcrecord_type (struct Lisp_Color_Instance, &lrecord_color_instance);
+ Lisp_Color_Instance *c =
+ alloc_lcrecord_type (Lisp_Color_Instance, &lrecord_color_instance);
c->name = Qnil;
c->device = Qnil;
c->data = 0;
XSETCOLOR_INSTANCE (Vthe_null_color_instance, c);
}
- staticpro (&Vthe_null_font_instance);
+ staticpro_nodump (&Vthe_null_font_instance);
{
- struct Lisp_Font_Instance *f =
- alloc_lcrecord_type (struct Lisp_Font_Instance, &lrecord_font_instance);
+ Lisp_Font_Instance *f =
+ alloc_lcrecord_type (Lisp_Font_Instance, &lrecord_font_instance);
f->name = Qnil;
f->device = Qnil;
f->data = 0;
XSETFONT_INSTANCE (Vthe_null_font_instance, f);
}
}
+
+void
+vars_of_objects (void)
+{
+ reinit_vars_of_objects ();
+}
projects / chise / xemacs-chise.git.1 / blobdiff