Mercurial > hg > xemacs-beta
view src/objects.c @ 872:79c6ff3eef26
[xemacs-hg @ 2002-06-20 21:18:01 by ben]
font changes etc.; some 21.4 changes
mule/mule-msw-init-late.el: Specify charset->windows-registry conversion.
mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c.
cl-macs.el: Document better.
font-lock.el: Move Lisp function regexp to lisp-mode.el.
lisp-mode.el: Various indentation fixes:
Handle flet functions better.
Handle argument lists in defuns and flets.
Handle quoted lists, e.g. property lists -- don't indent like
function calls. Distinguish between lambdas and other lists.
lisp-mode.el: Handle this form.
faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code:
-- Fix lots of bogus code in msw-faces.el, msw-font-menu.el,
font-menu.el that was "truenaming" font specs -- i.e. in the
process of frobbing a particular field in a general user-specified
font spec with wildcarded fields, sticking in particular values
for all the remaining wildcarded fields. This bug was rampant
everywhere except in x-faces.el (the oldest and only correctly
written code). This also means that we need to work with font
names at all times and not font instances, because a font instance
is essentially a truenamed font.
-- Total rewrite of extremely junky code in msw-faces.el. Work
with names as well as font instances, and return names; stop
truenaming when canonicalizing and frobbing; fix handling of the
combined style field, i.e. weight/slant (also fixed in font.el).
-- Totally rewrite the frobbing functions in faces.el. This time,
we frob all the instantiators rather than just computing a single
instance value and working backwards. That way, e.g., `bold' will
work for all charsets that have bold available, rather than only
for whatever charset was part of the computed font instance
(another example of the truename virus). Also fix up code to look
at the fallbacks (all of them) when no global value present, so we
don't need to put something in the global value. Intelligently
handle a request to frob a buffer locale, rather than signalling
an error. When frobbing instantiators, try hard to figure out
what device type is associated with them, and frob each according
to its own proper device type. Correctly handle inheritance
vectors given as instantiators. Preserve existing tags when
putting back frobbed instantiators. Extract out general
specifier-frobbing code into specifier.el. Document everything
cleanly. Do lots of other things better, etc.
-- Don't duplicatively set a global specification for the default
font -- it's already in the fallback and we no longer need a
default global specification present. Delete various code in
x-faces.el and msw-faces.el that duplicated the lists of fonts in
faces.c.
-- init-global-faces was not being called at all under MS Windows!
Major bogosity. That caused device-specific values to get stuck
into all the fonts, making it very hard to change them -- setting
global specs caused nothing to happen.
-- Correct weight names in font.el.
-- Lots more font fixups in objects*.c.
Printer.el: Warning fix.
specifier.el: Add more args to map-specifier.
Add various "heuristic" specifier functions to aid in creation of
specifier-munging code such as in faces.el.
subr.el: New functions.
lwlib.c: Fix warning.
config.inc.samp: Clean up, add args to control fastcall (not yet supported! the
changes needed are in another ws of mine), profile support, vc6
support, union-type.
xemacs.dsp, xemacs.mak: Semi-major overhaul.
Fix bug where dump-id was always getting recomputed, forcing a
redump even when nothing changed.
Add support for fastcall. Support edit-and-continue (on by
default) with vc6. Use incremental linking when doing a debug
compilation. Add support for profiling.
Consolidate the various debug flags.
Partial support for "batch-compiling" -- compiling many files on a
single invocation of the compiler. Doesn't seem to help that much
for me, so it's not finished or enabled by default.
Remove HAVE_MSW_C_DIRED, we always do.
Correct some sloppy use of directories.
s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine
HAVE_MMAP).
s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32
variants (Cygwin, native, MinGW). Both of these are properly used
in another ws.
alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made:
(1) Separation of various header files into an external and an
internal version, similar to the existing separation of process.h
and procimpl.h. Eventually this should be done for all Lisp
objects. The external version has the same name as currently; the
internal adds -impl. The external file has XFOO() macros for
objects, but the structure is opaque and defined only in the
internal file. It's now reasonable to move all prototypes in
lisp.h into the appropriate external file, and this should be
done. Currently, separation has been done on extents.h,
objects*.h, console.h, device.h, frame.h, and window.h.
For c/d/f/w, the most basic properties are available in the
external header file, with the macros resolving to functions. In
the internal header file, the macros are redefined to directly
access the structure. Also, the global MARK_FOO_CHANGED macros
have been made into functions so that they can be accessed without
needing to include lots of -impl headers -- they are used in
almost exclusively in non-time-critical functions, and take up
enough time that the function overhead will be negligible.
Similarly, the function overhead from making the basic properties
mentioned above into functions is negligible, and code that does
heavy accessing of c/d/f/w structures inevitably ends up needing
the internal header files, anyway.
(2) More face changes.
-- Major rewrite of objects-msw.c. Now handles wildcard specs
properly, rather than "truenaming" (or even worse, signalling an
error, which previously happened with some of the fallbacks if you
tried to use them in make-font-instance!).
-- Split charset matching of fonts into two stages -- one to find
a font specifically designed for a particular charset (by
examining its registry), the second to find a Unicode font that
can support the charset. This needs to proceed as two complete,
separate instantiations in order to work properly (otherwise many
of the fonts in the HELLO page look wrong). This should also make
it easy to support iso10646 (Unicode) fonts under X.
-- All default values for fonts are now completely specified in
the fallbacks. Stuff from mule-x-init.el has all been moved here,
merged with the existing specs, and totally rethought so you get
sensible results. (HELLO now looks much better!).
-- Generalize the "default X/GTK device" stuff into a
per-device-type "default device".
-- Add mswindows-{set-}charset-registry. In time,
charset<->code-page conversion functions will be removed.
-- Wrap protective code around calls to compute device specifier tags,
and do this computation before calling the face initialization code
because the latter may need these tags to be correctly updated.
(3) Other changes.
EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes.
config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of
#ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside!
eval.c: Let detailed backtraces be detailed.
specifier.c: Don't override user's print-string-length/print-length settings.
glyphs.c: New function image-instance-instantiator.
config.h.in, sysdep.c: Changes for fastcall.
sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both
EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP
NEEDS TO GO IN, TOO.
search.c: Fix *evil* crash due to incorrect synching of syntax-cache code
with 21.1. THIS SHOULD GO INTO 21.4.
author | ben |
---|---|
date | Thu, 20 Jun 2002 21:19:10 +0000 |
parents | 804517e16990 |
children | d4ba25667ff4 |
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 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" /* 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 */ void 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 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_object ("#<color-instance 0x%x>", c->header.uid); 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) { 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 unsigned long 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 ((unsigned long) d, !d ? LISP_HASH (obj) : DEVMETH_OR_GIVEN (d, color_instance_hash, (c, depth), LISP_HASH (obj))); } DEFINE_LRECORD_IMPLEMENTATION ("color-instance", color_instance, mark_color_instance, print_color_instance, finalize_color_instance, color_instance_equal, color_instance_hash, 0, 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; 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; } /*************************************************************************** * Font-Instance Object * ***************************************************************************/ Lisp_Object Qfont_instancep; static Lisp_Object font_instance_truename_internal (Lisp_Object xfont, Error_Behavior errb); 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_object ("#<font-instance 0x%x>", f->header.uid); 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) { /* #### 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 unsigned long 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, mark_font_instance, print_font_instance, finalize_font_instance, font_instance_equal, font_instance_hash, 0, Lisp_Font_Instance); DEFUN ("make-font-instance", Fmake_font_instance, 1, 3, 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. 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 X data is deallocated as well. */ (name, device, noerror)) { 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; /* Stick some default values here ... */ f->ascent = f->height = 1; f->descent = 0; f->width = 1; 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, "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); } 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-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 ("list-fonts", Flist_fonts, 1, 2, 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)) { CHECK_STRING (pattern); device = wrap_device (decode_device (device)); return MAYBE_LISP_DEVMETH (XDEVICE (device), list_fonts, (pattern, device)); } /**************************************************************************** Color Object ***************************************************************************/ DEFINE_SPECIFIER_TYPE (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 matchspec, Lisp_Object domain, Lisp_Object instantiator, Lisp_Object depth) { /* 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, 0, depth)); case 2: return (FACE_PROPERTY_INSTANCE_1 (Fget_face (XVECTOR_DATA (instantiator)[0]), XVECTOR_DATA (instantiator)[1], domain, ERROR_ME, 0, 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 ***************************************************************************/ DEFINE_SPECIFIER_TYPE (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, int 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)); } #endif /* MULE */ 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); } } static Lisp_Object font_instantiate (Lisp_Object specifier, Lisp_Object matchspec, Lisp_Object domain, Lisp_Object instantiator, Lisp_Object depth) { /* 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; int stage = 0; #ifdef MULE if (!UNBOUNDP (matchspec)) { charset = Fget_charset (XCAR (matchspec)); stage = NILP (XCDR (matchspec)) ? 0 : 1; } #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)) return instantiator; #else return instantiator; #endif } instantiator = Ffont_instance_name (instantiator); } if (STRINGP (instantiator)) { Lisp_Object cache = stage ? d->charset_font_cache_stage_2 : d->charset_font_cache_stage_1; #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); Fputhash (instantiator, instance, cache); } return NILP (instance) ? Qunbound : instance; } else if (VECTORP (instantiator)) { assert (XVECTOR_LENGTH (instantiator) == 1); return (face_property_matching_instance (Fget_face (XVECTOR_DATA (instantiator)[0]), Qfont, charset, domain, ERROR_ME, 0, depth)); } 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 ****************************************************************************/ DEFINE_SPECIFIER_TYPE (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 matchspec, Lisp_Object domain, Lisp_Object instantiator, Lisp_Object depth) { /* 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, 0, 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); 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_proportional_p); DEFSUBR (Ffont_instance_truename); DEFSUBR (Ffont_instance_properties); DEFSUBR (Flist_fonts); /* Qcolor, Qfont defined in general.c */ DEFSYMBOL (Qface_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) { 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) { reinit_vars_of_objects (); }