Mercurial > hg > xemacs-beta
annotate lisp/objects.el @ 4952:19a72041c5ed
Mule-izing, various fixes related to char * arguments
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_result_status):
* postgresql/postgresql.c (Fpq_res_status):
Mule-ize large parts of it.
2010-01-26 Ben Wing <ben@xemacs.org>
* ldap/eldap.c (print_ldap):
* ldap/eldap.c (allocate_ldap):
Use write_ascstring().
src/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (build_ascstring):
* alloc.c (build_msg_cistring):
* alloc.c (staticpro_1):
* alloc.c (staticpro_name):
* alloc.c (staticpro_nodump_1):
* alloc.c (staticpro_nodump_name):
* alloc.c (unstaticpro_nodump_1):
* alloc.c (mcpro_1):
* alloc.c (mcpro_name):
* alloc.c (object_memory_usage_stats):
* alloc.c (common_init_alloc_early):
* alloc.c (init_alloc_once_early):
* buffer.c (print_buffer):
* buffer.c (vars_of_buffer):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.c (init_initial_directory):
* bytecode.c (invalid_byte_code):
* bytecode.c (print_compiled_function):
* bytecode.c (mark_compiled_function):
* chartab.c (print_table_entry):
* chartab.c (print_char_table):
* config.h.in:
* console-gtk.c:
* console-gtk.c (gtk_device_to_console_connection):
* console-gtk.c (gtk_semi_canonicalize_console_connection):
* console-gtk.c (gtk_canonicalize_console_connection):
* console-gtk.c (gtk_semi_canonicalize_device_connection):
* console-gtk.c (gtk_canonicalize_device_connection):
* console-stream.c (stream_init_frame_1):
* console-stream.c (vars_of_console_stream):
* console-stream.c (init_console_stream):
* console-x.c (x_semi_canonicalize_console_connection):
* console-x.c (x_semi_canonicalize_device_connection):
* console-x.c (x_canonicalize_device_connection):
* console-x.h:
* data.c (eq_with_ebola_notice):
* data.c (Fsubr_interactive):
* data.c (Fnumber_to_string):
* data.c (digit_to_number):
* device-gtk.c (gtk_init_device):
* device-msw.c (print_devmode):
* device-x.c (x_event_name):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-msw.c (vars_of_dialog_mswindows):
* doc.c (weird_doc):
* doc.c (Fsnarf_documentation):
* doc.c (vars_of_doc):
* dumper.c (pdump):
* dynarr.c:
* dynarr.c (Dynarr_realloc):
* editfns.c (Fuser_real_login_name):
* editfns.c (get_home_directory):
* elhash.c (print_hash_table_data):
* elhash.c (print_hash_table):
* emacs.c (main_1):
* emacs.c (vars_of_emacs):
* emodules.c:
* emodules.c (_emodules_list):
* emodules.c (Fload_module):
* emodules.c (Funload_module):
* emodules.c (Flist_modules):
* emodules.c (find_make_module):
* emodules.c (attempt_module_delete):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_subr):
* emodules.c (emodules_doc_sym):
* emodules.c (syms_of_module):
* emodules.c (vars_of_module):
* emodules.h:
* eval.c (print_subr):
* eval.c (signal_call_debugger):
* eval.c (build_error_data):
* eval.c (signal_error):
* eval.c (maybe_signal_error):
* eval.c (signal_continuable_error):
* eval.c (maybe_signal_continuable_error):
* eval.c (signal_error_2):
* eval.c (maybe_signal_error_2):
* eval.c (signal_continuable_error_2):
* eval.c (maybe_signal_continuable_error_2):
* eval.c (signal_ferror):
* eval.c (maybe_signal_ferror):
* eval.c (signal_continuable_ferror):
* eval.c (maybe_signal_continuable_ferror):
* eval.c (signal_ferror_with_frob):
* eval.c (maybe_signal_ferror_with_frob):
* eval.c (signal_continuable_ferror_with_frob):
* eval.c (maybe_signal_continuable_ferror_with_frob):
* eval.c (syntax_error):
* eval.c (syntax_error_2):
* eval.c (maybe_syntax_error):
* eval.c (sferror):
* eval.c (sferror_2):
* eval.c (maybe_sferror):
* eval.c (invalid_argument):
* eval.c (invalid_argument_2):
* eval.c (maybe_invalid_argument):
* eval.c (invalid_constant):
* eval.c (invalid_constant_2):
* eval.c (maybe_invalid_constant):
* eval.c (invalid_operation):
* eval.c (invalid_operation_2):
* eval.c (maybe_invalid_operation):
* eval.c (invalid_change):
* eval.c (invalid_change_2):
* eval.c (maybe_invalid_change):
* eval.c (invalid_state):
* eval.c (invalid_state_2):
* eval.c (maybe_invalid_state):
* eval.c (wtaerror):
* eval.c (stack_overflow):
* eval.c (out_of_memory):
* eval.c (print_multiple_value):
* eval.c (issue_call_trapping_problems_warning):
* eval.c (backtrace_specials):
* eval.c (backtrace_unevalled_args):
* eval.c (Fbacktrace):
* eval.c (warn_when_safe):
* event-Xt.c (modwarn):
* event-Xt.c (modbarf):
* event-Xt.c (check_modifier):
* event-Xt.c (store_modifier):
* event-Xt.c (emacs_Xt_format_magic_event):
* event-Xt.c (describe_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (store_modifier):
* event-gtk.c (gtk_reset_modifier_mapping):
* event-msw.c (dde_eval_string):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (FROB):
* event-msw.c (emacs_mswindows_format_magic_event):
* event-stream.c (external_debugging_print_event):
* event-stream.c (execute_help_form):
* event-stream.c (vars_of_event_stream):
* events.c (print_event_1):
* events.c (print_event):
* events.c (event_equal):
* extents.c (print_extent_1):
* extents.c (print_extent):
* extents.c (vars_of_extents):
* faces.c (print_face):
* faces.c (complex_vars_of_faces):
* file-coding.c:
* file-coding.c (print_coding_system):
* file-coding.c (print_coding_system_in_print_method):
* file-coding.c (default_query_method):
* file-coding.c (find_coding_system):
* file-coding.c (make_coding_system_1):
* file-coding.c (chain_print):
* file-coding.c (undecided_print):
* file-coding.c (gzip_print):
* file-coding.c (vars_of_file_coding):
* file-coding.c (complex_vars_of_file_coding):
* fileio.c:
* fileio.c (report_file_type_error):
* fileio.c (report_error_with_errno):
* fileio.c (report_file_error):
* fileio.c (barf_or_query_if_file_exists):
* fileio.c (vars_of_fileio):
* floatfns.c (matherr):
* fns.c (print_bit_vector):
* fns.c (Fmapconcat):
* fns.c (add_suffix_to_symbol):
* fns.c (add_prefix_to_symbol):
* frame-gtk.c:
* frame-gtk.c (Fgtk_window_id):
* frame-x.c (def):
* frame-x.c (x_cde_transfer_callback):
* frame.c:
* frame.c (Fmake_frame):
* gc.c (show_gc_cursor_and_message):
* gc.c (vars_of_gc):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (gtk_print_image_instance):
* glyphs-msw.c (mswindows_print_image_instance):
* glyphs-x.c (x_print_image_instance):
* glyphs-x.c (update_widget_face):
* glyphs.c (make_string_from_file):
* glyphs.c (print_image_instance):
* glyphs.c (signal_image_error):
* glyphs.c (signal_image_error_2):
* glyphs.c (signal_double_image_error):
* glyphs.c (signal_double_image_error_2):
* glyphs.c (xbm_mask_file_munging):
* glyphs.c (pixmap_to_lisp_data):
* glyphs.h:
* gui.c (gui_item_display_flush_left):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* intl-win32.c:
* intl-win32.c (langcode_to_lang):
* intl-win32.c (sublangcode_to_lang):
* intl-win32.c (Fmswindows_get_locale_info):
* intl-win32.c (lcid_to_locale_mule_or_no):
* intl-win32.c (mswindows_multibyte_to_unicode_print):
* intl-win32.c (complex_vars_of_intl_win32):
* keymap.c:
* keymap.c (print_keymap):
* keymap.c (ensure_meta_prefix_char_keymapp):
* keymap.c (Fkey_description):
* keymap.c (Ftext_char_description):
* lisp.h:
* lisp.h (struct):
* lisp.h (DECLARE_INLINE_HEADER):
* lread.c (Fload_internal):
* lread.c (locate_file):
* lread.c (read_escape):
* lread.c (read_raw_string):
* lread.c (read1):
* lread.c (read_list):
* lread.c (read_compiled_function):
* lread.c (init_lread):
* lrecord.h:
* marker.c (print_marker):
* marker.c (marker_equal):
* menubar-msw.c (displayable_menu_item):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar.c (vars_of_menubar):
* minibuf.c (reinit_complex_vars_of_minibuf):
* minibuf.c (complex_vars_of_minibuf):
* mule-charset.c (Fmake_charset):
* mule-charset.c (complex_vars_of_mule_charset):
* mule-coding.c (iso2022_print):
* mule-coding.c (fixed_width_query):
* number.c (bignum_print):
* number.c (ratio_print):
* number.c (bigfloat_print):
* number.c (bigfloat_finalize):
* objects-msw.c:
* objects-msw.c (mswindows_color_to_string):
* objects-msw.c (mswindows_color_list):
* objects-tty.c:
* objects-tty.c (tty_font_list):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c (xft_find_charset_font):
* objects-xlike-inc.c (endif):
* print.c:
* print.c (write_istring):
* print.c (write_ascstring):
* print.c (Fterpri):
* print.c (Fprint):
* print.c (print_error_message):
* print.c (print_vector_internal):
* print.c (print_cons):
* print.c (print_string):
* print.c (printing_unreadable_object):
* print.c (print_internal):
* print.c (print_float):
* print.c (print_symbol):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_canonicalize_host_name):
* process.c (print_process):
* process.c (report_process_error):
* process.c (report_network_error):
* process.c (make_process_internal):
* process.c (Fstart_process_internal):
* process.c (status_message):
* process.c (putenv_internal):
* process.c (vars_of_process):
* process.h:
* profile.c (vars_of_profile):
* rangetab.c (print_range_table):
* realpath.c (vars_of_realpath):
* redisplay.c (vars_of_redisplay):
* search.c (wordify):
* search.c (Freplace_match):
* sheap.c (sheap_adjust_h):
* sound.c (report_sound_error):
* sound.c (Fplay_sound_file):
* specifier.c (print_specifier):
* symbols.c (Fsubr_name):
* symbols.c (do_symval_forwarding):
* symbols.c (set_default_buffer_slot_variable):
* symbols.c (set_default_console_slot_variable):
* symbols.c (store_symval_forwarding):
* symbols.c (default_value):
* symbols.c (defsymbol_massage_name_1):
* symbols.c (defsymbol_massage_name_nodump):
* symbols.c (defsymbol_massage_name):
* symbols.c (defsymbol_massage_multiword_predicate_nodump):
* symbols.c (defsymbol_massage_multiword_predicate):
* symbols.c (defsymbol_nodump):
* symbols.c (defsymbol):
* symbols.c (defkeyword):
* symbols.c (defkeyword_massage_name):
* symbols.c (check_module_subr):
* symbols.c (deferror_1):
* symbols.c (deferror):
* symbols.c (deferror_massage_name):
* symbols.c (deferror_massage_name_and_message):
* symbols.c (defvar_magic):
* symeval.h:
* symeval.h (DEFVAR_SYMVAL_FWD):
* sysdep.c:
* sysdep.c (init_system_name):
* sysdll.c:
* sysdll.c (MAYBE_PREPEND_UNDERSCORE):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* sysdll.c (dll_close):
* sysdll.c (image_for_address):
* sysdll.c (my_find_image):
* sysdll.c (search_linked_libs):
* sysdll.h:
* sysfile.h:
* sysfile.h (DEFAULT_DIRECTORY_FALLBACK):
* syswindows.h:
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (Ftest_hash_tables):
* text.c (vars_of_text):
* text.h:
* tooltalk.c (tt_opnum_string):
* tooltalk.c (tt_message_arg_ival_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* tooltalk.c (vars_of_tooltalk):
* ui-gtk.c (Fdll_load):
* ui-gtk.c (type_to_marshaller_type):
* ui-gtk.c (Fgtk_import_function_internal):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* unicode.c (unicode_to_ichar):
* unicode.c (unicode_print):
* unicode.c (unicode_query):
* unicode.c (vars_of_unicode):
* unicode.c (complex_vars_of_unicode):
* win32.c:
* win32.c (mswindows_report_process_error):
* window.c (print_window):
* xemacs.def.in.in:
BASIC IDEA: Further fixing up uses of char * and CIbyte *
to reflect their actual semantics; Mule-izing some code;
redoing of the not-yet-working code to handle message translation.
Clean up code to handle message-translation (not yet working).
Create separate versions of build_msg_string() for working with
Ibyte *, CIbyte *, and Ascbyte * arguments. Assert that Ascbyte *
arguments are pure-ASCII. Make build_msg_string() be the same
as build_msg_ascstring(). Create same three versions of GETTEXT()
and DEFER_GETTEXT(). Also create build_defer_string() and
variants for the equivalent of DEFER_GETTEXT() when building a
string. Remove old CGETTEXT(). Clean up code where GETTEXT(),
DEFER_GETTEXT(), build_msg_string(), etc. was being called and
introduce some new calls to build_msg_string(), etc. Remove
GETTEXT() from calls to weird_doc() -- we assume that the
message snarfer knows about weird_doc(). Remove uses of
DEFER_GETTEXT() from error messages in sysdep.c and instead use
special comments /* @@@begin-snarf@@@ */ and /* @@@end-snarf@@@ */
that the message snarfer presumably knows about.
Create build_ascstring() and use it in many instances in place
of build_string(). The purpose of having Ascbyte * variants is
to make the code more self-documenting in terms of what sort of
semantics is expected for char * strings. In fact in the process
of looking for uses of build_string(), much improperly Mule-ized
was discovered.
Mule-ize a lot of code as described in previous paragraph,
e.g. in sysdep.c.
Make the error functions take Ascbyte * strings and fix up a
couple of places where non-pure-ASCII strings were being passed in
(file-coding.c, mule-coding.c, unicode.c). (It's debatable whether
we really need to make the error functions work this way. It
helps catch places where code is written in a way that message
translation won't work, but we may well never implement message
translation.)
Make staticpro() and friends take Ascbyte * strings instead of
raw char * strings. Create a const_Ascbyte_ptr dynarr type
to describe what's held by staticpro_names[] and friends,
create pdump descriptions for const_Ascbyte_ptr dynarrs, and
use them in place of specially-crafted staticpro descriptions.
Mule-ize certain other functions (e.g. x_event_name) by correcting
raw use of char * to Ascbyte *, Rawbyte * or another such type,
and raw use of char[] buffers to another type (usually Ascbyte[]).
Change many uses of write_c_string() to write_msg_string(),
write_ascstring(), etc.
Mule-ize emodules.c, emodules.h, sysdll.h.
Fix some un-Mule-ized code in intl-win32.c.
A comment in event-Xt.c and the limitations of the message
snarfer (make-msgfile or whatever) is presumably incorrect --
it should be smart enough to handle function calls spread over
more than one line. Clean up code in event-Xt.c that was
written awkwardly for this reason.
In config.h.in, instead of NEED_ERROR_CHECK_TYPES_INLINES,
create a more general XEMACS_DEFS_NEEDS_INLINE_DECLS to
indicate when inlined functions need to be declared in
xemacs.defs.in.in, and make use of it in xemacs.defs.in.in.
We need to do this because postgresql.c now calls qxestrdup(),
which is an inline function.
Make nconc2() and other such functions MODULE_API and put
them in xemacs.defs.in.in since postgresql.c now uses them.
Clean up indentation in lread.c and a few other places.
In text.h, document ASSERT_ASCTEXT_ASCII() and
ASSERT_ASCTEXT_ASCII_LEN(), group together the stand-in
encodings and add some more for DLL symbols, function and
variable names, etc.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Tue, 26 Jan 2010 23:22:30 -0600 |
| parents | 6e9bd19ec103 |
| children | 5502045ec510 |
| rev | line source |
|---|---|
| 428 | 1 ;;; objects.el --- Lisp interface to C window-system objects |
| 2 | |
| 3 ;; Copyright (C) 1994, 1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1995 Ben Wing | |
| 5 | |
| 6 ;; Author: Chuck Thompson <cthomp@xemacs.org> | |
| 7 ;; Author: Ben Wing <ben@xemacs.org> | |
| 8 ;; Maintainer: XEmacs Development Team | |
| 9 ;; Keywords: faces, internal, dumped | |
| 10 | |
| 11 ;; This file is part of XEmacs. | |
| 12 | |
| 13 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 14 ;; under the terms of the GNU General Public License as published by | |
| 15 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 16 ;; any later version. | |
| 17 | |
| 18 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 19 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 21 ;; General Public License for more details. | |
| 22 | |
| 23 ;; You should have received a copy of the GNU General Public License | |
| 24 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 25 ;; Free Software Foundation, 59 Temple Place - Suite 330, | |
| 26 ;; Boston, MA 02111-1307, USA. | |
| 27 | |
| 28 ;;; Synched up with: Not in FSF. | |
| 29 | |
| 30 ;;; Commentary: | |
| 31 | |
| 32 ;; This file is dumped with XEmacs. | |
| 33 | |
| 34 ;;; Code: | |
| 35 | |
| 36 (defun ws-object-property-1 (function object domain &optional matchspec) | |
| 37 (let ((instance (if matchspec | |
| 38 (specifier-matching-instance object matchspec domain) | |
| 39 (specifier-instance object domain)))) | |
| 40 (and instance (funcall function instance)))) | |
| 41 | |
| 42 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; font specifiers | |
| 43 | |
| 44 (defun make-font-specifier (spec-list) | |
| 45 "Return a new `font' specifier object with the given specification list. | |
| 46 SPEC-LIST can be a list of specifications (each of which is a cons of a | |
| 47 locale and a list of instantiators), a single instantiator, or a list | |
| 48 of instantiators. See `make-specifier' for more information about | |
| 442 | 49 specifiers. |
| 50 | |
| 51 Valid instantiators for font specifiers are: | |
| 52 | |
| 3111 | 53 -- a string naming a font; syntax is platform dependent. Some examples for |
| 54 a 14-point upright medium-weight Courier font: | |
| 55 X11 (and GTK1): \"-*-courier-medium-r-*-*-*-140-*-*-*-*-iso8859-*\" | |
| 56 Xft (and GTK2): \"Courier-14\" | |
| 57 MS-Windows: \"Courier:14:Western\" | |
| 442 | 58 -- a font instance (use that instance directly if the device matches, |
| 59 or use the string that generated it) | |
| 60 -- a vector of no elements (only on TTY's; this means to set no font | |
| 61 at all, thus using the \"natural\" font of the terminal's text) | |
| 62 -- a vector of one element (a face to inherit from) | |
| 63 " | |
| 428 | 64 (make-specifier-and-init 'font spec-list)) |
| 65 | |
| 66 (defun font-name (font &optional domain charset) | |
| 67 "Return the name of the FONT in the specified DOMAIN, if any. | |
| 68 FONT should be a font specifier object and DOMAIN is normally a window | |
| 69 and defaults to the selected window if omitted. This is equivalent | |
| 70 to using `specifier-instance' and applying `font-instance-name' to | |
| 71 the result. See `make-specifier' for more information about specifiers." | |
| 72 (ws-object-property-1 'font-instance-name font domain charset)) | |
| 73 | |
| 74 (defun font-ascent (font &optional domain charset) | |
| 75 "Return the ascent of the FONT in the specified DOMAIN, if any. | |
| 76 FONT should be a font specifier object and DOMAIN is normally a window | |
| 77 and defaults to the selected window if omitted. This is equivalent | |
| 78 to using `specifier-instance' and applying `font-instance-ascent' to | |
| 79 the result. See `make-specifier' for more information about specifiers." | |
| 80 (ws-object-property-1 'font-instance-ascent font domain charset)) | |
| 81 | |
| 82 (defun font-descent (font &optional domain charset) | |
| 83 "Return the descent of the FONT in the specified DOMAIN, if any. | |
| 84 FONT should be a font specifier object and DOMAIN is normally a window | |
| 85 and defaults to the selected window if omitted. This is equivalent | |
| 86 to using `specifier-instance' and applying `font-instance-descent' to | |
| 87 the result. See `make-specifier' for more information about specifiers." | |
| 88 (ws-object-property-1 'font-instance-descent font domain charset)) | |
| 89 | |
| 90 (defun font-width (font &optional domain charset) | |
| 91 "Return the width of the FONT in the specified DOMAIN, if any. | |
| 92 FONT should be a font specifier object and DOMAIN is normally a window | |
| 93 and defaults to the selected window if omitted. This is equivalent | |
| 94 to using `specifier-instance' and applying `font-instance-width' to | |
| 95 the result. See `make-specifier' for more information about specifiers." | |
| 96 (ws-object-property-1 'font-instance-width font domain charset)) | |
| 97 | |
| 98 (defun font-height (font &optional domain charset) | |
| 99 "Return the height of the FONT in the specified DOMAIN, if any. | |
| 100 FONT should be a font specifier object and DOMAIN is normally a window | |
| 101 and defaults to the selected window if omitted. This is equivalent | |
| 102 to using `specifier-instance' and applying `font-instance-height' to | |
| 103 the result. See `make-specifier' for more information about specifiers." | |
| 104 (ws-object-property-1 'font-instance-height font domain charset)) | |
| 105 | |
| 106 (defun font-proportional-p (font &optional domain charset) | |
| 107 "Return whether FONT is proportional in the specified DOMAIN, if known. | |
| 108 FONT should be a font specifier object and DOMAIN is normally a window | |
| 109 and defaults to the selected window if omitted. This is equivalent | |
| 110 to using `specifier-instance' and applying `font-instance-proportional-p' to | |
| 111 the result. See `make-specifier' for more information about specifiers." | |
| 112 (ws-object-property-1 'font-instance-proportional-p font domain charset)) | |
| 113 | |
| 114 (defun font-properties (font &optional domain charset) | |
| 115 "Return the properties of the FONT in the specified DOMAIN, if any. | |
| 116 FONT should be a font specifier object and DOMAIN is normally a window | |
| 117 and defaults to the selected window if omitted. This is equivalent | |
| 118 to using `specifier-instance' and applying `font-instance-properties' | |
| 119 to the result. See `make-specifier' for more information about specifiers." | |
| 120 (ws-object-property-1 'font-instance-properties font domain charset)) | |
| 121 | |
| 122 (defun font-truename (font &optional domain charset) | |
| 123 "Return the truename of the FONT in the specified DOMAIN, if any. | |
| 124 FONT should be a font specifier object and DOMAIN is normally a window | |
| 125 and defaults to the selected window if omitted. This is equivalent | |
| 126 to using `specifier-instance' and applying `font-instance-truename' | |
| 127 to the result. See `make-specifier' for more information about specifiers." | |
| 128 (ws-object-property-1 'font-instance-truename font domain charset)) | |
| 129 | |
| 130 (defun font-instance-height (font-instance) | |
| 131 "Return the height in pixels of FONT-INSTANCE. | |
| 132 The returned value is the maximum height for all characters in the font,\n\ | |
| 133 and is equivalent to the sum of the font instance's ascent and descent." | |
| 134 (+ (font-instance-ascent font-instance) | |
| 135 (font-instance-descent font-instance))) | |
| 136 | |
| 137 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; color specifiers | |
| 138 | |
| 139 (defun make-color-specifier (spec-list) | |
| 140 "Return a new `color' specifier object with the given specification list. | |
| 141 SPEC-LIST can be a list of specifications (each of which is a cons of a | |
| 142 locale and a list of instantiators), a single instantiator, or a list | |
| 143 of instantiators. See `make-specifier' for a detailed description of | |
| 442 | 144 how specifiers work. |
| 145 | |
| 146 Valid instantiators for color specifiers are: | |
| 147 | |
| 148 -- a string naming a color (e.g. under X this might be \"lightseagreen2\" | |
| 149 or \"#F534B2\") | |
| 150 -- a color instance (use that instance directly if the device matches, | |
| 151 or use the string that generated it) | |
| 152 -- a vector of no elements (only on TTY's; this means to set no color | |
| 153 at all, thus using the \"natural\" color of the terminal's text) | |
| 154 -- a vector of one or two elements: a face to inherit from, and | |
| 155 optionally a symbol naming which property of that face to inherit, | |
| 156 either `foreground' or `background' (if omitted, defaults to the same | |
| 157 property that this color specifier is used for; if this specifier is | |
| 158 not part of a face, the instantiator would not be valid)." | |
| 428 | 159 (make-specifier-and-init 'color spec-list)) |
| 160 | |
| 161 (defun color-name (color &optional domain) | |
| 162 "Return the name of the COLOR in the specified DOMAIN, if any. | |
| 163 COLOR should be a color specifier object and DOMAIN is normally a window | |
| 164 and defaults to the selected window if omitted. This is equivalent | |
| 165 to using `specifier-instance' and applying `color-instance-name' to | |
| 166 the result. See `make-specifier' for more information about specifiers." | |
| 167 (ws-object-property-1 'color-instance-name color domain)) | |
| 168 | |
| 169 (defun color-rgb-components (color &optional domain) | |
| 170 "Return the RGB components of the COLOR in the specified DOMAIN, if any. | |
| 171 COLOR should be a color specifier object and DOMAIN is normally a window | |
| 172 and defaults to the selected window if omitted. This is equivalent | |
| 173 to using `specifier-instance' and applying `color-instance-rgb-components' | |
| 174 to the result. See `make-specifier' for more information about specifiers." | |
| 175 (ws-object-property-1 'color-instance-rgb-components color domain)) | |
| 176 | |
| 442 | 177 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; face-boolean specifiers |
| 178 | |
| 179 (defun make-face-boolean-specifier (spec-list) | |
| 180 "Return a new `face-boolean' specifier object with the given spec list. | |
| 181 SPEC-LIST can be a list of specifications (each of which is a cons of a | |
| 182 locale and a list of instantiators), a single instantiator, or a list | |
| 183 of instantiators. See `make-specifier' for a detailed description of | |
| 184 how specifiers work. | |
| 185 | |
| 186 Valid instantiators for face-boolean specifiers are | |
| 187 | |
| 188 -- t or nil | |
| 4201 | 189 -- a vector of one, two or three elements: a face to inherit from, |
| 442 | 190 optionally a symbol naming the property of that face to inherit from |
| 191 (if omitted, defaults to the same property that this face-boolean | |
| 192 specifier is used for; if this specifier is not part of a face, | |
| 193 the instantiator would not be valid), and optionally a value which, | |
| 194 if non-nil, means to invert the sense of the inherited property." | |
| 4201 | 195 (make-specifier-and-init 'face-boolean spec-list)) |
| 442 | 196 |
| 428 | 197 ;;; objects.el ends here. |