annotate lisp/objects.el @ 5013:ae48681c47fa

changes to VOID_TO_LISP et al. -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-08 Ben Wing <ben@xemacs.org> * casetab.c (compute_canon_mapper): * casetab.c (initialize_identity_mapper): * casetab.c (compute_up_or_eqv_mapper): * casetab.c (recompute_case_table): * casetab.c (set_case_table): * chartab.c (copy_mapper): * chartab.c (copy_char_table_range): * chartab.c (get_range_char_table_1): * console.c (find_nonminibuffer_frame_not_on_console_predicate): * console.c (find_nonminibuffer_frame_not_on_console): * console.c (nuke_all_console_slots): * device.c: * device.c (find_nonminibuffer_frame_not_on_device_predicate): * device.c (find_nonminibuffer_frame_not_on_device): * dialog-msw.c (dialog_proc): * dialog-msw.c (handle_question_dialog_box): * dialog-x.c (maybe_run_dbox_text_callback): * eval.c: * eval.c (safe_run_hook_trapping_problems_1): * eval.c (safe_run_hook_trapping_problems): * event-msw.c: * event-msw.c (mswindows_wnd_proc): * event-msw.c (mswindows_find_frame): * faces.c (update_face_inheritance_mapper): * frame-msw.c (mswindows_init_frame_1): * frame-msw.c (mswindows_get_mouse_position): * frame-msw.c (mswindows_get_frame_parent): * glade.c (connector): * glade.c (Fglade_xml_signal_connect): * glade.c (Fglade_xml_signal_autoconnect): * glade.c (Fglade_xml_textdomain): * glyphs-msw.c (mswindows_subwindow_instantiate): * glyphs-msw.c (mswindows_widget_instantiate): * glyphs.c (check_instance_cache_mapper): * glyphs.c (check_window_subwindow_cache): * glyphs.c (check_image_instance_structure): * gui-x.c (snarf_widget_value_mapper): * gui-x.c (popup_selection_callback): * gui-x.c (button_item_to_widget_value): * keymap.c (map_keymap_mapper): * keymap.c (Fmap_keymap): * menubar-gtk.c (__torn_off_sir): * menubar-gtk.c (__activate_menu): * menubar-gtk.c (menu_convert): * menubar-gtk.c (__generic_button_callback): * menubar-gtk.c (menu_descriptor_to_widget_1): * menubar-msw.c: * menubar-msw.c (EMPTY_ITEM_ID): * menubar-x.c (menu_item_descriptor_to_widget_value_1): * menubar-x.c (pre_activate_callback): * menubar-x.c (command_builder_operate_menu_accelerator): * menubar-x.c (command_builder_find_menu_accelerator): * print.c (print_internal): * process-unix.c (close_process_descs_mapfun): * process.c (get_process_from_usid): * process.c (init_process_io_handles): * profile.c (sigprof_handler): * profile.c (get_profiling_info_timing_maphash): * profile.c (Fget_profiling_info): * profile.c (set_profiling_info_timing_maphash): * profile.c (mark_profiling_info_maphash): * scrollbar-msw.c (mswindows_create_scrollbar_instance): * scrollbar-msw.c (mswindows_free_scrollbar_instance): * scrollbar-msw.c (mswindows_handle_scrollbar_event): * specifier.c (recompute_cached_specifier_everywhere_mapfun): * specifier.c (recompute_cached_specifier_everywhere): * syntax.c (copy_to_mirrortab): * syntax.c (copy_if_not_already_present): * syntax.c (update_just_this_syntax_table): * text.c (new_dfc_convert_now_damn_it): * text.h (LISP_STRING_TO_EXTERNAL): * tooltalk.c: * tooltalk.c (tooltalk_message_callback): * tooltalk.c (tooltalk_pattern_callback): * tooltalk.c (Fcreate_tooltalk_message): * tooltalk.c (Fcreate_tooltalk_pattern): * ui-byhand.c (__generic_toolbar_callback): * ui-byhand.c (generic_toolbar_insert_item): * ui-byhand.c (__emacs_gtk_ctree_recurse_internal): * ui-byhand.c (Fgtk_ctree_recurse): * ui-gtk.c (__internal_callback_destroy): * ui-gtk.c (__internal_callback_marshal): * ui-gtk.c (Fgtk_signal_connect): * ui-gtk.c (gtk_type_to_lisp): * ui-gtk.c (lisp_to_gtk_type): * ui-gtk.c (lisp_to_gtk_ret_type): * lisp-disunion.h: * lisp-disunion.h (NON_LVALUE): * lisp-union.h: * lisp.h (LISP_HASH): Rename: LISP_TO_VOID -> STORE_LISP_IN_VOID VOID_TO_LISP -> GET_LISP_FROM_VOID These new names are meant to clearly identify that the Lisp object is the source and void the sink, and that they can't be used the other way around -- they aren't exact opposites despite the old names. The names are also important given the new functions created just below. Also, clarify comments in lisp-union.h and lisp-disunion.h about the use of the functions. * lisp.h: New functions STORE_VOID_IN_LISP and GET_VOID_FROM_LISP. These are different from the above in that the source is a void * (previously, you had to use make_opaque_ptr()). * eval.c (restore_lisp_object): * eval.c (record_unwind_protect_restoring_lisp_object): * eval.c (struct restore_int): * eval.c (restore_int): * eval.c (record_unwind_protect_restoring_int): * eval.c (free_pointer): * eval.c (record_unwind_protect_freeing): * eval.c (free_dynarr): * eval.c (record_unwind_protect_freeing_dynarr): * eval.c (unbind_to_1): Use STORE_VOID_IN_LISP and GET_VOID_FROM_LISP to eliminate the use of make_opaque_ptr() and mostly eliminate Lisp consing entirely in the use of these various record_unwind_protect_* functions as well as internal_bind_* (e.g. internal_bind_int). * tests.c: * tests.c (Ftest_store_void_in_lisp): * tests.c (syms_of_tests): * tests.c (vars_of_tests): Add an C-assert-style test to test STORE_VOID_IN_LISP and GET_VOID_FROM_LISP to make sure the same value comes back that was put in.
author Ben Wing <ben@xemacs.org>
date Mon, 08 Feb 2010 06:42:16 -0600
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.