Mercurial > hg > xemacs-beta
view lisp/cus-face.el @ 617:af57a77cbc92
[xemacs-hg @ 2001-06-18 07:09:50 by ben]
---------------------------------------------------------------
DOCUMENTATION FIXES:
---------------------------------------------------------------
eval.c: Correct documentation.
elhash.c: Doc correction.
---------------------------------------------------------------
LISP OBJECT CLEANUP:
---------------------------------------------------------------
bytecode.h, buffer.h, casetab.h, chartab.h, console-msw.h, console.h, database.c, device.h, eldap.h, elhash.h, events.h, extents.h, faces.h, file-coding.h, frame.h, glyphs.h, gui-x.h, gui.h, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lrecord.h, lstream.h, mule-charset.h, objects.h, opaque.h, postgresql.h, process.h, rangetab.h, specifier.h, toolbar.h, tooltalk.h, ui-gtk.h: Add wrap_* to all objects (it was already there for a few of them)
-- an expression to encapsulate a pointer into a Lisp object,
rather than the inconvenient XSET*. "wrap" was chosen because
"make" as in make_int(), make_char() is not appropriate. (It
implies allocation. The issue does not exist for ints and chars
because they are not allocated.)
Full error checking has been added to these expressions. When
used without error checking, non-union build, use of these
expressions will incur no loss of efficiency. (In fact, XSET* is
now defined in terms of wrap_* in a non-union build.) In a union
build, you will also get no loss of efficiency provided that you
have a decent optimizing compiler, and a compiler that either
understands inlines or automatically inlines those particular
functions. (And since people don't normally do their production
builds on union, it doesn't matter.)
Update the sample Lisp object definition in lrecord.h accordingly.
dumper.c: Fix places in dumper that referenced wrap_object to reference
its new name, wrap_pointer_1.
buffer.c, bufslots.h, conslots.h, console.c, console.h, devslots.h, device.c, device.h, frame.c, frame.h, frameslots.h, window.c, window.h, winslots.h: -- Extract out the Lisp objects of `struct device' into devslots.h,
just like for the other structures.
-- Extract out the remaining (not copied into the window config)
Lisp objects in `struct window' into winslots.h; use different
macros (WINDOW_SLOT vs. WINDOW_SAVED_SLOT) to differentiate them.
-- Eliminate the `dead' flag of `struct frame', since it
duplicates information already available in `framemeths', and fix
FRAME_LIVE_P accordingly. (Devices and consoles already work this
way.)
-- In *slots.h, switch to system where MARKED_SLOT is automatically
undef'd at the end of the file. (Follows what winslots.h already
does.)
-- Update the comments at the beginning of *slots.h to be accurate.
-- When making any of the above objects dead, zero it out entirely
and reset all Lisp object slots to Qnil. (We were already doing
this somewhat, but not consistently.) This (1) Eliminates the
possibility of extra objects hanging around that ought to be
GC'd, (2) Causes an immediate crash if anyone tries to access a
structure in one of these objects, (3) Ensures consistent behavior
wrt dead objects.
dialog-msw.c: Use internal_object_printer, since this object should not escape.
---------------------------------------------------------------
FIXING A CRASH THAT I HIT ONCE (AND A RELATED BAD BEHAVIOR):
---------------------------------------------------------------
eval.c: Fix up some comments about the FSF implementation.
Fix two nasty bugs:
(1) condition_case_unwind frees the conses sitting in the
catch->tag slot too quickly, resulting in a crash that I hit.
(2) catches need to be unwound one at a time when calling
unwind-protect code, rather than all at once at the end; otherwise,
incorrect behavior can result. (A comment shows exactly how.)
backtrace.h: Improve comment about FSF differences in the handler stack.
---------------------------------------------------------------
FIXING A CRASH THAT I REPEATEDLY HIT WHEN USING THE MOUSE WHEEL
UNDER MSWINDOWS:
---------------------------------------------------------------
Basic idea: My crash is due either to a dead, non-marked,
GC-collected frame inside of a window mirror, or a prematurely
freed window mirror. We need to mark the Lisp objects inside of
window mirrors. Tracking the lifespan of window mirrors and
scrollbar instances is extremely hard, and there may well be
lurking bugs where such objects are freed too soon. The only safe
way to fix these problems (and it fixes both problems at once) is
to make both of these structures Lisp objects.
lrecord.h, emacs.c, inline.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, symsinit.h: Make scrollbar instances actual Lisp objects. Mark the window
mirrors in them. inline.c needs to know about scrollbar.h now.
Record the new type in lrecord.h. Fix up scrollbar-*.c
appropriately. Create a hash table in scrollbar-msw.c so that the
scrollbar instances stored in scrollbar HWND's are properly
GC-protected. Create complex_vars_of_scrollbar_mswindows() to
create the hash table at startup, and call it from emacs.c. Don't
store the scrollbar instance as a property of the GTK scrollbar,
as it's not used and if we did this, we'd have to separately
GC-protect it in a hash table, like in MS Windows.
lrecord.h, frame.h, frame.c, frameslots.h, redisplay.c, window.c, window.h: Move mark_window_mirror from redisplay.c to window.c. Make window
mirrors actual Lisp objects. Tell lrecord.h about them. Change
the window mirror member of struct frame from a pointer to a Lisp
object, and add XWINDOW_MIRROR in appropriate places. Mark the
scrollbar instances in the window mirror.
redisplay.c, redisplay.h, alloc.c: Delete mark_redisplay. Don't call mark_redisplay. We now mark
frame-specific structures in mark_frame.
NOTE: I also deleted an extremely questionable call to
update_frame_window_mirrors(). It was extremely questionable
before, and now totally impossible, since it will create
Lisp objects during redisplay.
frame.c: Mark the scrollbar instances, which are now Lisp objects.
Call mark_gutter() here, not in mark_redisplay().
gutter.c: Update comments about correct marking.
---------------------------------------------------------------
ISSUES BROUGHT UP BY MARTIN:
---------------------------------------------------------------
buffer.h: Put back these macros the way Steve T and I think they ought to be.
I already explained in a previous changelog entry why I think these
macros should be the way I'd defined them. Once again:
We fix these macros so they don't care about the type of their
lvalues. The non-C-string equivalents of these already function
in the same way, and it's correct because it should be OK to pass
in a CBufbyte *, a BufByte *, a Char_Binary *, an UChar_Binary *,
etc. The whole reason for these different types is to work around
errors caused by signed-vs-unsigned non-matching types. Any
possible error that might be caught in a DFC macro would also be
caught wherever the argument is used elsewhere. So creating
multiple macro versions would add no useful error-checking and
just further complicate an already complicated area.
As for Martin's "ANSI aliasing" bug, XEmacs is not ANSI-aliasing
clean and probably never will be. Unless the board agrees to
change XEmacs in this way (and we really don't want to go down
that road), this is not a bug.
sound.h: Undo Martin's type change.
signal.c: Fix problem identified by Martin with Linux and g++ due to
non-standard declaration of setitimer().
systime.h: Update the docs for "qxe_" to point out why making the
encapsulation explicit is always the right way to go. (setitimer()
itself serves as an example.)
For 21.4:
update-elc-2.el: Correct misplaced parentheses, making lisp/mule not get
recompiled.
| author | ben |
|---|---|
| date | Mon, 18 Jun 2001 07:10:32 +0000 |
| parents | 576fb035e263 |
| children | a307f9a2021d |
line wrap: on
line source
;;; cus-face.el -- Support for Custom faces. ;; ;; Copyright (C) 1996, 1997 Free Software Foundation, Inc. ;; ;; Author: Per Abrahamsen <abraham@dina.kvl.dk> ;; Maintainer: Hrvoje Niksic <hniksic@xemacs.org> ;; Keywords: help, faces ;; Version: 1.9960-x ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/ ;;; Commentary: ;; ;; See `custom.el'. ;; This file should probably be dissolved, and code moved to faces.el, ;; like Stallman did. ;;; Code: (require 'custom) ;; To elude the warnings for font functions. (eval-when-compile (require 'font)) ;;; Declaring a face. ;;;###autoload (defun custom-declare-face (face spec doc &rest args) "Like `defface', but FACE is evaluated as a normal argument." ;; (when (fboundp 'pureload) ;; (error "Attempt to declare a face during dump")) ;; #### should we possibly reset force-face here? (unless (get face 'face-defface-spec) (put face 'face-defface-spec spec) (unless (find-face face) ;; If the user has already created the face, respect that. (let ((value (or (get face 'saved-face) spec)) (frames (relevant-custom-frames)) frame) ;; Create global face. (make-empty-face face) (face-display-set face value nil '(custom)) ;; Create frame local faces (while frames (setq frame (car frames) frames (cdr frames)) (face-display-set face value frame '(custom))) (init-face-from-resources face))) (when (and doc (null (face-doc-string face))) (set-face-doc-string face doc)) (custom-handle-all-keywords face args 'custom-face) (run-hooks 'custom-define-hook)) face) ;;; Font Attributes. ;; Consider adding the stuff in the XML font model here. (defconst custom-face-attributes '((:foreground (color :tag "Foreground" :value "" :help-echo "Set foreground color.") set-face-foreground face-foreground-name) (:background (color :tag "Background" :value "" :help-echo "Set background color.") set-face-background face-background-name) (:size (editable-field :format "Size: %v" :help-echo "\ Text size (e.g. 9pt or 2mm).") custom-set-face-font-size custom-face-font-size) (:family (editable-field :format "Font Family: %v" :help-echo "\ Name of font family to use (e.g. times).") custom-set-face-font-family custom-face-font-family) (:background-pixmap (editable-field :format "Background pixmap: %v" :help-echo "\ Name of background pixmap file.") set-face-background-pixmap custom-face-background-pixmap) (:dim (toggle :format "%[Dim%]: %v\n" :help-echo "Control whether the text should be dimmed.") set-face-dim-p face-dim-p) (:bold (toggle :format "%[Bold%]: %v\n" :help-echo "Control whether a bold font should be used.") custom-set-face-bold custom-face-bold) (:italic (toggle :format "%[Italic%]: %v\n" :help-echo "\ Control whether an italic font should be used.") custom-set-face-italic custom-face-italic) (:underline (toggle :format "%[Underline%]: %v\n" :help-echo "\ Control whether the text should be underlined.") set-face-underline-p face-underline-p) (:strikethru (toggle :format "%[Strikethru%]: %v\n" :help-echo "\ Control whether the text should be strikethru.") set-face-strikethru-p face-strikethru-p) (:inverse-video (toggle :format "%[Inverse Video%]: %v\n" :help-echo "\ Control whether the text should be inverted. Works only on TTY-s") set-face-reverse-p face-reverse-p)) "Alist of face attributes. The elements are lists of the form (KEY TYPE SET GET) where: KEY is a symbol identifying the attribute. TYPE is a widget type for editing the attribute. SET is a function for setting the attribute value. GET is a function for getting the attribute value. The SET function should take three arguments: the face to modify, the value of the attribute, and optionally the frame where the face should be changed. The GET function should take two arguments, the face to examine, and optionally the frame where the face should be examined.") (defun face-custom-attributes-set (face frame tags &rest atts) "For FACE on FRAME set the attributes [KEYWORD VALUE].... Each keyword should be listed in `custom-face-attributes'. If FRAME is nil, set the default face." (while atts (let* ((name (nth 0 atts)) (value (nth 1 atts)) (fun (nth 2 (assq name custom-face-attributes)))) (setq atts (cdr (cdr atts))) (condition-case nil (funcall fun face value frame tags) (error nil))))) (defun face-custom-attributes-get (face frame) "For FACE on FRAME get the attributes [KEYWORD VALUE].... Each keyword should be listed in `custom-face-attributes'. If FRAME is nil, use the default face." (condition-case nil ;; Attempt to get `font.el' from w3. (require 'font) (error nil)) (let ((atts custom-face-attributes) att result get) (while atts (setq att (car atts) atts (cdr atts) get (nth 3 att)) (condition-case nil ;; This may fail if w3 doesn't exist. (when get (let ((answer (funcall get face frame))) (unless (equal answer (funcall get 'default frame)) (when (widget-apply (nth 1 att) :match answer) (setq result (cons (nth 0 att) (cons answer result))))))) (error nil))) result)) (defsubst custom-face-get-spec (symbol) (or (get symbol 'customized-face) (get symbol 'saved-face) (get symbol 'face-defface-spec) ;; Attempt to construct it. (list (list t (face-custom-attributes-get symbol (selected-frame)))))) (defun custom-set-face-bold (face value &optional frame tags) "Set the bold property of FACE to VALUE." (if value (make-face-bold face frame tags) (make-face-unbold face frame tags))) ;; Really, we should get rid of these font.el dependencies... They ;; are still presenting a problem with dumping the faces (font.el is ;; too bloated for us to dump). I am thinking about hacking up ;; font-like functionality myself for the sake of this file. It will ;; probably be to-the-point and more efficient. (defun custom-face-bold (face &rest args) "Return non-nil if the font of FACE is bold." (let* ((font (apply 'face-font-name face args)) ;; Gag (fontobj (font-create-object font))) (font-bold-p fontobj))) (defun custom-set-face-italic (face value &optional frame tags) "Set the italic property of FACE to VALUE." (if value (make-face-italic face frame tags) (make-face-unitalic face frame tags))) (defun custom-face-italic (face &rest args) "Return non-nil if the font of FACE is italic." (let* ((font (apply 'face-font-name face args)) ;; Gag (fontobj (font-create-object font))) (font-italic-p fontobj))) (defun custom-face-background-pixmap (face &rest args) "Return the name of the background pixmap file used for FACE." (let ((image (apply 'specifier-instance (face-background-pixmap face) args))) (and image (image-instance-file-name image)))) (defun custom-set-face-font-size (face size &optional locale tags) "Set the font of FACE to SIZE." (let* ((font (apply 'face-font-name face locale)) ;; Gag (fontobj (font-create-object font))) (set-font-size fontobj size) (apply 'font-set-face-font face fontobj locale tags))) (defun custom-face-font-size (face &rest args) "Return the size of the font of FACE as a string." (let* ((font (apply 'face-font-name face args)) ;; Gag (fontobj (font-create-object font))) (format "%s" (font-size fontobj)))) (defun custom-set-face-font-family (face family &optional locale tags) "Set the font of FACE to FAMILY." (let* ((font (apply 'face-font-name face locale)) ;; Gag (fontobj (font-create-object font))) (set-font-family fontobj family) (apply 'font-set-face-font face fontobj locale tags))) (defun custom-face-font-family (face &rest args) "Return the name of the font family of FACE." (let* ((font (apply 'face-font-name face args)) ;; Gag (fontobj (font-create-object font))) (font-family fontobj))) ;;;###autoload (defun custom-set-face-update-spec (face display plist) "Customize the FACE for display types matching DISPLAY, merging in the new items from PLIST." (let ((spec (face-spec-update-all-matching (custom-face-get-spec face) display plist))) (put face 'customized-face spec) (face-spec-set face spec nil '(custom)))) ;;; Initializing. ;;;###autoload (defun custom-set-faces (&rest args) "Initialize faces according to user preferences. This asociates the setting with the USER theme. The arguments should be a list where each entry has the form: (FACE SPEC [NOW [COMMENT]]) SPEC will be stored as the saved value for FACE. If NOW is present and non-nil, FACE will also be created according to SPEC. COMMENT is a string comment about FACE. See `defface' for the format of SPEC." (apply #'custom-theme-set-faces 'user args)) ;;;###autoload (defun custom-theme-set-faces (theme &rest args) "Initialize faces according to settings specified by args. Records the settings as belonging to THEME. See `custom-set-faces' for a description of the arguments ARGS." (custom-check-theme theme) (let ((immediate (get theme 'theme-immediate))) (while args (let ((entry (car args))) (if (listp entry) (let ((face (nth 0 entry)) (spec (nth 1 entry)) (now (nth 2 entry)) (comment (nth 3 entry))) (put face 'saved-face spec) (custom-push-theme 'theme-face face theme 'set spec) (put face 'saved-face-comment comment) (when (or now immediate) (put face 'force-face (if now 'rogue 'immediate))) (when (or now immediate (find-face face)) (put face 'face-comment comment) (unless (find-face face) (make-empty-face face)) (face-spec-set face spec nil '(custom))) (setq args (cdr args))) ;; Old format, a plist of FACE SPEC pairs. (let ((face (nth 0 args)) (spec (nth 1 args))) (put face 'saved-face spec) (custom-push-theme 'theme-face face theme 'set spec)) (setq args (cdr (cdr args)))))))) ;;;###autoload (defun custom-theme-face-value (face theme) "Return spec of FACE in THEME if the THEME modifies the FACE. Nil otherwise." (car-safe (custom-theme-value theme (get face 'theme-face)))) (defun custom-theme-reset-internal-face (face to-theme) (let ((spec (custom-theme-face-value face to-theme)) was-in-theme) (setq was-in-theme spec) (setq spec (or spec (get face 'standard-value))) (when spec (put face 'save-face was-in-theme) (when (or (get face 'force-face) (find-face face)) (unless (find-face face) (make-empty-face face)) (face-spec-set face spec))) spec)) ;;;###autoload (defun custom-theme-reset-faces (theme &rest args) (custom-check-theme theme) "Reset the value of the face to values previously defined. Associate this setting with THEME. ARGS is a list of lists of the form (face to-theme) This means reset face to its value in to-theme." (mapc #'(lambda (arg) (apply #'custom-theme-reset-internal-face arg) (custom-push-theme (car arg) 'theme-face theme 'reset (cadr arg))) args)) ;;;###autoload (defun custom-reset-faces (&rest args) "Reset the value of the face to values previously defined. Associate this setting with the 'user' theme. ARGS is defined as for `custom-theme-reset-faces'." (apply #'custom-theme-reset-faces 'user args)) ;;; The End. (provide 'cus-face) ;; cus-face.el ends here
