Mercurial > hg > xemacs-beta
view lisp/cus-face.el @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
author | ben |
---|---|
date | Sun, 05 May 2002 11:33:57 +0000 |
parents | 943eaba38521 |
children | 7efd3a9bbcfb |
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: ;; it is now safe to put the `provide' anywhere. if an error occurs while ;; loading, all provides (and fsets) will be undone. put it first to ;; prevent require/provide loop with custom and cus-face. (provide 'cus-face) (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)))) ;; This consistently fails to dtrt ;;(defun custom-set-face-font-size (face size &optional locale tags) ;; "Set the font of FACE to SIZE." ;; ;; #### should this call have tags in it? ;; (let* ((font (apply 'face-font-name face (list locale))) ;; ;; Gag ;; (fontobj (font-create-object font))) ;; (set-font-size fontobj size) ;; (apply 'font-set-face-font face fontobj locale tags))) ;; From Jan Vroonhof -- see faces.el (defun custom-set-face-font-size (face size &optional locale tags) "Set the font of FACE to SIZE." (make-face-size face size 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)))) ;; Jan suggests this may not dtrt ;;(defun custom-set-face-font-family (face family &optional locale tags) ;; "Set the font of FACE to FAMILY." ;; ;; #### should this call have tags in it? ;; (let* ((font (apply 'face-font-name face (list locale))) ;; ;; Gag ;; (fontobj (font-create-object font))) ;; (set-font-family fontobj family) ;; (apply 'font-set-face-font face fontobj locale tags))) ;; From Jan Vroonhof -- see faces.el (defun custom-set-face-font-family (face family &optional locale tags) "Set the font of FACE to FAMILY." (make-face-family face family 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. ;; cus-face.el ends here