;;; cus-face.el --- customization support for faces
;;
-;; Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
+;; 2005, 2006 Free Software Foundation, Inc.
;;
;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
;; Keywords: help, faces
-;; Version: Emacs
;; This file is part of GNU Emacs.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
;;
(defun custom-declare-face (face spec doc &rest args)
"Like `defface', but FACE is evaluated as a normal argument."
(unless (get face 'face-defface-spec)
- (put face 'face-defface-spec spec)
(when (fboundp 'facep)
(unless (facep face)
;; If the user has already created the face, respect that.
- (let ((value (or (get face 'saved-face) spec))
- (frames (frame-list))
- frame)
+ (let ((value (or (get face 'saved-face) spec)))
;; Create global face.
(make-empty-face face)
- ;; Create frame local faces
- (while frames
- (setq frame (car frames)
- frames (cdr frames))
+ ;; Create frame-local faces
+ (dolist (frame (frame-list))
(face-spec-set face value frame)))
;; When making a face after frames already exist
- (if (memq window-system '(x w32))
+ (if (memq window-system '(x w32 mac))
(make-face-x-resource-internal face))))
+ ;; Don't record SPEC until we see it causes no errors.
+ (put face 'face-defface-spec spec)
+ (push (cons 'defface face) current-load-list)
(when (and doc (null (face-documentation face)))
(set-face-documentation face (purecopy doc)))
(custom-handle-all-keywords face args 'custom-face)
;;; Face attributes.
+;;;###autoload
(defconst custom-face-attributes
'((:family
(string :tag "Font Family"
:help-echo "Font family or fontset alias name."))
-
+
(:width
(choice :tag "Width"
:help-echo "Font width."
(const :tag "ultracondensed" ultra-condensed)
(const :tag "ultraexpanded" ultra-expanded)
(const :tag "wide" extra-expanded)))
-
+
(:height
(choice :tag "Height"
:help-echo "Face's font height."
(choice :tag "Weight"
:help-echo "Font weight."
:value normal ; default
- (const :tag "black" ultra_bold)
+ (const :tag "black" ultra-bold)
(const :tag "bold" bold)
(const :tag "book" semi-light)
(const :tag "demibold" semi-bold)
(const :tag "semilight" semi-light)
(const :tag "ultralight" ultra-light)
(const :tag "ultrabold" ultra-bold)))
-
+
(:slant
(choice :tag "Slant"
:help-echo "Font slant."
(const :tag "italic" italic)
(const :tag "oblique" oblique)
(const :tag "normal" normal)))
-
+
(:underline
(choice :tag "Underline"
:help-echo "Control text underlining."
(const :tag "Off" nil)
(const :tag "On" t)
(color :tag "Colored")))
-
+
(:overline
(choice :tag "Overline"
:help-echo "Control text overlining."
(const :tag "Off" nil)
(const :tag "On" t)
(color :tag "Colored")))
-
+
(:strike-through
(choice :tag "Strike-through"
:help-echo "Control text strike-through."
(const :tag "Off" nil)
(const :tag "On" t)
(color :tag "Colored")))
-
+
(:box
;; Fixme: this can probably be done better.
(choice :tag "Box around text"
(nconc (and lwidth `(:line-width ,lwidth))
(and color `(:color ,color))
(and style `(:style ,style)))))))))
-
+
(:inverse-video
(choice :tag "Inverse-video"
:help-echo "Control whether text should be in inverse-video."
(const :tag "Off" nil)
(const :tag "On" t)))
-
+
(:foreground
(color :tag "Foreground"
- :help-echo "Set foreground color."))
-
+ :help-echo "Set foreground color (name or #RRGGBB hex spec)."))
+
(:background
(color :tag "Background"
- :help-echo "Set background color."))
-
+ :help-echo "Set background color (name or #RRGGBB hex spec)."))
+
(:stipple
(choice :tag "Stipple"
:help-echo "Background bit-mask"
(if (and (consp cus-value) (null (cdr cus-value)))
(car cus-value)
cus-value))))
-
+
"Alist of face attributes.
The elements are of the form (KEY TYPE PRE-FILTER POST-FILTER),
being customized, and should return a value suitable for setting the
given face attribute.")
-
(defun custom-face-attributes-get (face frame)
"For FACE on FRAME, return an alternating list describing its attributes.
The list has the form (KEYWORD VALUE KEYWORD VALUE...).
;;;###autoload
(defun custom-set-faces (&rest args)
"Initialize faces according to user preferences.
+This associates the settings with the `user' theme.
The arguments should be a list where each entry has the form:
(FACE SPEC [NOW [COMMENT]])
-SPEC is stored as the saved value for FACE.
+SPEC is stored as the saved value for FACE, as well as the value for the
+`user' theme. The `user' theme is one of the default themes known to Emacs.
+See `custom-known-themes' for more information on the known themes.
+See `custom-theme-set-faces' for more information on the interplay
+between themes and faces.
+See `defface' for the format of SPEC.
+
+If NOW is present and non-nil, FACE is created now, according to SPEC.
+COMMENT is a string comment about FACE."
+ (apply 'custom-theme-set-faces 'user args))
+
+(defun custom-theme-set-faces (theme &rest args)
+ "Initialize faces for theme THEME.
+The arguments should be a list where each entry has the form:
+
+ (FACE SPEC [NOW [COMMENT]])
+
+SPEC is stored as the saved value for FACE, as well as the value for the
+`user' theme. The `user' theme is one of the default themes known to Emacs.
+See `custom-known-themes' for more information on the known themes.
+See `custom-theme-set-faces' for more information on the interplay
+between themes and faces.
+See `defface' for the format of SPEC.
+
If NOW is present and non-nil, FACE is created now, according to SPEC.
COMMENT is a string comment about FACE.
-See `defface' for the format of SPEC."
- (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)
- (put face 'saved-face-comment comment)
- (when now
- (put face 'force-face t))
- (when (or now (facep face))
- (put face 'face-comment comment)
- (make-empty-face face)
- (face-spec-set face spec))
+Several properties of THEME and FACE are used in the process:
+
+If THEME property `theme-immediate' is non-nil, this is equivalent of
+providing the NOW argument to all faces in the argument list: FACE is
+created now. The only difference is FACE property `force-face': if NOW
+is non-nil, FACE property `force-face' is set to the symbol `rogue', else
+if THEME property `theme-immediate' is non-nil, FACE property `force-face'
+is set to the symbol `immediate'.
+
+SPEC itself is saved in FACE property `saved-face' and it is stored in
+FACE's list property `theme-face' \(using `custom-push-theme')."
+ (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))
+ oldspec)
+ ;; If FACE is actually an alias, customize the face it
+ ;; is aliased to.
+ (if (get face 'face-alias)
+ (setq face (get face 'face-alias)))
+
+ (setq oldspec (get face 'theme-face))
+ (when (not (and oldspec (eq 'user (caar oldspec))))
+ (put face 'saved-face spec)
+ (put face 'saved-face-comment comment))
+
+ (custom-push-theme 'theme-face face theme 'set spec)
+ (when (or now immediate)
+ (put face 'force-face (if now 'rogue 'immediate)))
+ (when (or now immediate (facep face))
+ (unless (facep face)
+ (make-empty-face face))
+ (put face 'face-comment comment)
+ (face-spec-set face spec))
(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))
- (setq args (cdr (cdr args)))))))
+ (if (get face 'face-alias)
+ (setq face (get face 'face-alias)))
+ (put face 'saved-face spec)
+ (custom-push-theme 'theme-face face theme 'set spec))
+ (setq args (cdr (cdr args))))))))
+
+;; XEmacs compability function. In XEmacs, when you reset a Custom
+;; Theme, you have to specify the theme to reset it to. We just apply
+;; the next theme.
+;;;###autoload
+(defun custom-theme-reset-faces (theme &rest args)
+ "Reset the specs in THEME of some faces to their specs in other themes.
+Each of the arguments ARGS has this form:
+
+ (FACE IGNORED)
+
+This means reset FACE. The argument IGNORED is ignored."
+ (custom-check-theme theme)
+ (dolist (arg args)
+ (custom-push-theme 'theme-face (car arg) theme 'reset)))
+
+;;;###autoload
+(defun custom-reset-faces (&rest args)
+ "Reset the specs of some faces to their specs in specified themes.
+This creates settings in the `user' theme.
+
+Each of the arguments ARGS has this form:
+
+ (FACE FROM-THEME)
+
+This means reset FACE to its value in FROM-THEME."
+ (apply 'custom-theme-reset-faces 'user args))
;;; The End.
(provide 'cus-face)
+;;; arch-tag: 9a5c4b63-0d27-4c92-a5af-f2c7ed764c2b
;;; cus-face.el ends here
HCoop / bpt / emacs.git / blobdiff