Mercurial > hg > xemacs-beta
view lisp/gtk-faces.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 | 79c6ff3eef26 |
| children | 7d06a8bf47d2 |
line wrap: on
line source
;;; gtk-faces.el --- GTK-specific face frobnication, aka black magic. ;; Copyright (C) 1992-4, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996 Ben Wing. ;; Copyright (c) 2000 William Perry ;; Author: William M. Perry <wmperry@gnu.org> ;; Maintainer: XEmacs Development Team ;; Keywords: extensions, internal, dumped ;; 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 synched. ;;; Commentary: ;; This file is dumped with XEmacs (when GTK support is compiled in). (globally-declare-fboundp '(gtk-init-pointers gtk-font-selection-dialog-new gtk-widget-set-sensitive gtk-font-selection-dialog-apply-button gtk-signal-connect gtk-main-quit gtk-font-selection-dialog-ok-button gtk-font-selection-dialog-get-font-name gtk-widget-destroy font-menu-set-font font-family font-size gtk-font-selection-dialog-cancel-button gtk-widget-show-all gtk-main gtk-style-info)) (eval-when-compile (defmacro gtk-style-munge-face (face attribute value) (let ((func (intern (format "face-%s" (eval attribute))))) `(add-spec-to-specifier (,func ,face) ,value nil '(gtk default) 'prepend)))) ;;; gtk-init-device-faces is responsible for initializing default ;;; values for faces on a newly created device. ;;; (defun gtk-init-device-faces (device) ;; ;; If the "default" face didn't have a font specified, try to pick one. ;; (when (eq (device-type device) 'gtk) (let* ((style (gtk-style-info device)) (normal 0) ; GTK_STATE_NORMAL ;;(active 1) ; GTK_STATE_ACTIVE (prelight 2) ; GTK_STATE_PRELIGHT (selected 3) ; GTK_STATE_SELECTED ;;(insensitive 4) ; GTK_STATE_INSENSITIVE ) (gtk-style-munge-face 'highlight 'foreground (nth prelight (plist-get style 'text))) (gtk-style-munge-face 'highlight 'background (nth prelight (plist-get style 'background))) (gtk-style-munge-face 'zmacs-region 'foreground (nth selected (plist-get style 'text))) (gtk-style-munge-face 'zmacs-region 'background (nth selected (plist-get style 'background))) (gtk-style-munge-face 'toolbar 'background (nth normal (plist-get style 'base))) (gtk-style-munge-face 'toolbar 'foreground (nth normal (plist-get style 'text))) (set-face-background 'modeline [toolbar background] '(gtk default)) (set-face-foreground 'modeline [toolbar foreground] '(gtk default)) ) (gtk-init-pointers))) ;;; This is called from `init-frame-faces', which is called from ;;; init_frame_faces() which is called from Fmake_frame(), to perform ;;; any device-specific initialization. ;;; (defun gtk-init-frame-faces (frame) ) (defun gtk-init-global-faces () ) ;;; Lots of this stolen from x-faces.el - I'm not sure if this will ;;; require a rewrite for win32 or not? (defconst gtk-font-regexp nil) (defconst gtk-font-regexp-head nil) (defconst gtk-font-regexp-head-2 nil) (defconst gtk-font-regexp-weight nil) (defconst gtk-font-regexp-slant nil) (defconst gtk-font-regexp-pixel nil) (defconst gtk-font-regexp-point nil) (defconst gtk-font-regexp-foundry-and-family nil) (defconst gtk-font-regexp-registry-and-encoding nil) (defconst gtk-font-regexp-spacing nil) ;;; Regexps matching font names in "Host Portable Character Representation." ;;; (let ((- "[-?]") (foundry "[^-]*") (family "[^-]*") (weight "\\(bold\\|demibold\\|medium\\|black\\)") ; 1 ; (weight\? "\\(\\*\\|bold\\|demibold\\|medium\\|\\)") ; 1 (weight\? "\\([^-]*\\)") ; 1 (slant "\\([ior]\\)") ; 2 ; (slant\? "\\([ior?*]?\\)") ; 2 (slant\? "\\([^-]?\\)") ; 2 ; (swidth "\\(\\*\\|normal\\|semicondensed\\|\\)") ; 3 (swidth "\\([^-]*\\)") ; 3 ; (adstyle "\\(\\*\\|sans\\|\\)") ; 4 (adstyle "\\([^-]*\\)") ; 4 (pixelsize "\\(\\*\\|[0-9]+\\)") ; 5 (pointsize "\\(\\*\\|0\\|[0-9][0-9]+\\)") ; 6 ; (resx "\\(\\*\\|[0-9][0-9]+\\)") ; 7 ; (resy "\\(\\*\\|[0-9][0-9]+\\)") ; 8 (resx "\\([*0]\\|[0-9][0-9]+\\)") ; 7 (resy "\\([*0]\\|[0-9][0-9]+\\)") ; 8 (spacing "[cmp?*]") (avgwidth "\\(\\*\\|[0-9]+\\)") ; 9 (registry "[^-]*") ; some fonts have omitted registries ; (encoding ".+") ; note that encoding may contain "-"... (encoding "[^-]+") ; false! ) (setq gtk-font-regexp (purecopy (concat "\\`\\*?[-?*]" foundry - family - weight\? - slant\? - swidth - adstyle - pixelsize - pointsize - resx - resy - spacing - avgwidth - registry - encoding "\\'" ))) (setq gtk-font-regexp-head (purecopy (concat "\\`[-?*]" foundry - family - weight\? - slant\? "\\([-*?]\\|\\'\\)"))) (setq gtk-font-regexp-head-2 (purecopy (concat "\\`[-?*]" foundry - family - weight\? - slant\? - swidth - adstyle - pixelsize - pointsize "\\([-*?]\\|\\'\\)"))) (setq gtk-font-regexp-slant (purecopy (concat - slant -))) (setq gtk-font-regexp-weight (purecopy (concat - weight -))) ;; if we can't match any of the more specific regexps (unfortunate) then ;; look for digits; assume 2+ digits is 10ths of points, and 1-2 digits ;; is pixels. Bogus as hell. (setq gtk-font-regexp-pixel (purecopy "[-?*]\\([0-9][0-9]?\\)[-?*]")) (setq gtk-font-regexp-point (purecopy "[-?*]\\([0-9][0-9]+\\)[-?*]")) ;; the following two are used by x-font-menu.el. (setq gtk-font-regexp-foundry-and-family (purecopy (concat "\\`[-?*]" foundry - "\\(" family "\\)" -))) (setq gtk-font-regexp-registry-and-encoding (purecopy (concat - "\\(" registry "\\)" - "\\(" encoding "\\)\\'"))) (setq gtk-font-regexp-spacing (purecopy (concat - "\\(" spacing "\\)" - avgwidth - registry - encoding "\\'"))) ) (defvaralias 'x-font-regexp 'gtk-font-regexp) (defvaralias 'x-font-regexp-head 'gtk-font-regexp-head) (defvaralias 'x-font-regexp-head-2 'gtk-font-regexp-head-2) (defvaralias 'x-font-regexp-weight 'gtk-font-regexp-weight) (defvaralias 'x-font-regexp-slant 'gtk-font-regexp-slant) (defvaralias 'x-font-regexp-pixel 'gtk-font-regexp-pixel) (defvaralias 'x-font-regexp-point 'gtk-font-regexp-point) (defvaralias 'x-font-regexp-foundry-and-family 'gtk-font-regexp-foundry-and-family) (defvaralias 'x-font-regexp-registry-and-encoding 'gtk-font-regexp-registry-and-encoding) (defvaralias 'x-font-regexp-spacing 'gtk-font-regexp-spacing) (defun gtk-frob-font-weight (font which) (if (font-instance-p font) (setq font (font-instance-name font))) (cond ((null font) nil) ((or (string-match gtk-font-regexp font) (string-match gtk-font-regexp-head font) (string-match gtk-font-regexp-weight font)) (concat (substring font 0 (match-beginning 1)) which (substring font (match-end 1)))) (t nil))) (defun gtk-frob-font-slant (font which) (if (font-instance-p font) (setq font (font-instance-name font))) (cond ((null font) nil) ((or (string-match gtk-font-regexp font) (string-match gtk-font-regexp-head font)) (concat (substring font 0 (match-beginning 2)) which (substring font (match-end 2)))) ((string-match gtk-font-regexp-slant font) (concat (substring font 0 (match-beginning 1)) which (substring font (match-end 1)))) (t nil))) (defun gtk-make-font-bold (font &optional device) (or (try-font-name (gtk-frob-font-weight font "bold") device) (try-font-name (gtk-frob-font-weight font "black") device) (try-font-name (gtk-frob-font-weight font "demibold") device))) (defun gtk-make-font-unbold (font &optional device) (try-font-name (gtk-frob-font-weight font "medium") device)) (defcustom try-oblique-before-italic-fonts t "*If nil, italic fonts are searched before oblique fonts. If non-nil, oblique fonts are tried before italic fonts. This is mostly applicable to adobe-courier fonts" :type 'boolean :tag "Try Oblique Before Italic Fonts" :group 'x) (define-obsolete-variable-alias '*try-oblique-before-italic-fonts* 'try-oblique-before-italic-fonts) (defun gtk-make-font-italic (font &optional device) (if try-oblique-before-italic-fonts (or (try-font-name (gtk-frob-font-slant font "o") device) (try-font-name (gtk-frob-font-slant font "i") device)) (or (try-font-name (gtk-frob-font-slant font "i") device) (try-font-name (gtk-frob-font-slant font "o") device)))) (defun gtk-make-font-unitalic (font &optional device) (try-font-name (gtk-frob-font-slant font "r") device)) (defun gtk-make-font-bold-italic (font &optional device) (if try-oblique-before-italic-fonts (or (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "bold") "o") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "bold") "i") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "black") "o") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "black") "i") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "demibold") "o") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "demibold") "i") device)) (or (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "bold") "i") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "bold") "o") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "black") "i") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "black") "o") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "demibold") "i") device) (try-font-name (gtk-frob-font-slant (gtk-frob-font-weight font "demibold") "o") device)))) (defun gtk-choose-font () (interactive) (require 'x-font-menu) (require 'font) (let ((locale (if font-menu-this-frame-only-p (selected-frame) nil)) (dialog nil)) (setq dialog (gtk-font-selection-dialog-new "Choose default font...")) (put dialog 'modal t) (put dialog 'type 'dialog) (gtk-widget-set-sensitive (gtk-font-selection-dialog-apply-button dialog) nil) (gtk-signal-connect dialog 'destroy (lambda (&rest ignored) (gtk-main-quit))) (gtk-signal-connect (gtk-font-selection-dialog-ok-button dialog) 'clicked (lambda (button data) (let* ((dialog (car data)) (font (font-create-object (gtk-font-selection-dialog-get-font-name dialog)))) (gtk-widget-destroy dialog) (font-menu-set-font (car (font-family font)) nil (* 10 (font-size font))))) (cons dialog locale)) (gtk-signal-connect (gtk-font-selection-dialog-cancel-button dialog) 'clicked (lambda (button dialog) (gtk-widget-destroy dialog)) dialog) (gtk-widget-show-all dialog) (gtk-main)))