Mercurial > hg > xemacs-beta
view src/objects.c @ 4906:6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* cl-extra.el:
* cl-extra.el (cl-string-vector-equalp): Removed.
* cl-extra.el (cl-bit-vector-vector-equalp): Removed.
* cl-extra.el (cl-vector-array-equalp): Removed.
* cl-extra.el (cl-hash-table-contents-equalp): Removed.
* cl-extra.el (equalp): Removed.
* cl-extra.el (cl-mapcar-many):
Comment out the whole `equalp' implementation for the moment;
remove once we're sure the C implementation works.
* cl-macs.el:
* cl-macs.el (equalp):
Simplify the compiler-macro for `equalp' -- once it's in C,
we don't need to try so hard to expand it.
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* abbrev.c (abbrev_match_mapper):
* buffer.h (CANON_TABLE_OF):
* buffer.h:
* editfns.c (Fchar_equal):
* minibuf.c (scmp_1):
* text.c (qxestrcasecmp_i18n):
* text.c (qxestrncasecmp_i18n):
* text.c (qxetextcasecmp):
* text.c (qxetextcasecmp_matching):
Create new macro CANONCASE that converts to a canonical mapping
and use it to do caseless comparisons instead of DOWNCASE.
* alloc.c:
* alloc.c (cons_equal):
* alloc.c (vector_equal):
* alloc.c (string_equal):
* bytecode.c (compiled_function_equal):
* chartab.c (char_table_entry_equal):
* chartab.c (char_table_equal):
* data.c (weak_list_equal):
* data.c (weak_box_equal):
* data.c (ephemeron_equal):
* device-msw.c (equal_devmode):
* elhash.c (hash_table_equal):
* events.c (event_equal):
* extents.c (properties_equal):
* extents.c (extent_equal):
* faces.c:
* faces.c (face_equal):
* faces.c (face_hash):
* floatfns.c (float_equal):
* fns.c:
* fns.c (bit_vector_equal):
* fns.c (plists_differ):
* fns.c (Fplists_eq):
* fns.c (Fplists_equal):
* fns.c (Flax_plists_eq):
* fns.c (Flax_plists_equal):
* fns.c (internal_equal):
* fns.c (internal_equalp):
* fns.c (internal_equal_0):
* fns.c (syms_of_fns):
* glyphs.c (image_instance_equal):
* glyphs.c (glyph_equal):
* glyphs.c (glyph_hash):
* gui.c (gui_item_equal):
* lisp.h:
* lrecord.h (struct lrecord_implementation):
* marker.c (marker_equal):
* number.c (bignum_equal):
* number.c (ratio_equal):
* number.c (bigfloat_equal):
* objects.c (color_instance_equal):
* objects.c (font_instance_equal):
* opaque.c (equal_opaque):
* opaque.c (equal_opaque_ptr):
* rangetab.c (range_table_equal):
* specifier.c (specifier_equal):
Add a `foldcase' param to the equal() method and use it to implement
`equalp' comparisons. Also add to plists_differ(), although we
don't currently use it here.
Rewrite internal_equalp(). Implement cross-type vector comparisons.
Don't implement our own handling of numeric promotion -- just use
the `=' primitive.
Add internal_equal_0(), which takes a `foldcase' param and calls
either internal_equal() or internal_equalp().
* buffer.h:
When given a 0 for buffer (which is the norm when functions don't
have a specific buffer available), use the current buffer's table,
not `standard-case-table'; otherwise the current settings are
ignored.
* casetab.c:
* casetab.c (set_case_table):
When handling old-style vectors of 256 in `set-case-table' don't
overwrite the existing table! Instead create a new table and
populate.
* device-msw.c (sync_printer_with_devmode):
* lisp.h:
* text.c (lisp_strcasecmp_ascii):
Rename lisp_strcasecmp to lisp_strcasecmp_ascii and use
lisp_strcasecmp_i18n for caseless comparisons in some places.
* elhash.c:
Delete unused lisp_string_hash and lisp_string_equal().
* events.h:
* keymap-buttons.h:
* keymap.h:
* keymap.c (keymap_lookup_directly):
* keymap.c (keymap_store):
* keymap.c (FROB):
* keymap.c (key_desc_list_to_event):
* keymap.c (describe_map_mapper):
* keymap.c (INCLUDE_BUTTON_ZERO):
New file keymap-buttons.h; use to handle buttons 1-26 in place of
duplicating code 26 times.
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-msw.c (mswindows_init_frame_1):
Fix some comments about internal_equal() in redisplay that don't
apply any more.
* keymap-slots.h:
* keymap.c:
New file keymap-slots.h. Use it to notate the slots in a keymap
structure, similar to frameslots.h or coding-system-slots.h.
* keymap.c (MARKED_SLOT):
* keymap.c (keymap_equal):
* keymap.c (keymap_hash):
Implement.
tests/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* automated/case-tests.el:
* automated/case-tests.el (uni-mappings):
* automated/search-tests.el:
Delete old pristine-case-table code. Rewrite the Unicode torture
test to take into account whether overlapping mappings exist for
more than one character, and not doing the upcase/downcase
comparisons in such cases.
* automated/lisp-tests.el (foo):
* automated/lisp-tests.el (string-variable):
* automated/lisp-tests.el (featurep):
Replace Assert (equal ... with Assert-equal; same for other types
of equality. Replace some awkward equivalents of Assert-equalp
with Assert-equalp. Add lots of equalp tests.
* automated/case-tests.el:
* automated/regexp-tests.el:
* automated/search-tests.el:
Fix up the comments at the top of the files. Move rules about where
to put tests into case-tests.el.
* automated/test-harness.el:
* automated/test-harness.el (test-harness-aborted-summary-template): New.
* automated/test-harness.el (test-harness-from-buffer):
* automated/test-harness.el (batch-test-emacs):
Fix Assert-test-not. Create Assert-not-equal and variants.
Delete the doc strings from all these convenience functions to avoid
excessive repetition; instead use one copy in a comment.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 01 Feb 2010 01:02:40 -0600 |
parents | a98ca4640147 |
children | d95c102a96d3 |
line wrap: on
line source
/* Generic Objects and Functions. Copyright (C) 1995 Free Software Foundation, Inc. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1995, 1996, 2002, 2004 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "device-impl.h" #include "elhash.h" #include "faces.h" #include "frame.h" #include "glyphs.h" #include "objects-impl.h" #include "specifier.h" #include "window.h" #ifdef HAVE_TTY #include "console-tty.h" #endif /* Objects that are substituted when an instantiation fails. If we leave in the Qunbound value, we will probably get crashes. */ Lisp_Object Vthe_null_color_instance, Vthe_null_font_instance; /* Authors: Ben Wing, Chuck Thompson */ DOESNT_RETURN finalose (void *ptr) { Lisp_Object obj = wrap_pointer_1 (ptr); invalid_operation ("Can't dump an emacs containing window system objects", obj); } /**************************************************************************** * Color-Instance Object * ****************************************************************************/ Lisp_Object Qcolor_instancep; static const struct memory_description color_instance_data_description_1 []= { #ifdef HAVE_TTY #ifdef NEW_GC { XD_LISP_OBJECT, tty_console }, #else /* not NEW_GC */ { XD_BLOCK_PTR, tty_console, 1, { &tty_color_instance_data_description } }, #endif /* not NEW_GC */ #endif { XD_END } }; static const struct sized_memory_description color_instance_data_description = { sizeof (void *), color_instance_data_description_1 }; static const struct memory_description color_instance_description[] = { { XD_INT, offsetof (Lisp_Color_Instance, color_instance_type) }, { XD_LISP_OBJECT, offsetof (Lisp_Color_Instance, name)}, { XD_LISP_OBJECT, offsetof (Lisp_Color_Instance, device)}, { XD_UNION, offsetof (Lisp_Color_Instance, data), XD_INDIRECT (0, 0), { &color_instance_data_description } }, {XD_END} }; static Lisp_Object mark_color_instance (Lisp_Object obj) { 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)); return c->device; } static void print_color_instance (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { Lisp_Color_Instance *c = XCOLOR_INSTANCE (obj); if (print_readably) printing_unreadable_lcrecord (obj, 0); write_fmt_string_lisp (printcharfun, "#<color-instance %s", 1, c->name); write_fmt_string_lisp (printcharfun, " on %s", 1, c->device); if (!NILP (c->device)) /* Vthe_null_color_instance */ MAYBE_DEVMETH (XDEVICE (c->device), print_color_instance, (c, printcharfun, escapeflag)); write_fmt_string (printcharfun, " 0x%x>", c->header.uid); } static void finalize_color_instance (void *header, int for_disksave) { Lisp_Color_Instance *c = (Lisp_Color_Instance *) header; if (!NILP (c->device)) { if (for_disksave) finalose (c); MAYBE_DEVMETH (XDEVICE (c->device), finalize_color_instance, (c)); } } static int color_instance_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, int UNUSED (foldcase)) { Lisp_Color_Instance *c1 = XCOLOR_INSTANCE (obj1); Lisp_Color_Instance *c2 = XCOLOR_INSTANCE (obj2); return (c1 == c2) || (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 Hashcode color_instance_hash (Lisp_Object obj, int depth) { Lisp_Color_Instance *c = XCOLOR_INSTANCE (obj); struct device *d = DEVICEP (c->device) ? XDEVICE (c->device) : 0; return HASH2 ((Hashcode) d, !d ? LISP_HASH (obj) : DEVMETH_OR_GIVEN (d, color_instance_hash, (c, depth), LISP_HASH (obj))); } DEFINE_LRECORD_IMPLEMENTATION ("color-instance", color_instance, 0, /*dumpable-flag*/ mark_color_instance, print_color_instance, finalize_color_instance, color_instance_equal, color_instance_hash, color_instance_description, Lisp_Color_Instance); DEFUN ("make-color-instance", Fmake_color_instance, 1, 3, 0, /* Return a new `color-instance' object named NAME (a string). Optional argument DEVICE specifies the device this object applies to and defaults to the selected device. An error is signaled if the color is unknown or cannot be allocated; however, if optional argument NOERROR is non-nil, nil is simply returned in this case. (And if NOERROR is other than t, a warning may be issued.) The returned object is a normal, first-class lisp object. The way you `deallocate' the color is the way you deallocate any other lisp object: you drop all pointers to it and allow it to be garbage collected. When these objects are GCed, the underlying window-system data (e.g. X object) is deallocated as well. */ (name, device, noerror)) { Lisp_Color_Instance *c; int retval; CHECK_STRING (name); device = wrap_device (decode_device (device)); c = ALLOC_LCRECORD_TYPE (Lisp_Color_Instance, &lrecord_color_instance); c->name = name; c->device = device; c->data = 0; c->color_instance_type = get_console_variant (XDEVICE_TYPE (c->device)); retval = MAYBE_INT_DEVMETH (XDEVICE (device), initialize_color_instance, (c, name, device, decode_error_behavior_flag (noerror))); if (!retval) return Qnil; return wrap_color_instance (c); } DEFUN ("color-instance-p", Fcolor_instance_p, 1, 1, 0, /* Return non-nil if OBJECT is a color instance. */ (object)) { return COLOR_INSTANCEP (object) ? Qt : Qnil; } DEFUN ("color-instance-name", Fcolor_instance_name, 1, 1, 0, /* Return the name used to allocate COLOR-INSTANCE. */ (color_instance)) { CHECK_COLOR_INSTANCE (color_instance); return XCOLOR_INSTANCE (color_instance)->name; } DEFUN ("color-instance-rgb-components", Fcolor_instance_rgb_components, 1, 1, 0, /* Return a three element list containing the red, green, and blue color components of COLOR-INSTANCE, or nil if unknown. Component values range from 0 to 65535. */ (color_instance)) { Lisp_Color_Instance *c; CHECK_COLOR_INSTANCE (color_instance); c = XCOLOR_INSTANCE (color_instance); if (NILP (c->device)) return Qnil; return MAYBE_LISP_DEVMETH (XDEVICE (c->device), color_instance_rgb_components, (c)); } DEFUN ("valid-color-name-p", Fvalid_color_name_p, 1, 2, 0, /* Return true if COLOR names a valid color for the current device. Valid color names for X are listed in the file /usr/lib/X11/rgb.txt, or whatever the equivalent is on your system. Valid color names for TTY are those which have an ISO 6429 (ANSI) sequence. In addition to being a color this may be one of a number of attributes such as `blink'. */ (color, device)) { struct device *d = decode_device (device); CHECK_STRING (color); return MAYBE_INT_DEVMETH (d, valid_color_name_p, (d, color)) ? Qt : Qnil; } DEFUN ("color-list", Fcolor_list, 0, 1, 0, /* Return a list of color names. DEVICE specifies which device to return names for, and defaults to the currently selected device. */ (device)) { device = wrap_device (decode_device (device)); return MAYBE_LISP_DEVMETH (XDEVICE (device), color_list, ()); } /*************************************************************************** * Font-Instance Object * ***************************************************************************/ Lisp_Object Qfont_instancep; static Lisp_Object font_instance_truename_internal (Lisp_Object xfont, Error_Behavior errb); static const struct memory_description font_instance_data_description_1 []= { #ifdef HAVE_TTY #ifdef NEW_GC { XD_LISP_OBJECT, tty_console }, #else /* not NEW_GC */ { XD_BLOCK_PTR, tty_console, 1, { &tty_font_instance_data_description } }, #endif /* not NEW_GC */ #endif { XD_END } }; static const struct sized_memory_description font_instance_data_description = { sizeof (void *), font_instance_data_description_1 }; static const struct memory_description font_instance_description[] = { { XD_INT, offsetof (Lisp_Font_Instance, font_instance_type) }, { XD_LISP_OBJECT, offsetof (Lisp_Font_Instance, name)}, { XD_LISP_OBJECT, offsetof (Lisp_Font_Instance, truename)}, { XD_LISP_OBJECT, offsetof (Lisp_Font_Instance, device)}, { XD_LISP_OBJECT, offsetof (Lisp_Font_Instance, charset)}, { XD_UNION, offsetof (Lisp_Font_Instance, data), XD_INDIRECT (0, 0), { &font_instance_data_description } }, { XD_END } }; static Lisp_Object mark_font_instance (Lisp_Object obj) { Lisp_Font_Instance *f = XFONT_INSTANCE (obj); mark_object (f->name); mark_object (f->truename); if (!NILP (f->device)) /* Vthe_null_font_instance */ MAYBE_DEVMETH (XDEVICE (f->device), mark_font_instance, (f)); return f->device; } static void print_font_instance (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { Lisp_Font_Instance *f = XFONT_INSTANCE (obj); if (print_readably) printing_unreadable_lcrecord (obj, 0); write_fmt_string_lisp (printcharfun, "#<font-instance %S", 1, f->name); write_fmt_string_lisp (printcharfun, " on %s", 1, f->device); if (!NILP (f->device)) { MAYBE_DEVMETH (XDEVICE (f->device), print_font_instance, (f, printcharfun, escapeflag)); } write_fmt_string (printcharfun, " 0x%x>", f->header.uid); } static void finalize_font_instance (void *header, int for_disksave) { Lisp_Font_Instance *f = (Lisp_Font_Instance *) header; if (!NILP (f->device)) { if (for_disksave) finalose (f); MAYBE_DEVMETH (XDEVICE (f->device), finalize_font_instance, (f)); } } /* Fonts are equal if they resolve to the same name. Since we call `font-truename' to do this, and since font-truename is lazy, this means the `equal' could cause XListFonts to be run the first time. */ static int font_instance_equal (Lisp_Object obj1, Lisp_Object obj2, int depth, int UNUSED (foldcase)) { /* #### should this be moved into a device method? */ return internal_equal (font_instance_truename_internal (obj1, ERROR_ME_DEBUG_WARN), font_instance_truename_internal (obj2, ERROR_ME_DEBUG_WARN), depth + 1); } static Hashcode font_instance_hash (Lisp_Object obj, int depth) { return internal_hash (font_instance_truename_internal (obj, ERROR_ME_DEBUG_WARN), depth + 1); } DEFINE_LRECORD_IMPLEMENTATION ("font-instance", font_instance, 0, /*dumpable-flag*/ mark_font_instance, print_font_instance, finalize_font_instance, font_instance_equal, font_instance_hash, font_instance_description, Lisp_Font_Instance); /* #### Why is this exposed to Lisp? Used in: x-frob-font-size, gtk-font-menu-load-font, x-font-menu-load-font-xft, x-font-menu-load-font-core, mswindows-font-menu-load-font, mswindows-frob-font-style-and-sizify, mswindows-frob-font-size. */ DEFUN ("make-font-instance", Fmake_font_instance, 1, 4, 0, /* Return a new `font-instance' object named NAME. DEVICE specifies the device this object applies to and defaults to the selected device. An error is signalled if the font is unknown or cannot be allocated; however, if NOERROR is non-nil, nil is simply returned in this case. CHARSET is used internally. #### make helper function? The returned object is a normal, first-class lisp object. The way you `deallocate' the font is the way you deallocate any other lisp object: you drop all pointers to it and allow it to be garbage collected. When these objects are GCed, the underlying GUI data is deallocated as well. */ (name, device, noerror, charset)) { Lisp_Font_Instance *f; int retval = 0; Error_Behavior errb = decode_error_behavior_flag (noerror); if (ERRB_EQ (errb, ERROR_ME)) CHECK_STRING (name); else if (!STRINGP (name)) return Qnil; device = wrap_device (decode_device (device)); f = ALLOC_LCRECORD_TYPE (Lisp_Font_Instance, &lrecord_font_instance); f->name = name; f->truename = Qnil; f->device = device; f->data = 0; f->font_instance_type = get_console_variant (XDEVICE_TYPE (f->device)); /* Stick some default values here ... */ f->ascent = f->height = 1; f->descent = 0; f->width = 1; f->charset = charset; f->proportional_p = 0; retval = MAYBE_INT_DEVMETH (XDEVICE (device), initialize_font_instance, (f, name, device, errb)); if (!retval) return Qnil; return wrap_font_instance (f); } DEFUN ("font-instance-p", Ffont_instance_p, 1, 1, 0, /* Return non-nil if OBJECT is a font instance. */ (object)) { return FONT_INSTANCEP (object) ? Qt : Qnil; } DEFUN ("font-instance-name", Ffont_instance_name, 1, 1, 0, /* Return the name used to allocate FONT-INSTANCE. */ (font_instance)) { CHECK_FONT_INSTANCE (font_instance); return XFONT_INSTANCE (font_instance)->name; } DEFUN ("font-instance-ascent", Ffont_instance_ascent, 1, 1, 0, /* Return the ascent in pixels of FONT-INSTANCE. The returned value is the maximum ascent for all characters in the font, where a character's ascent is the number of pixels above (and including) the baseline. */ (font_instance)) { CHECK_FONT_INSTANCE (font_instance); return make_int (XFONT_INSTANCE (font_instance)->ascent); } DEFUN ("font-instance-descent", Ffont_instance_descent, 1, 1, 0, /* Return the descent in pixels of FONT-INSTANCE. The returned value is the maximum descent for all characters in the font, where a character's descent is the number of pixels below the baseline. \(Many characters to do not have any descent. Typical characters with a descent are lowercase p and lowercase g.) */ (font_instance)) { CHECK_FONT_INSTANCE (font_instance); return make_int (XFONT_INSTANCE (font_instance)->descent); } DEFUN ("font-instance-width", Ffont_instance_width, 1, 1, 0, /* Return the width in pixels of FONT-INSTANCE. The returned value is the average width for all characters in the font. */ (font_instance)) { CHECK_FONT_INSTANCE (font_instance); return make_int (XFONT_INSTANCE (font_instance)->width); } DEFUN ("font-instance-proportional-p", Ffont_instance_proportional_p, 1, 1, 0, /* Return whether FONT-INSTANCE is proportional. This means that different characters in the font have different widths. */ (font_instance)) { CHECK_FONT_INSTANCE (font_instance); return XFONT_INSTANCE (font_instance)->proportional_p ? Qt : Qnil; } static Lisp_Object font_instance_truename_internal (Lisp_Object font_instance, Error_Behavior errb) { Lisp_Font_Instance *f = XFONT_INSTANCE (font_instance); if (NILP (f->device)) { maybe_signal_error (Qgui_error, "can't determine truename: " "no device for font instance", font_instance, Qfont, errb); return Qnil; } return DEVMETH_OR_GIVEN (XDEVICE (f->device), font_instance_truename, (f, errb), f->name); } DEFUN ("font-instance-truename", Ffont_instance_truename, 1, 1, 0, /* Return the canonical name of FONT-INSTANCE. Font names are patterns which may match any number of fonts, of which the first found is used. This returns an unambiguous name for that font \(but not necessarily its only unambiguous name). */ (font_instance)) { CHECK_FONT_INSTANCE (font_instance); return font_instance_truename_internal (font_instance, ERROR_ME); } DEFUN ("font-instance-charset", Ffont_instance_charset, 1, 1, 0, /* Return the Mule charset that FONT-INSTANCE was allocated to handle. */ (font_instance)) { CHECK_FONT_INSTANCE (font_instance); return XFONT_INSTANCE (font_instance)->charset; } DEFUN ("font-instance-properties", Ffont_instance_properties, 1, 1, 0, /* Return the properties (an alist or nil) of FONT-INSTANCE. */ (font_instance)) { Lisp_Font_Instance *f; CHECK_FONT_INSTANCE (font_instance); f = XFONT_INSTANCE (font_instance); if (NILP (f->device)) return Qnil; return MAYBE_LISP_DEVMETH (XDEVICE (f->device), font_instance_properties, (f)); } DEFUN ("font-list", Ffont_list, 1, 3, 0, /* Return a list of font names matching the given pattern. DEVICE specifies which device to search for names, and defaults to the currently selected device. */ (pattern, device, maxnumber)) { CHECK_STRING (pattern); device = wrap_device (decode_device (device)); return MAYBE_LISP_DEVMETH (XDEVICE (device), font_list, (pattern, device, maxnumber)); } /**************************************************************************** Color Object ***************************************************************************/ static const struct memory_description color_specifier_description[] = { { XD_LISP_OBJECT, offsetof (struct color_specifier, face) }, { XD_LISP_OBJECT, offsetof (struct color_specifier, face_property) }, { XD_END } }; DEFINE_SPECIFIER_TYPE_WITH_DATA (color); /* Qcolor defined in general.c */ static void color_create (Lisp_Object 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) { Lisp_Specifier *color = XCOLOR_SPECIFIER (obj); 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 of for `equal' */ static Lisp_Object color_instantiate (Lisp_Object specifier, Lisp_Object UNUSED (matchspec), Lisp_Object domain, Lisp_Object instantiator, Lisp_Object depth, int no_fallback) { /* When called, we're inside of call_with_suspended_errors(), so we can freely error. */ Lisp_Object device = DOMAIN_DEVICE (domain); struct device *d = XDEVICE (device); if (COLOR_INSTANCEP (instantiator)) { /* If we are on the same device then we're done. Otherwise change the instantiator to the name used to generate the pixel and let the STRINGP case deal with it. */ if (NILP (device) /* Vthe_null_color_instance */ || EQ (device, XCOLOR_INSTANCE (instantiator)->device)) return instantiator; else instantiator = Fcolor_instance_name (instantiator); } if (STRINGP (instantiator)) { /* First, look to see if we can retrieve a cached value. */ Lisp_Object instance = Fgethash (instantiator, d->color_instance_cache, Qunbound); /* Otherwise, make a new one. */ if (UNBOUNDP (instance)) { /* make sure we cache the failures, too. */ instance = Fmake_color_instance (instantiator, device, Qt); Fputhash (instantiator, instance, d->color_instance_cache); } return NILP (instance) ? Qunbound : instance; } else if (VECTORP (instantiator)) { switch (XVECTOR_LENGTH (instantiator)) { case 0: if (DEVICE_TTY_P (d)) return Vthe_null_color_instance; else gui_error ("Color instantiator [] only valid on TTY's", device); case 1: if (NILP (COLOR_SPECIFIER_FACE (XCOLOR_SPECIFIER (specifier)))) gui_error ("Color specifier not attached to a face", instantiator); return (FACE_PROPERTY_INSTANCE_1 (Fget_face (XVECTOR_DATA (instantiator)[0]), COLOR_SPECIFIER_FACE_PROPERTY (XCOLOR_SPECIFIER (specifier)), domain, ERROR_ME, no_fallback, depth)); case 2: return (FACE_PROPERTY_INSTANCE_1 (Fget_face (XVECTOR_DATA (instantiator)[0]), XVECTOR_DATA (instantiator)[1], domain, ERROR_ME, no_fallback, depth)); default: ABORT (); } } else if (NILP (instantiator)) { if (DEVICE_TTY_P (d)) return Vthe_null_color_instance; else gui_error ("Color instantiator [] only valid on TTY's", device); } else ABORT (); /* The spec validation routines are screwed up. */ return Qunbound; } static void color_validate (Lisp_Object instantiator) { if (COLOR_INSTANCEP (instantiator) || STRINGP (instantiator)) return; if (VECTORP (instantiator)) { if (XVECTOR_LENGTH (instantiator) > 2) sferror ("Inheritance vector must be of size 0 - 2", instantiator); else if (XVECTOR_LENGTH (instantiator) > 0) { Lisp_Object face = XVECTOR_DATA (instantiator)[0]; Fget_face (face); if (XVECTOR_LENGTH (instantiator) == 2) { Lisp_Object field = XVECTOR_DATA (instantiator)[1]; if (!EQ (field, Qforeground) && !EQ (field, Qbackground)) invalid_constant ("Inheritance field must be `foreground' or `background'", field); } } } else invalid_argument ("Invalid color instantiator", instantiator); } static void color_after_change (Lisp_Object specifier, Lisp_Object locale) { Lisp_Object face = COLOR_SPECIFIER_FACE (XCOLOR_SPECIFIER (specifier)); Lisp_Object property = COLOR_SPECIFIER_FACE_PROPERTY (XCOLOR_SPECIFIER (specifier)); if (!NILP (face)) { face_property_was_changed (face, property, locale); if (BUFFERP (locale)) XBUFFER (locale)->buffer_local_face_property = 1; } } void set_color_attached_to (Lisp_Object obj, Lisp_Object face, Lisp_Object property) { Lisp_Specifier *color = XCOLOR_SPECIFIER (obj); COLOR_SPECIFIER_FACE (color) = face; COLOR_SPECIFIER_FACE_PROPERTY (color) = property; } DEFUN ("color-specifier-p", Fcolor_specifier_p, 1, 1, 0, /* Return t if OBJECT is a color specifier. See `make-color-specifier' for a description of possible color instantiators. */ (object)) { return COLOR_SPECIFIERP (object) ? Qt : Qnil; } /**************************************************************************** Font Object ***************************************************************************/ static const struct memory_description font_specifier_description[] = { { XD_LISP_OBJECT, offsetof (struct font_specifier, face) }, { XD_LISP_OBJECT, offsetof (struct font_specifier, face_property) }, { XD_END } }; DEFINE_SPECIFIER_TYPE_WITH_DATA (font); /* Qfont defined in general.c */ static void font_create (Lisp_Object 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) { Lisp_Specifier *font = XFONT_SPECIFIER (obj); 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 of for `equal' */ #ifdef MULE /* Given a truename font spec (i.e. the font spec should have its registry field filled in), does it support displaying characters from CHARSET? */ static int font_spec_matches_charset (struct device *d, Lisp_Object charset, const Ibyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount length, enum font_specifier_matchspec_stages stage) { return DEVMETH_OR_GIVEN (d, font_spec_matches_charset, (d, charset, nonreloc, reloc, offset, length, stage), 1); } static void font_validate_matchspec (Lisp_Object matchspec) { CHECK_CONS (matchspec); Fget_charset (XCAR (matchspec)); do { if (EQ(XCDR(matchspec), Qinitial)) { break; } if (EQ(XCDR(matchspec), Qfinal)) { break; } invalid_argument("Invalid font matchspec stage", XCDR(matchspec)); } while (0); } void initialize_charset_font_caches (struct device *d) { /* Note that the following tables are bi-level. */ d->charset_font_cache_stage_1 = make_lisp_hash_table (20, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ); d->charset_font_cache_stage_2 = make_lisp_hash_table (20, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ); } void invalidate_charset_font_caches (Lisp_Object charset) { /* Invalidate font cache entries for charset on all devices. */ Lisp_Object devcons, concons, hash_table; DEVICE_LOOP_NO_BREAK (devcons, concons) { struct device *d = XDEVICE (XCAR (devcons)); hash_table = Fgethash (charset, d->charset_font_cache_stage_1, Qunbound); if (!UNBOUNDP (hash_table)) Fclrhash (hash_table); hash_table = Fgethash (charset, d->charset_font_cache_stage_2, Qunbound); if (!UNBOUNDP (hash_table)) Fclrhash (hash_table); } } #endif /* MULE */ static Lisp_Object font_instantiate (Lisp_Object UNUSED (specifier), Lisp_Object USED_IF_MULE (matchspec), Lisp_Object domain, Lisp_Object instantiator, Lisp_Object depth, int no_fallback) { /* When called, we're inside of call_with_suspended_errors(), so we can freely error. */ Lisp_Object device = DOMAIN_DEVICE (domain); struct device *d = XDEVICE (device); Lisp_Object instance; Lisp_Object charset = Qnil; #ifdef MULE enum font_specifier_matchspec_stages stage = initial; if (!UNBOUNDP (matchspec)) { charset = Fget_charset (XCAR (matchspec)); #define FROB(new_stage) if (EQ(Q##new_stage, XCDR(matchspec))) \ { \ stage = new_stage; \ } FROB(initial) else FROB(final) else assert(0); #undef FROB } #endif if (FONT_INSTANCEP (instantiator)) { if (NILP (device) || EQ (device, XFONT_INSTANCE (instantiator)->device)) { #ifdef MULE if (font_spec_matches_charset (d, charset, 0, Ffont_instance_truename (instantiator), 0, -1, stage)) #endif return instantiator; } instantiator = Ffont_instance_name (instantiator); } if (STRINGP (instantiator)) { #ifdef MULE /* #### rename these caches. */ Lisp_Object cache = stage ? d->charset_font_cache_stage_2 : d->charset_font_cache_stage_1; #else Lisp_Object cache = d->font_instance_cache; #endif #ifdef MULE if (!NILP (charset)) { /* The instantiator is a font spec that could match many different fonts. We need to find one of those fonts whose registry matches the registry of the charset in MATCHSPEC. This is potentially a very slow operation, as it involves doing an XListFonts() or equivalent to iterate over all possible fonts, and a regexp match on each one. So we cache the results. */ Lisp_Object matching_font = Qunbound; Lisp_Object hash_table = Fgethash (charset, cache, Qunbound); if (UNBOUNDP (hash_table)) { /* need to make a sub hash table. */ hash_table = make_lisp_hash_table (20, HASH_TABLE_KEY_WEAK, HASH_TABLE_EQUAL); Fputhash (charset, hash_table, cache); } else matching_font = Fgethash (instantiator, hash_table, Qunbound); if (UNBOUNDP (matching_font)) { /* make sure we cache the failures, too. */ matching_font = DEVMETH_OR_GIVEN (d, find_charset_font, (device, instantiator, charset, stage), instantiator); Fputhash (instantiator, matching_font, hash_table); } if (NILP (matching_font)) return Qunbound; instantiator = matching_font; } #endif /* MULE */ /* First, look to see if we can retrieve a cached value. */ instance = Fgethash (instantiator, cache, Qunbound); /* Otherwise, make a new one. */ if (UNBOUNDP (instance)) { /* make sure we cache the failures, too. */ instance = Fmake_font_instance (instantiator, device, Qt, charset); Fputhash (instantiator, instance, cache); } return NILP (instance) ? Qunbound : instance; } else if (VECTORP (instantiator)) { Lisp_Object match_inst = Qunbound; assert (XVECTOR_LENGTH (instantiator) == 1); match_inst = face_property_matching_instance (Fget_face (XVECTOR_DATA (instantiator)[0]), Qfont, charset, domain, ERROR_ME, no_fallback, depth, initial); if (UNBOUNDP(match_inst)) { match_inst = face_property_matching_instance (Fget_face (XVECTOR_DATA (instantiator)[0]), Qfont, charset, domain, ERROR_ME, no_fallback, depth, final); } return match_inst; } else if (NILP (instantiator)) return Qunbound; else ABORT (); /* Eh? */ return Qunbound; } static void font_validate (Lisp_Object instantiator) { if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator)) return; if (VECTORP (instantiator)) { if (XVECTOR_LENGTH (instantiator) != 1) { sferror ("Vector length must be one for font inheritance", instantiator); } Fget_face (XVECTOR_DATA (instantiator)[0]); } else invalid_argument ("Must be string, vector, or font-instance", instantiator); } static void font_after_change (Lisp_Object specifier, Lisp_Object locale) { Lisp_Object face = FONT_SPECIFIER_FACE (XFONT_SPECIFIER (specifier)); Lisp_Object property = FONT_SPECIFIER_FACE_PROPERTY (XFONT_SPECIFIER (specifier)); if (!NILP (face)) { face_property_was_changed (face, property, locale); if (BUFFERP (locale)) XBUFFER (locale)->buffer_local_face_property = 1; } } void set_font_attached_to (Lisp_Object obj, Lisp_Object face, Lisp_Object property) { Lisp_Specifier *font = XFONT_SPECIFIER (obj); FONT_SPECIFIER_FACE (font) = face; FONT_SPECIFIER_FACE_PROPERTY (font) = property; } DEFUN ("font-specifier-p", Ffont_specifier_p, 1, 1, 0, /* Return non-nil if OBJECT is a font specifier. See `make-font-specifier' for a description of possible font instantiators. */ (object)) { return FONT_SPECIFIERP (object) ? Qt : Qnil; } /***************************************************************************** Face Boolean Object ****************************************************************************/ static const struct memory_description face_boolean_specifier_description[] = { { XD_LISP_OBJECT, offsetof (struct face_boolean_specifier, face) }, { XD_LISP_OBJECT, offsetof (struct face_boolean_specifier, face_property) }, { XD_END } }; DEFINE_SPECIFIER_TYPE_WITH_DATA (face_boolean); Lisp_Object Qface_boolean; static void face_boolean_create (Lisp_Object 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) { Lisp_Specifier *face_boolean = XFACE_BOOLEAN_SPECIFIER (obj); 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 of for `equal' */ static Lisp_Object face_boolean_instantiate (Lisp_Object specifier, Lisp_Object UNUSED (matchspec), Lisp_Object domain, Lisp_Object instantiator, Lisp_Object depth, int no_fallback) { /* When called, we're inside of call_with_suspended_errors(), so we can freely error. */ if (NILP (instantiator) || EQ (instantiator, Qt)) return instantiator; else if (VECTORP (instantiator)) { Lisp_Object retval; Lisp_Object prop; int instantiator_len = XVECTOR_LENGTH (instantiator); assert (instantiator_len >= 1 && instantiator_len <= 3); if (instantiator_len > 1) prop = XVECTOR_DATA (instantiator)[1]; else { if (NILP (FACE_BOOLEAN_SPECIFIER_FACE (XFACE_BOOLEAN_SPECIFIER (specifier)))) gui_error ("Face-boolean specifier not attached to a face", instantiator); prop = FACE_BOOLEAN_SPECIFIER_FACE_PROPERTY (XFACE_BOOLEAN_SPECIFIER (specifier)); } retval = (FACE_PROPERTY_INSTANCE_1 (Fget_face (XVECTOR_DATA (instantiator)[0]), prop, domain, ERROR_ME, no_fallback, depth)); if (instantiator_len == 3 && !NILP (XVECTOR_DATA (instantiator)[2])) retval = NILP (retval) ? Qt : Qnil; return retval; } else ABORT (); /* Eh? */ return Qunbound; } static void face_boolean_validate (Lisp_Object instantiator) { if (NILP (instantiator) || EQ (instantiator, Qt)) return; else if (VECTORP (instantiator) && (XVECTOR_LENGTH (instantiator) >= 1 && XVECTOR_LENGTH (instantiator) <= 3)) { Lisp_Object face = XVECTOR_DATA (instantiator)[0]; Fget_face (face); if (XVECTOR_LENGTH (instantiator) > 1) { Lisp_Object field = XVECTOR_DATA (instantiator)[1]; if (!EQ (field, Qunderline) && !EQ (field, Qstrikethru) && !EQ (field, Qhighlight) && !EQ (field, Qdim) && !EQ (field, Qblinking) && !EQ (field, Qreverse)) invalid_constant ("Invalid face-boolean inheritance field", field); } } else if (VECTORP (instantiator)) sferror ("Wrong length for face-boolean inheritance spec", instantiator); else invalid_argument ("Face-boolean instantiator must be nil, t, or vector", instantiator); } static void face_boolean_after_change (Lisp_Object specifier, Lisp_Object locale) { Lisp_Object face = FACE_BOOLEAN_SPECIFIER_FACE (XFACE_BOOLEAN_SPECIFIER (specifier)); Lisp_Object property = FACE_BOOLEAN_SPECIFIER_FACE_PROPERTY (XFACE_BOOLEAN_SPECIFIER (specifier)); if (!NILP (face)) { face_property_was_changed (face, property, locale); if (BUFFERP (locale)) XBUFFER (locale)->buffer_local_face_property = 1; } } void set_face_boolean_attached_to (Lisp_Object obj, Lisp_Object face, Lisp_Object property) { Lisp_Specifier *face_boolean = XFACE_BOOLEAN_SPECIFIER (obj); FACE_BOOLEAN_SPECIFIER_FACE (face_boolean) = face; FACE_BOOLEAN_SPECIFIER_FACE_PROPERTY (face_boolean) = property; } DEFUN ("face-boolean-specifier-p", Fface_boolean_specifier_p, 1, 1, 0, /* Return non-nil if OBJECT is a face-boolean specifier. See `make-face-boolean-specifier' for a description of possible face-boolean instantiators. */ (object)) { return FACE_BOOLEAN_SPECIFIERP (object) ? Qt : Qnil; } /************************************************************************/ /* initialization */ /************************************************************************/ 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_MULTIWORD_PREDICATE (Qcolor_instancep); DEFSUBR (Fmake_color_instance); DEFSUBR (Fcolor_instance_p); DEFSUBR (Fcolor_instance_name); DEFSUBR (Fcolor_instance_rgb_components); DEFSUBR (Fvalid_color_name_p); DEFSUBR (Fcolor_list); DEFSYMBOL_MULTIWORD_PREDICATE (Qfont_instancep); DEFSUBR (Fmake_font_instance); DEFSUBR (Ffont_instance_p); DEFSUBR (Ffont_instance_name); DEFSUBR (Ffont_instance_ascent); DEFSUBR (Ffont_instance_descent); DEFSUBR (Ffont_instance_width); DEFSUBR (Ffont_instance_charset); DEFSUBR (Ffont_instance_proportional_p); DEFSUBR (Ffont_instance_truename); DEFSUBR (Ffont_instance_properties); DEFSUBR (Ffont_list); /* Qcolor, Qfont defined in general.c */ DEFSYMBOL (Qface_boolean); } void specifier_type_create_objects (void) { INITIALIZE_SPECIFIER_TYPE_WITH_DATA (color, "color", "color-specifier-p"); INITIALIZE_SPECIFIER_TYPE_WITH_DATA (font, "font", "font-specifier-p"); INITIALIZE_SPECIFIER_TYPE_WITH_DATA (face_boolean, "face-boolean", "face-boolean-specifier-p"); SPECIFIER_HAS_METHOD (color, instantiate); SPECIFIER_HAS_METHOD (font, instantiate); SPECIFIER_HAS_METHOD (face_boolean, instantiate); SPECIFIER_HAS_METHOD (color, validate); SPECIFIER_HAS_METHOD (font, validate); SPECIFIER_HAS_METHOD (face_boolean, validate); SPECIFIER_HAS_METHOD (color, create); SPECIFIER_HAS_METHOD (font, create); SPECIFIER_HAS_METHOD (face_boolean, create); SPECIFIER_HAS_METHOD (color, mark); SPECIFIER_HAS_METHOD (font, mark); SPECIFIER_HAS_METHOD (face_boolean, mark); SPECIFIER_HAS_METHOD (color, after_change); SPECIFIER_HAS_METHOD (font, after_change); SPECIFIER_HAS_METHOD (face_boolean, after_change); #ifdef MULE SPECIFIER_HAS_METHOD (font, validate_matchspec); #endif } 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_nodump (&Vthe_null_color_instance); { Lisp_Color_Instance *c = ALLOC_LCRECORD_TYPE (Lisp_Color_Instance, &lrecord_color_instance); c->name = Qnil; c->device = Qnil; c->data = 0; Vthe_null_color_instance = wrap_color_instance (c); } staticpro_nodump (&Vthe_null_font_instance); { Lisp_Font_Instance *f = ALLOC_LCRECORD_TYPE (Lisp_Font_Instance, &lrecord_font_instance); f->name = Qnil; f->truename = Qnil; f->device = Qnil; f->data = 0; f->ascent = f->height = 0; f->descent = 0; f->width = 0; f->proportional_p = 0; Vthe_null_font_instance = wrap_font_instance (f); } } void vars_of_objects (void) { }