;;; faces.el --- Lisp faces
-;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
;; Free Software Foundation, Inc.
;; Maintainer: FSF
+;; Keywords: internal
;; This file is part of GNU Emacs.
;; Warning suppression -- can't require x-win in batch:
(autoload 'xw-defined-colors "x-win"))
-(require 'cus-face)
-
\f
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Font selection.
'(("courier" "fixed")
("helv" "helvetica" "arial" "fixed"))
"*Alist of alternative font family names.
-Each element has the the form (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...).
+Each element has the form (FAMILY ALTERNATIVE1 ALTERNATIVE2 ...).
If fonts of family FAMILY can't be loaded, try ALTERNATIVE1, then
ALTERNATIVE2 etc."
:tag "Alternative font families to try."
;; This is defined originally in xfaces.c.
(defcustom face-font-registry-alternatives
(if (eq system-type 'windows-nt)
- '(("gb2312.1980" "gb2312")
+ '(("iso8859-1" "ms-oemlatin")
+ ("gb2312.1980" "gb2312")
("jisx0208.1990" "jisx0208.1983" "jisx0208.1978")
("ksc5601.1989" "ksx1001.1992" "ksc5601.1987")
("muletibetan-2" "muletibetan-0"))
("ksc5601.1989" "ksx1001.1992" "ksc5601.1987")
("muletibetan-2" "muletibetan-0")))
"*Alist of alternative font registry names.
-Each element has the the form (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...).
+Each element has the form (REGISTRY ALTERNATIVE1 ALTERNATIVE2 ...).
If fonts of registry REGISTRY can be loaded, font selection
tries to find a best matching font among all fonts of registry
REGISTRY, ALTERNATIVE1, ALTERNATIVE2, and etc."
If the optional argument FRAME is given, this gets the face NAME for
that frame; otherwise, it uses the selected frame.
If FRAME is the symbol t, then the global, non-frame face is returned.
-If NAME is already a face, it is simply returned.
-
-This function is defined for compatibility with Emacs 20.2. It
-should not be used anymore."
+If NAME is already a face, it is simply returned."
(or (facep name)
(check-face name)))
-(make-obsolete 'internal-get-face "See `facep' and `check-face'." "21.1")
+(make-obsolete 'internal-get-face "see `facep' and `check-face'." "21.1")
\f
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(when (and inherit
(not (eq inherit t))
(face-attribute-relative-p attribute value))
- ;; We should merge with INHERIT as well
+ ;; We should merge with INHERIT as well
(setq value (face-attribute-merged-with attribute value inherit frame)))
value))
FRAME nil or not specified means change face on all frames.
Argument NOERROR is ignored and retained for compatibility.
Use `set-face-attribute' for finer control of the font weight."
- (interactive (list (read-face-name "Make which face bold ")))
+ (interactive (list (read-face-name "Make which face bold")))
(set-face-attribute face frame :weight 'bold))
"Make the font of FACE be non-bold, if possible.
FRAME nil or not specified means change face on all frames.
Argument NOERROR is ignored and retained for compatibility."
- (interactive (list (read-face-name "Make which face non-bold ")))
+ (interactive (list (read-face-name "Make which face non-bold")))
(set-face-attribute face frame :weight 'normal))
FRAME nil or not specified means change face on all frames.
Argument NOERROR is ignored and retained for compatibility.
Use `set-face-attribute' for finer control of the font slant."
- (interactive (list (read-face-name "Make which face italic ")))
+ (interactive (list (read-face-name "Make which face italic")))
(set-face-attribute face frame :slant 'italic))
"Make the font of FACE be non-italic, if possible.
FRAME nil or not specified means change face on all frames.
Argument NOERROR is ignored and retained for compatibility."
- (interactive (list (read-face-name "Make which face non-italic ")))
+ (interactive (list (read-face-name "Make which face non-italic")))
(set-face-attribute face frame :slant 'normal))
FRAME nil or not specified means change face on all frames.
Argument NOERROR is ignored and retained for compatibility.
Use `set-face-attribute' for finer control of font weight and slant."
- (interactive (list (read-face-name "Make which face bold-italic: ")))
+ (interactive (list (read-face-name "Make which face bold-italic")))
(set-face-attribute face frame :weight 'bold :slant 'italic))
If FACE specifies neither foreground nor background color,
set its foreground and background to the background and foreground
of the default face. Value is FACE."
- (interactive (list (read-face-name "Invert face ")))
+ (interactive (list (read-face-name "Invert face")))
(let ((fg (face-attribute face :foreground frame))
(bg (face-attribute face :background frame)))
(if (not (and (eq fg 'unspecified) (eq bg 'unspecified)))
;;; Interactively modifying faces.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-(defun read-face-name (prompt)
- "Read and return a face symbol, prompting with PROMPT.
-Value is a symbol naming a known face."
- (let ((face-list (mapcar #'(lambda (x) (cons (symbol-name x) x))
- (face-list)))
- (def (thing-at-point 'symbol))
- face)
- (cond ((assoc def face-list)
- (setq prompt (concat prompt " (default " def "): ")))
- (t (setq def nil)
- (setq prompt (concat prompt ": "))))
- (while (equal "" (setq face (completing-read
- prompt face-list nil t nil nil def))))
- (intern face)))
+(defun read-face-name (prompt &optional string-describing-default multiple)
+ "Read a face, defaulting to the face or faces on the char after point.
+If it has a `read-face-name' property, that overrides the `face' property.
+PROMPT describes what you will do with the face (don't end in a space).
+STRING-DESCRIBING-DEFAULT describes what default you will use
+if this function returns nil.
+If MULTIPLE is non-nil, return a list of faces (possibly only one).
+Otherwise, return a single face."
+ (let ((faceprop (or (get-char-property (point) 'read-face-name)
+ (get-char-property (point) 'face)))
+ faces)
+ ;; Make a list of the named faces that the `face' property uses.
+ (if (listp faceprop)
+ (dolist (f faceprop)
+ (if (symbolp f)
+ (push f faces)))
+ (if (symbolp faceprop)
+ (setq faces (list faceprop))))
+ ;; If there are none, try to get a face name from the buffer.
+ (if (and (null faces)
+ (memq (intern-soft (thing-at-point 'symbol)) (face-list)))
+ (setq faces (list (intern-soft (thing-at-point 'symbol)))))
+
+ ;; If we only want one, and the default is more than one,
+ ;; discard the unwanted ones now.
+ (unless multiple
+ (if faces
+ (setq faces (list (car faces)))))
+ (let* ((input
+ ;; Read the input.
+ (completing-read
+ (if (or faces string-describing-default)
+ (format "%s (default %s): " prompt
+ (if faces (mapconcat 'symbol-name faces ", ")
+ string-describing-default))
+ (format "%s: " prompt))
+ obarray 'custom-facep t))
+ ;; Canonicalize the output.
+ (output
+ (if (equal input "")
+ faces
+ (if (stringp input)
+ (list (intern input))
+ input))))
+ ;; Return either a list of faces or just one face.
+ (if multiple
+ output
+ (car output)))))
(defun face-valid-attribute-values (attribute &optional frame)
"Use "
(if (display-mouse-p) "\\[help-follow-mouse] or ")
"\\[help-follow] on a face name to customize it\n"
- "or on its sample text for a decription of the face.\n\n")))
+ "or on its sample text for a description of the face.\n\n")))
(setq help-xref-stack nil)
(while faces
(setq face (car faces))
(save-excursion
(save-match-data
(search-backward face-name)
- (help-xref-button 0 'help-customize-face face-name)))
- (let ((beg (point)))
+ (help-xref-button 0 'help-customize-face face)))
+ (let ((beg (point))
+ (line-beg (line-beginning-position)))
(insert list-faces-sample-text)
;; Hyperlink to a help buffer for the face.
(save-excursion
(help-xref-button 0 'help-face face)))
(insert "\n")
(put-text-property beg (1- (point)) 'face face)
+ ;; Make all face commands default to the proper face
+ ;; anywhere in the line.
+ (put-text-property line-beg (1- (point)) 'read-face-name face)
;; If the sample text has multiple lines, line up all of them.
(goto-char beg)
(forward-line 1)
(copy-face (car faces) (car faces) frame disp-frame)
(setq faces (cdr faces)))))))
-
(defun describe-face (face &optional frame)
"Display the properties of face FACE on FRAME.
+Interactively, FACE defaults to the faces of the character after point
+and FRAME defaults to the selected frame.
+
If the optional argument FRAME is given, report on face FACE in that frame.
If FRAME is t, report on the defaults for face FACE (for new frames).
If FRAME is omitted or nil, use the selected frame."
- (interactive (list (read-face-name "Describe face")))
+ (interactive (list (read-face-name "Describe face" "= `default' face" t)))
(let* ((attrs '((:family . "Family")
(:width . "Width")
(:height . "Height")
(max-width (apply #'max (mapcar #'(lambda (x) (length (cdr x)))
attrs))))
(help-setup-xref (list #'describe-face face) (interactive-p))
+ (unless face
+ (setq face 'default))
+ (if (not (listp face))
+ (setq face (list face)))
(with-output-to-temp-buffer (help-buffer)
(save-excursion
(set-buffer standard-output)
- (dolist (a attrs)
- (let ((attr (face-attribute face (car a) frame)))
- (insert (make-string (- max-width (length (cdr a))) ?\ )
- (cdr a) ": " (format "%s" attr) "\n")))
- (insert "\nDocumentation:\n\n"
- (or (face-documentation face)
- "not documented as a face."))
- (let ((customize-label "customize"))
- (terpri)
- (terpri)
- (princ (concat "You can " customize-label " this face."))
- (with-current-buffer standard-output
- (save-excursion
- (re-search-backward
- (concat "\\(" customize-label "\\)") nil t)
- (help-xref-button 1 'help-customize-face face)))))
+ (dolist (f face)
+ (insert "Face: " (symbol-name f))
+ (if (not (facep f))
+ (insert " undefined face.\n")
+ (let ((customize-label "customize this face"))
+ (princ (concat " (" customize-label ")\n"))
+ (insert "Documentation: "
+ (or (face-documentation f)
+ "Not documented as a face.")
+ "\n\n")
+ (with-current-buffer standard-output
+ (save-excursion
+ (re-search-backward
+ (concat "\\(" customize-label "\\)") nil t)
+ (help-xref-button 1 'help-customize-face f)))
+ (dolist (a attrs)
+ (let ((attr (face-attribute f (car a) frame)))
+ (insert (make-string (- max-width (length (cdr a))) ?\ )
+ (cdr a) ": " (format "%s" attr) "\n")))))
+ (terpri)))
(print-help-return-message))))
\f
((eq req 'background)
(memq (frame-parameter frame 'background-mode)
options))
+ ((eq req 'supports)
+ (display-supports-face-attributes-p options frame))
(t (error "Unknown req `%S' with options `%S'"
req options)))))
match))
(unless frame
(setq frame (selected-frame)))
(let ((tail spec)
- result)
+ result all)
(while tail
(let* ((entry (pop tail))
(display (car entry))
(attrs (cdr entry)))
(when (face-spec-set-match-display display frame)
- (setq result (if (listp (car attrs))
+ (setq result (if (null (cdr attrs)) ;; was (listp (car attrs))
;; Old-style entry, the attribute list is the
;; first element.
(car attrs)
- attrs)
- tail nil))))
- result))
+ attrs))
+ (if (eq display t)
+ (setq all result result nil)
+ (setq tail nil)))))
+ (if all (append result all) result)))
(defun face-spec-reset-face (face &optional frame)
(t
(> (tty-color-gray-shades display) 2)))))
+(defun display-supports-face-attributes-p (attributes &optional display)
+ "Return non-nil if all the face attributes in ATTRIBUTES are supported.
+The optional argument DISPLAY can be a display name, a frame, or
+nil (meaning the selected frame's display)
+
+The definition of `supported' is somewhat heuristic, but basically means
+that a face containing all the attributes in ATTRIBUTES, when merged
+with the default face for display, can be represented in a way that's
+
+ (1) different in appearance than the default face, and
+ (2) `close in spirit' to what the attributes specify, if not exact.
+
+Point (2) implies that a `:weight black' attribute will be satisified by
+any display that can display bold, and a `:foreground \"yellow\"' as long
+as it can display a yellowish color, but `:slant italic' will _not_ be
+satisified by the tty display code's automatic substitution of a `dim'
+face for italic."
+ (let ((frame
+ (if (framep display)
+ display
+ (car (frames-on-display-list display)))))
+ ;; For now, we assume that non-tty displays can support everything.
+ ;; Later, we should add the ability to query about specific fonts,
+ ;; colors, etc.
+ (or (memq (framep frame) '(x w32 mac))
+ (tty-supports-face-attributes-p attributes frame))))
+
\f
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Background mode.
"Set frame-local faces of FRAME from face specs and resources.
Initialize colors of certain faces from frame parameters."
(dolist (face (face-list))
- (face-spec-set face (face-user-default-spec face) frame)
- (internal-merge-in-global-face face frame)
- (when (and (memq window-system '(x w32 mac))
- (or (not (boundp 'inhibit-default-face-x-resources))
- (not (eq face 'default))))
- (make-face-x-resource-internal face frame)))
+ (when (not (equal face 'default))
+ (face-spec-set face (face-user-default-spec face) frame)
+ (internal-merge-in-global-face face frame)
+ (when (and (memq window-system '(x w32 mac))
+ (or (not (boundp 'inhibit-default-face-x-resources))
+ (not (eq face 'default))))
+ (make-face-x-resource-internal face frame))))
;; Initialize attributes from frame parameters.
(let ((params '((foreground-color default :foreground)
;; Update a frame's faces when we change its default font.
(defalias 'frame-update-faces 'ignore)
-(make-obsolete 'frame-update-faces "No longer necessary" "21.1")
+(make-obsolete 'frame-update-faces "no longer necessary." "21.1")
;; Update the colors of FACE, after FRAME's own colors have been
;; changed.
(defface mode-line
'((((type x w32 mac) (class color))
- (:box (:line-width -1 :style released-button)
- :background "grey75" :foreground "black"))
+ :box (:line-width -1 :style released-button)
+ :background "grey75" :foreground "black")
(t
- (:inverse-video t)))
- "Basic mode line face."
+ :inverse-video t))
+ "Basic mode line face for selected window."
:version "21.1"
:group 'modeline
:group 'basic-faces)
+(defface mode-line-inactive
+ '((t
+ :inherit mode-line)
+ (((type x w32 mac) (background light) (class color))
+ :weight light
+ :box (:line-width -1 :color "grey75" :style nil)
+ :foreground "grey20" :background "grey90")
+ (((type x w32 mac) (background dark) (class color))
+ :weight light
+ :box (:line-width -1 :color "grey40" :style nil)
+ :foreground "grey80" :background "grey30"))
+ "Basic mode line face for non-selected windows."
+ :version "21.4"
+ :group 'modeline
+ :group 'basic-faces)
+
;; Make `modeline' an alias for `mode-line', for compatibility.
(put 'modeline 'face-alias 'mode-line)
+(put 'modeline-inactive 'face-alias 'mode-line-inactive)
(defface header-line
- '((((type tty))
+ '((t
+ :inherit mode-line)
+ (((type tty))
;; This used to be `:inverse-video t', but that doesn't look very
;; good when combined with inverse-video mode-lines and multiple
;; windows. Underlining looks better, and is more consistent with
;; highlighting; this may be too confusing in general, although it
;; happens to look good with the only current use of header-lines,
;; the info browser. XXX
- :underline t)
+ :underline t
+ :inverse-video nil)
(((class color grayscale) (background light))
- :inherit mode-line
:background "grey90" :foreground "grey20"
:box nil)
(((class color grayscale) (background dark))
- :inherit mode-line
:background "grey20" :foreground "grey90"
:box nil)
(((class mono) (background light))
- :inherit mode-line
:background "white" :foreground "black"
:inverse-video nil
:box nil
:underline t)
(((class mono) (background dark))
- :inherit mode-line
:background "black" :foreground "white"
:inverse-video nil
:box nil
- :underline t)
- (t
- :inverse-video t))
+ :underline t))
"Basic header-line face."
:version "21.1"
:group 'basic-faces)
(defface tool-bar
'((((type x w32 mac) (class color))
- (:box (:line-width 1 :style released-button)
- :background "grey75" :foreground "black"))
+ :box (:line-width 1 :style released-button)
+ :background "grey75" :foreground "black")
(((type x) (class mono))
- (:box (:line-width 1 :style released-button)
- :background "grey" :foreground "black"))
+ :box (:line-width 1 :style released-button)
+ :background "grey" :foreground "black")
(t
()))
"Basic tool-bar face."
:group 'basic-faces)
+(defface minibuffer-prompt '((((background dark)) :foreground "cyan")
+ (((type pc)) :foreground "magenta")
+ (t :foreground "dark blue"))
+ "Face for minibuffer prompts."
+ :version "21.4"
+ :group 'basic-faces)
+
+(setq minibuffer-prompt-properties
+ (append minibuffer-prompt-properties (list 'face 'minibuffer-prompt)))
+
(defface region
'((((type tty) (class color))
- (:background "blue" :foreground "white"))
+ :background "blue" :foreground "white")
(((type tty) (class mono))
- (:inverse-video t))
+ :inverse-video t)
(((class color) (background dark))
- (:background "blue3"))
+ :background "blue3")
(((class color) (background light))
- (:background "lightgoldenrod2"))
- (t (:background "gray")))
+ :background "lightgoldenrod2")
+ (t :background "gray"))
"Basic face for highlighting the region."
:version "21.1"
:group 'basic-faces)
(defface fringe
'((((class color) (background light))
- (:background "grey95"))
- (((class color) (background dark))
- (:background "grey10"))
- (t
- (:background "gray")))
+ :background "grey95")
+ (((class color) (background dark))
+ :background "grey10")
+ (t
+ :background "gray"))
"Basic face for the fringes to the left and right of windows under X."
:version "21.1"
:group 'frames
:group 'basic-faces)
-(defface bold '((t (:weight bold)))
+(defface bold '((t :weight bold))
"Basic bold face."
:group 'basic-faces)
-(defface italic '((t (:slant italic)))
+(defface italic
+ '((((supports :slant italic))
+ :slant italic)
+ (((supports :underline t))
+ :underline t)
+ (t
+ ;; default to italic, even it doesn't appear to be supported,
+ ;; because in some cases the display engine will do it's own
+ ;; workaround (to `dim' on ttys)
+ :slant italic))
"Basic italic font."
:group 'basic-faces)
-(defface bold-italic '((t (:weight bold :slant italic)))
+(defface bold-italic '((t :weight bold :slant italic))
"Basic bold-italic face."
:group 'basic-faces)
-(defface underline '((t (:underline t)))
+(defface underline '((t :underline t))
"Basic underlined face."
:group 'basic-faces)
(defface highlight
'((((type tty) (class color))
- (:background "green"))
+ :background "green" :foreground "black")
(((class color) (background light))
- (:background "darkseagreen2"))
+ :background "darkseagreen2")
(((class color) (background dark))
- (:background "darkolivegreen"))
- (t (:inverse-video t)))
+ :background "darkolivegreen")
+ (t :inverse-video t))
"Basic face for highlighting."
:group 'basic-faces)
(defface secondary-selection
'((((type tty) (class color))
- (:background "cyan" :foreground "black"))
+ :background "cyan" :foreground "black")
(((class color) (background light))
- (:background "yellow"))
+ :background "yellow")
(((class color) (background dark))
- (:background "SkyBlue4"))
- (t (:inverse-video t)))
+ :background "SkyBlue4")
+ (t :inverse-video t))
"Basic face for displaying the secondary selection."
:group 'basic-faces)
-(defface fixed-pitch '((t (:family "courier")))
+(defface fixed-pitch '((t :family "courier"))
"The basic fixed-pitch face."
:group 'basic-faces)
-(defface variable-pitch '((t (:family "helv")))
+(defface variable-pitch '((t :family "helv"))
"The basic variable-pitch face."
:group 'basic-faces)
(defface trailing-whitespace
'((((class color) (background light))
- (:background "red"))
+ :background "red")
(((class color) (background dark))
- (:background "red"))
- (t (:inverse-video t)))
+ :background "red")
+ (t :inverse-video t))
"Basic face for highlighting trailing whitespace."
:version "21.1"
:group 'font-lock ; like `show-trailing-whitespace'
HCoop / bpt / emacs.git / blobdiff