Mercurial > hg > xemacs-beta
view lisp/font-mgr.el @ 4677:8f1ee2d15784
Support full Common Lisp multiple values in C.
lisp/ChangeLog
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el :
Update this file to support full C-level multiple values. This
involves:
-- Four new bytecodes, and special compiler functions to compile
multiple-value-call, multiple-value-list-internal, values,
values-list, and, since it now needs to pass back multiple values
and is a special form, throw.
-- There's a new compiler variable, byte-compile-checks-on-load,
which is a list of forms that are evaluated at the very start of a
file, with an error thrown if any of them give nil.
-- The header is now inserted *after* compilation, giving a chance
for the compilation process to influence what those checks
are. There is still a check done before compilation for non-ASCII
characters, to try to turn off dynamic docstrings if appopriate,
in `byte-compile-maybe-reset-coding'.
Space is reserved for checks; comments describing the version of
the byte compiler generating the file are inserted if space
remains for them.
* bytecomp.el (byte-compile-version):
Update this, we're a newer version of the byte compiler.
* byte-optimize.el (byte-optimize-funcall):
Correct a comment.
* bytecomp.el (byte-compile-lapcode):
Discard the arg with byte-multiple-value-call.
* bytecomp.el (byte-compile-checks-and-comments-space):
New variable, describe how many octets to reserve for checks at
the start of byte-compiled files.
* cl-compat.el:
Remove the fake multiple-value implementation. Have the functions
that use it use the real multiple-value implementation instead.
* cl-macs.el (cl-block-wrapper, cl-block-throw):
Revise the byte-compile properties of these symbols to work now
we've made throw into a special form; keep the byte-compile
properties as anonymous lambdas, since we don't have docstrings
for them.
* cl-macs.el (multiple-value-bind, multiple-value-setq)
(multiple-value-list, nth-value):
Update these functions to work with the C support for multiple
values.
* cl-macs.el (values):
Modify the setf handler for this to call
#'multiple-value-list-internal appropriately.
* cl-macs.el (cl-setf-do-store):
If the store form is a cons, treat it specially as wrapping the
store value.
* cl.el (cl-block-wrapper):
Make this an alias of #'and, not #'identity, since it needs to
pass back multiple values.
* cl.el (multiple-value-apply):
We no longer support this, mark it obsolete.
* lisp-mode.el (eval-interactive-verbose):
Remove a useless space in the docstring.
* lisp-mode.el (eval-interactive):
Update this function and its docstring. It now passes back a list,
basically wrapping any eval calls with multiple-value-list. This
allows multiple values to be printed by default in *scratch*.
* lisp-mode.el (prin1-list-as-multiple-values):
New function, printing a list as multiple values in the manner of
Bruno Haible's clisp, separating each entry with " ;\n".
* lisp-mode.el (eval-last-sexp):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* lisp-mode.el (eval-defun):
Call #'prin1-list-as-multiple-values on the return value of
#'eval-interactive.
* mouse.el (mouse-eval-sexp):
Deal with lists corresponding to multiple values from
#'eval-interactive. Call #'cl-prettyprint, which is always
available, instead of sometimes calling #'pprint and sometimes
falling back to prin1.
* obsolete.el (obsolete-throw):
New function, called from eval.c when #'funcall encounters an
attempt to call #'throw (now a special form) as a function. Only
needed for compatibility with 21.4 byte-code.
man/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* cl.texi (Organization):
Remove references to the obsolete multiple-value emulating code.
src/ChangeLog addition:
2009-08-11 Aidan Kehoe <kehoea@parhasard.net>
* bytecode.c (enum Opcode /* Byte codes */):
Add four new bytecodes, to deal with multiple values.
(POP_WITH_MULTIPLE_VALUES): New macro.
(POP): Modify this macro to ignore multiple values.
(DISCARD_PRESERVING_MULTIPLE_VALUES): New macro.
(DISCARD): Modify this macro to ignore multiple values.
(TOP_WITH_MULTIPLE_VALUES): New macro.
(TOP_ADDRESS): New macro.
(TOP): Modify this macro to ignore multiple values.
(TOP_LVALUE): New macro.
(Bcall): Ignore multiple values where appropriate.
(Breturn): Pass back multiple values.
(Bdup): Preserve multiple values.
Use TOP_LVALUE with most bytecodes that assign anything to
anything.
(Bbind_multiple_value_limits, Bmultiple_value_call,
Bmultiple_value_list_internal, Bthrow): Implement the new
bytecodes.
(Bgotoifnilelsepop, Bgotoifnonnilelsepop, BRgotoifnilelsepop,
BRgotoifnonnilelsepop):
Discard any multiple values.
* callint.c (Fcall_interactively):
Ignore multiple values when calling #'eval, in two places.
* device-x.c (x_IO_error_handler):
* macros.c (pop_kbd_macro_event):
* eval.c (Fsignal):
* eval.c (flagged_a_squirmer):
Call throw_or_bomb_out, not Fthrow, now that the latter is a
special form.
* eval.c:
Make Qthrow, Qobsolete_throw available as symbols.
Provide multiple_value_current_limit, multiple-values-limit (the
latter as specified by Common Lisp.
* eval.c (For):
Ignore multiple values when comparing with Qnil, but pass any
multiple values back for the last arg.
* eval.c (Fand):
Ditto.
* eval.c (Fif):
Ignore multiple values when examining the result of the
condition.
* eval.c (Fcond):
Ignore multiple values when comparing what the clauses give, but
pass them back if a clause gave non-nil.
* eval.c (Fprog2):
Never pass back multiple values.
* eval.c (FletX, Flet):
Ignore multiple when evaluating what exactly symbols should be
bound to.
* eval.c (Fwhile):
Ignore multiple values when evaluating the test.
* eval.c (Fsetq, Fdefvar, Fdefconst):
Ignore multiple values.
* eval.c (Fthrow):
Declare this as a special form; ignore multiple values for TAG,
preserve them for VALUE.
* eval.c (throw_or_bomb_out):
Make this available to other files, now Fthrow is a special form.
* eval.c (Feval):
Ignore multiple values when calling a compiled function, a
non-special-form subr, or a lambda expression.
* eval.c (Ffuncall):
If we attempt to call #'throw (now a special form) as a function,
don't error, call #'obsolete-throw instead.
* eval.c (make_multiple_value, multiple_value_aset)
(multiple_value_aref, print_multiple_value, mark_multiple_value)
(size_multiple_value):
Implement the multiple_value type. Add a long comment describing
our implementation.
* eval.c (bind_multiple_value_limits):
New function, used by the bytecode and by #'multiple-value-call,
#'multiple-value-list-internal.
* eval.c (multiple_value_call):
New function, used by the bytecode and #'multiple-value-call.
* eval.c (Fmultiple_value_call):
New special form.
* eval.c (multiple_value_list_internal):
New function, used by the byte code and
#'multiple-value-list-internal.
* eval.c (Fmultiple_value_list_internal, Fmultiple_value_prog1):
New special forms.
* eval.c (Fvalues, Fvalues_list):
New Lisp functions.
* eval.c (values2):
New function, for C code returning multiple values.
* eval.c (syms_of_eval):
Make our new Lisp functions and symbols available.
* eval.c (multiple-values-limit):
Make this available to Lisp.
* event-msw.c (dde_eval_string):
* event-stream.c (execute_help_form):
* glade.c (connector):
* glyphs-widget.c (glyph_instantiator_to_glyph):
* glyphs.c (evaluate_xpm_color_symbols):
* gui-x.c (wv_set_evalable_slot, button_item_to_widget_value):
* gui.c (gui_item_value, gui_item_display_flush_left):
* lread.c (check_if_suppressed):
* menubar-gtk.c (menu_convert, menu_descriptor_to_widget_1):
* menubar-msw.c (populate_menu_add_item):
* print.c (Fwith_output_to_temp_buffer):
* symbols.c (Fsetq_default):
Ignore multiple values when calling Feval.
* symeval.h:
Add the header declarations necessary for the multiple-values
implementation.
* inline.c:
#include symeval.h, now that it has some inline functions.
* lisp.h:
Update Fthrow's declaration. Make throw_or_bomb_out available to
all files.
* lrecord.h (enum lrecord_type):
Add the multiple_value type here.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 16 Aug 2009 20:55:49 +0100 |
| parents | 316fddbf58e2 |
| children | 91b3aa59f49b |
line wrap: on
line source
;;; font-mgr.el --- Lisp emulation of fontconfig for X fonts. ;; Copyright (C) 2006 Free Software Foundation, Inc. ;; Author: Stephen J. Turnbull <stephen@xemacs.org> ;; Created: 12 Apr 2006 by Stephen J. Turnbull ;; 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 GNU Emacs. ;; Commentary ;; This module provides the Lisp interface to fonts in X11, including Xft, ;; but (at least at first) not GTK+ or Qt. It is a substitute for the ;; C library fontconfig, whose interface is provided in ../src/font-mgr.c. ;; static FcChar8 *fc_standard_properties[] = { ;; "antialias", "aspect", "autohint", "charset", "dpi", "family", "file", ;; "foundry", "ftface", "globaladvance", "hinting", "index", "lang", ;; "minspace", "outline", "pixelsize", "rasterizer", "rgba", "scalable", ;; "scale", "size", "slant", "spacing", "style", "verticallayout", "weight", ;; /* obsolete after Xft v. 1 */ ;; "charwidth", "charheight", "core", "encoding", "render" ;; #### should we wrap the world in `(unless (featurep 'font-mgr) ... )'? (provide 'font-mgr) (defvar xft-xlfd-font-regexp (concat ;; XLFD specifies ISO 8859-1 encoding, but we can't handle non-ASCII ;; in Mule when this function is called. So use HPC. ;; (xe_xlfd_prefix "\\(\\+[\040-\176\240-\377]*\\)?-") ;; (xe_xlfd_opt_text "\\([\040-\044\046-\176\240-\377]*\\)") ;; (xe_xlfd_text "\\([\040-\044\046-\176\240-\377]+\\)") "\\`" "\\(\\+[\040-\176]*\\)?-" ; prefix "\\([^-]+\\)" ; foundry "-" "\\([^-]+\\)" ; family "-" "\\([^-]+\\)" ; weight "-" "\\([0-9ior?*][iot]?\\)" ; slant "-" "\\([^-]+\\)" ; swidth "-" "\\([^-]*\\)" ; adstyle "-" "\\([0-9?*]+\\|\\[[ 0-9+~.e?*]+\\]\\)" ; pixelsize "-" "\\([0-9?*]+\\|\\[[ 0-9+~.e?*]+\\]\\)" ; pointsize "-" "\\([0-9?*]+\\)" ; resx "-" "\\([0-9?*]+\\)" ; resy "-" "\\([cmp?*]\\)" ; spacing "-" "~?" ; avgwidth "\\([0-9?*]+\\)" "-" "\\([^-]+\\)" ; registry "-" "\\([^-]+\\)" ; encoding "\\'") "The regular expression used to match XLFD font names.") (defun fc-pattern-p (object) "Returns t if OBJECT is of type fc-pattern, nil otherwise." (error 'unimplemented "font-mgr library is experimental and incomplete")) (defun fc-pattern-create () "Return a new, empty fc-pattern object." (error 'unimplemented "font-mgr library is experimental and incomplete")) (defun fc-name-parse (fontname) "Parse an Fc font name and return its representation as a fc pattern object." (error 'unimplemented "font-mgr library is experimental and incomplete")) (defun fc-name-unparse (pattern) "Unparse an fc pattern object to a string." (error 'unimplemented "font-mgr library is experimental and incomplete")) (defun fc-pattern-duplicate (pattern) "Make a copy of the fc pattern object PATTERN and return it." (error 'unimplemented "font-mgr library is experimental and incomplete")) (defun fc-pattern-add (pattern property value) "Add attributes to the pattern object PATTERN. PROPERTY is a string naming the attribute to add, VALUE the value for this attribute. VALUE may be a string, integer, float, or symbol, in which case the value will be added as an FcChar8[], int, double, or FcBool respectively." (error 'unimplemented "font-mgr library is experimental and incomplete")) (defun fc-pattern-del (pattern property) "Remove attribute PROPERTY from fc pattern object PATTERN." (error 'unimplemented "font-mgr library is experimental and incomplete")) ;; Generic interface to FcPatternGet() ;; Don't support the losing symbol-for-property interface. (defun fc-pattern-get (pattern property &optional id type) "From PATTERN, extract PROPERTY for the ID'th member, of type TYPE. PATTERN is an Xft \(fontconfig) pattern object. PROPERTY is a string naming an fontconfig font property. Optional ID is a nonnegative integer indexing the list of values for PROPERTY stored in PATTERN, defaulting to 0 (the first value). Optional TYPE is a symbol, one of 'string, 'boolean, 'integer, 'float, 'double, 'matrix, 'charset, or 'void, corresponding to the FcValue types. \('float is an alias for 'double). The Lisp types returned will conform to TYPE: string string boolean `t' or `nil' integer integer double \(float) float matrix not implemented charset not implemented void not implemented Symbols with names of the form \"fc-result-DESCRIPTION\" are returned when the desired value is not available. These are fc-result-type-mismatch the value found has an unexpected type fc-result-no-match there is no such attribute fc-result-no-id there is no value for the requested ID The types of the following standard properties are predefined by fontconfig. The symbol 'fc-result-type-mismatch will be returned if the object exists but TYPE does not match the predefined type. It is best not to specify a type for predefined properties, as a mistake here ensures error returns on the correct type. Each standard property has a convenience accessor defined in fontconfig.el, named in the form \"fc-pattern-get-PROPERTY\". The convenience functions are preferred to `fc-pattern-get' since a typo in the string naming a property will result in a silent null return, while a typo in a function name will usually result in a compiler or runtime \"not fboundp\" error. You may use `defsubst' to define convenience functions for non-standard properties. family String Font family name style String Font style. Overrides weight and slant slant Int Italic, oblique or roman weight Int Light, medium, demibold, bold or black size Double Point size aspect Double Stretches glyphs horizontally before hinting pixelsize Double Pixel size spacing Int Proportional, monospace or charcell foundry String Font foundry name antialias Bool Whether glyphs can be antialiased hinting Bool Whether the rasterizer should use hinting verticallayout Bool Use vertical layout autohint Bool Use autohinter instead of normal hinter globaladvance Bool Use font global advance data file String The filename holding the font index Int The index of the font within the file ftface FT_Face Use the specified FreeType face object rasterizer String Which rasterizer is in use outline Bool Whether the glyphs are outlines scalable Bool Whether glyphs can be scaled scale Double Scale factor for point->pixel conversions dpi Double Target dots per inch rgba Int unknown, rgb, bgr, vrgb, vbgr, none - subpixel geometry minspace Bool Eliminate leading from line spacing charset CharSet Unicode chars encoded by the font lang String List of RFC-3066-style languages this font supports The FT_Face, Matrix, CharSet types are unimplemented, so the corresponding properties are not accessible from Lisp at this time. If the value of a property returned has type FT_Face, FcCharSet, or FcMatrix, `fc-result-type-mismatch' is returned. The following properties which were standard in Xft v.1 are obsolete in Xft v.2: encoding, charwidth, charheight, core, and render." (error 'unimplemented "font-mgr library is experimental and incomplete")) (defun fc-font-match (device pattern) "Return the font on DEVICE that most closely matches PATTERN. DEVICE is an X11 device. PATTERN is a fontconfig pattern object. Returns a fontconfig pattern object representing the closest match to the given pattern, or an error code. Possible error codes are `fc-result-no-match' and `fc-result-no-id'." (error 'unimplemented "font-mgr library is experimental and incomplete")) ;; #### fix this name to correspond to Ben's new nomenclature (defun fc-list-fonts-pattern-objects (device pattern properties) "Return a list of fonts on DEVICE that match PATTERN for PROPERTIES. Each font is represented by a fontconfig pattern object. DEVICE is an X11 device. PATTERN is a fontconfig pattern to be matched. PROPERTIES is a list of property names (strings) that should match. #### DEVICE is unused, ignored, and may be removed if it's not needed to match other font-listing APIs." (error 'unimplemented "font-mgr library is experimental and incomplete")) ;; #### maybe this can/should be folded into fc-list-fonts-pattern-objects? (defun fc-font-sort (device pattern &optional trim nosub) "Return a list of all fonts sorted by proximity to PATTERN. Each font is represented by a fontconfig pattern object. DEVICE is an X11 device. PATTERN is a fontconfig pattern to be matched. Optional argument TRIM, if non-nil, means to trim trailing fonts that do not contribute new characters to the union repertoire. #### Optional argument NOSUB, if non-nil, suppresses some of the usual property substitutions. DON'T USE THIS in production code, it is intended for exploring behavior of fontconfig and will be removed when this code is stable. #### DEVICE is unused, ignored, and may be removed if it's not needed to match other font-listing APIs." (error 'unimplemented "font-mgr library is experimental and incomplete")) (defun xlfd-font-name-p (fontname) "Check whether the string FONTNAME is a XLFD font name." (save-match-data (string-match xft-xlfd-font-regexp fontname))) ;; FcPatternPrint: there is no point in having wrappers fc-pattern-print, ;; Ffc_pattern_print since this function prints to stdout. ;;; end font-mgr.el