annotate lisp/objects.el @ 4690:257b468bf2ca

Move the #'query-coding-region implementation to C. This is necessary because there is no reasonable way to access the corresponding mswindows-multibyte functionality from Lisp, and we need such functionality if we're going to have a reliable and portable #'query-coding-region implementation. However, this change doesn't yet provide #'query-coding-region for the mswindow-multibyte coding systems, there should be no functional differences between an XEmacs with this change and one without it. src/ChangeLog addition: 2009-09-19 Aidan Kehoe <kehoea@parhasard.net> Move the #'query-coding-region implementation to C. This is necessary because there is no reasonable way to access the corresponding mswindows-multibyte functionality from Lisp, and we need such functionality if we're going to have a reliable and portable #'query-coding-region implementation. However, this change doesn't yet provide #'query-coding-region for the mswindow-multibyte coding systems, there should be no functional differences between an XEmacs with this change and one without it. * mule-coding.c (struct fixed_width_coding_system): Add a new coding system type, fixed_width, and implement it. It uses the CCL infrastructure but has a much simpler creation API, and its own query_method, formerly in lisp/mule/mule-coding.el. * unicode.c: Move the Unicode query method implementation here from unicode.el. * lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table here. * intl-win32.c (complex_vars_of_intl_win32): Use Fmake_coding_system_internal, not Fmake_coding_system. * general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence here. * file-coding.h (enum coding_system_variant): Add fixed_width_coding_system here. (struct coding_system_methods): Add query_method and query_lstream_method to the coding system methods. Provide flags for the query methods. Declare the default query method; initialise it correctly in INITIALIZE_CODING_SYSTEM_TYPE. * file-coding.c (default_query_method): New function, the default query method for coding systems that do not set it. Moved from coding.el. (make_coding_system_1): Accept new elements in PROPS in #'make-coding-system; aliases, a list of aliases; safe-chars and safe-charsets (these were previously accepted but not saved); and category. (Fmake_coding_system_internal): New function, what used to be #'make-coding-system--on Mule builds, we've now moved some of the functionality of this to Lisp. (Fcoding_system_canonical_name_p): Move this earlier in the file, since it's now called from within make_coding_system_1. (Fquery_coding_region): Move the implementation of this here, from coding.el. (complex_vars_of_file_coding): Call Fmake_coding_system_internal, not Fmake_coding_system; specify safe-charsets properties when we're a mule build. * extents.h (mouse_highlight_priority, Fset_extent_priority, Fset_extent_face, Fmap_extents): Make these available to other C files. lisp/ChangeLog addition: 2009-09-19 Aidan Kehoe <kehoea@parhasard.net> Move the #'query-coding-region implementation to C. * coding.el: Consolidate code that depends on the presence or absence of Mule at the end of this file. (default-query-coding-region, query-coding-region): Move these functions to C. (default-query-coding-region-safe-charset-skip-chars-map): Remove this variable, the corresponding C variable is Vdefault_query_coding_region_chartab_cache in file-coding.c. (query-coding-string): Update docstring to reflect actual multiple values, be more careful about not modifying a range table that we're currently mapping over. (encode-coding-char): Make the implementation of this simpler. (featurep 'mule): Autoload #'make-coding-system from mule/make-coding-system.el if we're a mule build; provide an appropriate compiler macro. Do various non-mule compatibility things if we're not a mule build. * update-elc.el (additional-dump-dependencies): Add mule/make-coding-system as a dump time dependency if we're a mule build. * unicode.el (ccl-encode-to-ucs-2): (decode-char): (encode-char): Move these earlier in the file, for the sake of some byte compile warnings. (unicode-query-coding-region): Move this to unicode.c * mule/make-coding-system.el: New file, not dumped. Contains the functionality to rework the arguments necessary for fixed-width coding systems, and contains the implementation of #'make-coding-system, which now calls #'make-coding-system-internal. * mule/vietnamese.el (viscii): * mule/latin.el (iso-8859-2): (windows-1250): (iso-8859-3): (iso-8859-4): (iso-8859-14): (iso-8859-15): (iso-8859-16): (iso-8859-9): (macintosh): (windows-1252): * mule/hebrew.el (iso-8859-8): * mule/greek.el (iso-8859-7): (windows-1253): * mule/cyrillic.el (iso-8859-5): (koi8-r): (koi8-u): (windows-1251): (alternativnyj): (koi8-ru): (koi8-t): (koi8-c): (koi8-o): * mule/arabic.el (iso-8859-6): (windows-1256): Move all these coding systems to being of type fixed-width, not of type CCL. This allows the distinct query-coding-region for them to be in C, something which will eventually allow us to implement query-coding-region for the mswindows-multibyte coding systems. * mule/general-late.el (posix-charset-to-coding-system-hash): Document why we're pre-emptively persuading the byte compiler that the ELC for this file needs to be written using escape-quoted. Call #'set-unicode-query-skip-chars-args, now the Unicode query-coding-region implementation is in C. * mule/thai-xtis.el (tis-620): Don't bother checking whether we're XEmacs or not here. * mule/mule-coding.el: Move the eight bit fixed-width functionality from this file to make-coding-system.el. tests/ChangeLog addition: 2009-09-19 Aidan Kehoe <kehoea@parhasard.net> * automated/mule-tests.el: Check a coding system's type, not an 8-bit-fixed property, for whether that coding system should be treated as a fixed-width coding system. * automated/query-coding-tests.el: Don't test the query coding functionality for mswindows-multibyte coding systems, it's not yet implemented.
author Aidan Kehoe <kehoea@parhasard.net>
date Sat, 19 Sep 2009 22:53:13 +0100
parents 6e9bd19ec103
children 5502045ec510
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1 ;;; objects.el --- Lisp interface to C window-system objects
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3 ;; Copyright (C) 1994, 1997 Free Software Foundation, Inc.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4 ;; Copyright (C) 1995 Ben Wing
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6 ;; Author: Chuck Thompson <cthomp@xemacs.org>
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7 ;; Author: Ben Wing <ben@xemacs.org>
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8 ;; Maintainer: XEmacs Development Team
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9 ;; Keywords: faces, internal, dumped
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
11 ;; This file is part of XEmacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
12
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
13 ;; XEmacs is free software; you can redistribute it and/or modify it
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
14 ;; under the terms of the GNU General Public License as published by
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
15 ;; the Free Software Foundation; either version 2, or (at your option)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
16 ;; any later version.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
17
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
18 ;; XEmacs is distributed in the hope that it will be useful, but
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
19 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
21 ;; General Public License for more details.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
22
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
23 ;; You should have received a copy of the GNU General Public License
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
24 ;; along with XEmacs; see the file COPYING. If not, write to the
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
25 ;; Free Software Foundation, 59 Temple Place - Suite 330,
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
26 ;; Boston, MA 02111-1307, USA.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
27
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
28 ;;; Synched up with: Not in FSF.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
29
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
30 ;;; Commentary:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
31
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
32 ;; This file is dumped with XEmacs.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
33
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
34 ;;; Code:
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
35
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
36 (defun ws-object-property-1 (function object domain &optional matchspec)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
37 (let ((instance (if matchspec
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
38 (specifier-matching-instance object matchspec domain)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
39 (specifier-instance object domain))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
40 (and instance (funcall function instance))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
41
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
42 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; font specifiers
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
43
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
44 (defun make-font-specifier (spec-list)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
45 "Return a new `font' specifier object with the given specification list.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
46 SPEC-LIST can be a list of specifications (each of which is a cons of a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
47 locale and a list of instantiators), a single instantiator, or a list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
48 of instantiators. See `make-specifier' for more information about
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
49 specifiers.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
50
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
51 Valid instantiators for font specifiers are:
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
52
3111
e1bc252950d9 [xemacs-hg @ 2005-11-29 12:08:32 by stephent]
stephent
parents: 442
diff changeset
53 -- a string naming a font; syntax is platform dependent. Some examples for
e1bc252950d9 [xemacs-hg @ 2005-11-29 12:08:32 by stephent]
stephent
parents: 442
diff changeset
54 a 14-point upright medium-weight Courier font:
e1bc252950d9 [xemacs-hg @ 2005-11-29 12:08:32 by stephent]
stephent
parents: 442
diff changeset
55 X11 (and GTK1): \"-*-courier-medium-r-*-*-*-140-*-*-*-*-iso8859-*\"
e1bc252950d9 [xemacs-hg @ 2005-11-29 12:08:32 by stephent]
stephent
parents: 442
diff changeset
56 Xft (and GTK2): \"Courier-14\"
e1bc252950d9 [xemacs-hg @ 2005-11-29 12:08:32 by stephent]
stephent
parents: 442
diff changeset
57 MS-Windows: \"Courier:14:Western\"
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
58 -- a font instance (use that instance directly if the device matches,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
59 or use the string that generated it)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
60 -- a vector of no elements (only on TTY's; this means to set no font
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
61 at all, thus using the \"natural\" font of the terminal's text)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
62 -- a vector of one element (a face to inherit from)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
63 "
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
64 (make-specifier-and-init 'font spec-list))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
65
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
66 (defun font-name (font &optional domain charset)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
67 "Return the name of the FONT in the specified DOMAIN, if any.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
68 FONT should be a font specifier object and DOMAIN is normally a window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
69 and defaults to the selected window if omitted. This is equivalent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
70 to using `specifier-instance' and applying `font-instance-name' to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
71 the result. See `make-specifier' for more information about specifiers."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
72 (ws-object-property-1 'font-instance-name font domain charset))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
73
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
74 (defun font-ascent (font &optional domain charset)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
75 "Return the ascent of the FONT in the specified DOMAIN, if any.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
76 FONT should be a font specifier object and DOMAIN is normally a window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
77 and defaults to the selected window if omitted. This is equivalent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
78 to using `specifier-instance' and applying `font-instance-ascent' to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
79 the result. See `make-specifier' for more information about specifiers."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
80 (ws-object-property-1 'font-instance-ascent font domain charset))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
81
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
82 (defun font-descent (font &optional domain charset)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
83 "Return the descent of the FONT in the specified DOMAIN, if any.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
84 FONT should be a font specifier object and DOMAIN is normally a window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
85 and defaults to the selected window if omitted. This is equivalent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
86 to using `specifier-instance' and applying `font-instance-descent' to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
87 the result. See `make-specifier' for more information about specifiers."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
88 (ws-object-property-1 'font-instance-descent font domain charset))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
89
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
90 (defun font-width (font &optional domain charset)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
91 "Return the width of the FONT in the specified DOMAIN, if any.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
92 FONT should be a font specifier object and DOMAIN is normally a window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
93 and defaults to the selected window if omitted. This is equivalent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
94 to using `specifier-instance' and applying `font-instance-width' to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
95 the result. See `make-specifier' for more information about specifiers."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
96 (ws-object-property-1 'font-instance-width font domain charset))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
97
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
98 (defun font-height (font &optional domain charset)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
99 "Return the height of the FONT in the specified DOMAIN, if any.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
100 FONT should be a font specifier object and DOMAIN is normally a window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
101 and defaults to the selected window if omitted. This is equivalent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
102 to using `specifier-instance' and applying `font-instance-height' to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
103 the result. See `make-specifier' for more information about specifiers."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
104 (ws-object-property-1 'font-instance-height font domain charset))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
105
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
106 (defun font-proportional-p (font &optional domain charset)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
107 "Return whether FONT is proportional in the specified DOMAIN, if known.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
108 FONT should be a font specifier object and DOMAIN is normally a window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
109 and defaults to the selected window if omitted. This is equivalent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
110 to using `specifier-instance' and applying `font-instance-proportional-p' to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
111 the result. See `make-specifier' for more information about specifiers."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
112 (ws-object-property-1 'font-instance-proportional-p font domain charset))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
113
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
114 (defun font-properties (font &optional domain charset)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
115 "Return the properties of the FONT in the specified DOMAIN, if any.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
116 FONT should be a font specifier object and DOMAIN is normally a window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
117 and defaults to the selected window if omitted. This is equivalent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
118 to using `specifier-instance' and applying `font-instance-properties'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
119 to the result. See `make-specifier' for more information about specifiers."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
120 (ws-object-property-1 'font-instance-properties font domain charset))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
121
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
122 (defun font-truename (font &optional domain charset)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
123 "Return the truename of the FONT in the specified DOMAIN, if any.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
124 FONT should be a font specifier object and DOMAIN is normally a window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
125 and defaults to the selected window if omitted. This is equivalent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
126 to using `specifier-instance' and applying `font-instance-truename'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
127 to the result. See `make-specifier' for more information about specifiers."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
128 (ws-object-property-1 'font-instance-truename font domain charset))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
129
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
130 (defun font-instance-height (font-instance)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
131 "Return the height in pixels of FONT-INSTANCE.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
132 The returned value is the maximum height for all characters in the font,\n\
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
133 and is equivalent to the sum of the font instance's ascent and descent."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
134 (+ (font-instance-ascent font-instance)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
135 (font-instance-descent font-instance)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
136
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
137 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; color specifiers
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
138
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
139 (defun make-color-specifier (spec-list)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
140 "Return a new `color' specifier object with the given specification list.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
141 SPEC-LIST can be a list of specifications (each of which is a cons of a
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
142 locale and a list of instantiators), a single instantiator, or a list
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
143 of instantiators. See `make-specifier' for a detailed description of
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
144 how specifiers work.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
145
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
146 Valid instantiators for color specifiers are:
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
147
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
148 -- a string naming a color (e.g. under X this might be \"lightseagreen2\"
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
149 or \"#F534B2\")
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
150 -- a color instance (use that instance directly if the device matches,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
151 or use the string that generated it)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
152 -- a vector of no elements (only on TTY's; this means to set no color
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
153 at all, thus using the \"natural\" color of the terminal's text)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
154 -- a vector of one or two elements: a face to inherit from, and
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
155 optionally a symbol naming which property of that face to inherit,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
156 either `foreground' or `background' (if omitted, defaults to the same
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
157 property that this color specifier is used for; if this specifier is
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
158 not part of a face, the instantiator would not be valid)."
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
159 (make-specifier-and-init 'color spec-list))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
160
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
161 (defun color-name (color &optional domain)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
162 "Return the name of the COLOR in the specified DOMAIN, if any.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
163 COLOR should be a color specifier object and DOMAIN is normally a window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
164 and defaults to the selected window if omitted. This is equivalent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
165 to using `specifier-instance' and applying `color-instance-name' to
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
166 the result. See `make-specifier' for more information about specifiers."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
167 (ws-object-property-1 'color-instance-name color domain))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
168
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
169 (defun color-rgb-components (color &optional domain)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
170 "Return the RGB components of the COLOR in the specified DOMAIN, if any.
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
171 COLOR should be a color specifier object and DOMAIN is normally a window
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
172 and defaults to the selected window if omitted. This is equivalent
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
173 to using `specifier-instance' and applying `color-instance-rgb-components'
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
174 to the result. See `make-specifier' for more information about specifiers."
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
175 (ws-object-property-1 'color-instance-rgb-components color domain))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
176
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
177 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; face-boolean specifiers
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
178
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
179 (defun make-face-boolean-specifier (spec-list)
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
180 "Return a new `face-boolean' specifier object with the given spec list.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
181 SPEC-LIST can be a list of specifications (each of which is a cons of a
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
182 locale and a list of instantiators), a single instantiator, or a list
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
183 of instantiators. See `make-specifier' for a detailed description of
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
184 how specifiers work.
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
185
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
186 Valid instantiators for face-boolean specifiers are
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
187
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
188 -- t or nil
4201
6e9bd19ec103 [xemacs-hg @ 2007-10-02 07:54:07 by didierv]
didierv
parents: 3111
diff changeset
189 -- a vector of one, two or three elements: a face to inherit from,
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
190 optionally a symbol naming the property of that face to inherit from
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
191 (if omitted, defaults to the same property that this face-boolean
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
192 specifier is used for; if this specifier is not part of a face,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
193 the instantiator would not be valid), and optionally a value which,
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
194 if non-nil, means to invert the sense of the inherited property."
4201
6e9bd19ec103 [xemacs-hg @ 2007-10-02 07:54:07 by didierv]
didierv
parents: 3111
diff changeset
195 (make-specifier-and-init 'face-boolean spec-list))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 428
diff changeset
196
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
197 ;;; objects.el ends here.