Major simplification; most of file contents deleted.

factory-face property renamed to face-defface-spec.

1 files changed, 49 insertions, 451 deletions

diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index 952171ca4d0..b82ff159496 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -1,4 +1,4 @@
-;;; cus-face.el -- XEmacs specific custom support.
+;;; cus-face.el -- customization support for faces.
 ;;
 ;; Copyright (C) 1996, 1997 Free Software Foundation, Inc.
 ;;
@@ -7,237 +7,49 @@
 ;; Version: 1.84
 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
 
-;;; Commentary:
-;;
-;; See `custom.el'.
-
-;;; Code:
-
-(require 'custom)
-
-(eval-and-compile (require 'cl))
-
-;;; Compatibility.
-
-(if (string-match "XEmacs" emacs-version)
-    (defun custom-face-background (face &optional frame)
-      ;; Specifiers suck!
-      "Return the background color name of face FACE, or nil if unspecified."
-      (color-instance-name (specifier-instance (face-background face) frame)))
-  (defalias 'custom-face-background 'face-background))
-
-(if (string-match "XEmacs" emacs-version)
-    (defun custom-face-foreground (face &optional frame)
-      ;; Specifiers suck!
-      "Return the background color name of face FACE, or nil if unspecified."
-      (color-instance-name (specifier-instance (face-foreground face) frame)))
-  (defalias 'custom-face-foreground 'face-foreground))
-
-(defalias 'custom-face-font-name (if (string-match "XEmacs" emacs-version)
-				     'face-font-name
-				   'face-font))
-
-(eval-and-compile
-  (unless (fboundp 'frame-property)
-    ;; XEmacs function missing in Emacs.
-    (defun frame-property (frame property &optional default)
-      "Return FRAME's value for property PROPERTY."
-      (or (cdr (assq property (frame-parameters frame)))
-	  default)))
+;; This file is part of GNU Emacs.
 
-  (unless (fboundp 'face-doc-string)
-    ;; XEmacs function missing in Emacs.
-    (defun face-doc-string (face)
-      "Get the documentation string for FACE."
-      (get face 'face-documentation)))
+;; GNU Emacs 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.
 
-  (unless (fboundp 'set-face-doc-string)
-    ;; XEmacs function missing in Emacs.
-    (defun set-face-doc-string (face string)
-      "Set the documentation string for FACE to STRING."
-      (put face 'face-documentation string))))
+;; GNU Emacs 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.
 
-(unless (fboundp 'x-color-values)
-  ;; Emacs function missing in XEmacs 19.14.
-  (defun x-color-values  (color &optional frame)
-    "Return a description of the color named COLOR on frame FRAME.
-The value is a list of integer RGB values--(RED GREEN BLUE).
-These values appear to range from 0 to 65280 or 65535, depending
-on the system; white is (65280 65280 65280) or (65535 65535 65535).
-If FRAME is omitted or nil, use the selected frame."
-    (color-instance-rgb-components (make-color-instance color))))
+;; 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.
 
-;; XEmacs and Emacs have different definitions of `facep'.  
-;; The Emacs definition is the useful one, so emulate that. 
-(cond ((not (fboundp 'facep))
-       (defun custom-facep (face) 
-	 "No faces"
-	 nil))
-      ((string-match "XEmacs" emacs-version)
-       (defalias 'custom-facep 'find-face))
-      (t
-       (defalias 'custom-facep 'facep)))
-
-(unless (fboundp 'make-empty-face)
-  ;; This should be moved to `faces.el'.
-  (if (string-match "XEmacs" emacs-version)
-      ;; Give up for old XEmacs pre 19.15/20.1.
-      (defalias 'make-empty-face 'make-face)
-    ;; Define for Emacs pre 19.35.
-    (defun make-empty-face (name)
-      "Define a new FACE on all frames, ignoring X resources."
-      (interactive "SMake face: ")
-      (or (internal-find-face name)
-	  (let ((face (make-vector 8 nil)))
-	    (aset face 0 'face)
-	    (aset face 1 name)
-	    (let* ((frames (frame-list))
-		   (inhibit-quit t)
-		   (id (internal-next-face-id)))
-	      (make-face-internal id)
-	      (aset face 2 id)
-	      (while frames
-		(set-frame-face-alist (car frames)
-				      (cons (cons name (copy-sequence face))
-					    (frame-face-alist (car frames))))
-		(setq frames (cdr frames)))
-	      (setq global-face-data (cons (cons name face) global-face-data)))
-	    ;; add to menu
-	    (if (fboundp 'facemenu-add-new-face)
-		(facemenu-add-new-face name))
-	    face))
-      name)))
-
-(defcustom initialize-face-resources t
-  "If non nil, allow X resources to initialize face properties.
-This only affects faces declared with `defface', and only NT or X11 frames."
-  :group 'customize
-  :type 'boolean)
-
-(cond ((fboundp 'initialize-face-resources)
-       ;; Already bound, do nothing.
-       )
-      ((fboundp 'make-face-x-resource-internal)
-       ;; Emacs or new XEmacs.
-       (defun initialize-face-resources (face &optional frame)
-	 "Initialize face according to the X11 resources.
-This might overwrite existing face properties.
-Does nothing when the variable initialize-face-resources is nil."
-	 (when initialize-face-resources
-	   (make-face-x-resource-internal face frame t))))
-      (t 
-       ;; Too hard to do right on XEmacs.
-       (defalias 'initialize-face-resources 'ignore)))
-
-;;(if (string-match "XEmacs" emacs-version)
-;;    ;; Xemacs.
-;;    (defun custom-invert-face (face &optional frame)
-;;      "Swap the foreground and background colors of face FACE.
-;;If the colors are not specified in the face, use the default colors."
-;;      (interactive (list (read-face-name "Reverse face: ")))
-;;      (let ((fg (color-name (face-foreground face frame) frame))
-;;	    (bg (color-name (face-background face frame) frame)))
-;;	(set-face-foreground face bg frame)
-;;	(set-face-background face fg frame)))
-;;  ;; Emacs.
-;;  (defun custom-invert-face (face &optional frame)
-;;    "Swap the foreground and background colors of face FACE.
-;;If the colors are not specified in the face, use the default colors."
-;;    (interactive (list (read-face-name "Reverse face: ")))
-;;    (let ((fg (or (face-foreground face frame)
-;;		  (face-foreground 'default frame)
-;;		  (frame-property (or frame (selected-frame))
-;;				  'foreground-color)
-;;		  "black"))
-;;	  (bg (or (face-background face frame)
-;;		  (face-background 'default frame)
-;;		  (frame-property (or frame (selected-frame))
-;;				  'background-color)
-;;		  "white")))
-;;      (set-face-foreground face bg frame)
-;;      (set-face-background face fg frame))))
-
-(defcustom custom-background-mode nil
-  "The brightness of the background.
-Set this to the symbol dark if your background color is dark, light if
-your background is light, or nil (default) if you want Emacs to
-examine the brightness for you."
-  :group 'customize
-  :type '(choice (choice-item dark) 
-		 (choice-item light)
-		 (choice-item :tag "default" nil)))
-
-(defun custom-background-mode (frame)
-  "Kludge to detect background mode for FRAME."
-  (let* ((bg-resource 
-	  (condition-case ()
-	      (x-get-resource ".backgroundMode" "BackgroundMode" 'string)
-	    (error nil)))
-	 color
-	 (mode (cond (bg-resource
-		      (intern (downcase bg-resource)))
-		     ((and (setq color (condition-case ()
-					   (or (frame-property
-						frame
-						'background-color)
-					       (custom-face-background
-						'default))
-					 (error nil)))
-			   (or (string-match "XEmacs" emacs-version)
-			       window-system)
-			   (< (apply '+ (x-color-values color))
-			      (/ (apply '+ (x-color-values "white"))
-				 3)))
-		      'dark)
-		     (t 'light))))
-    (modify-frame-parameters frame (list (cons 'background-mode mode)))
-    mode))
+;;; Commentary:
+;;
+;; See `custom.el'.
 
-(eval-and-compile
-  (if (string-match "XEmacs" emacs-version)
-      ;; XEmacs.
-      (defun custom-extract-frame-properties (frame)
-	"Return a plist with the frame properties of FRAME used by custom."
-	(list 'type (device-type (frame-device frame))
-	      'class (device-class (frame-device frame))
-	      'background (or custom-background-mode
-			      (frame-property frame
-					      'background-mode)
-			      (custom-background-mode frame))))
-    ;; Emacs.
-    (defun custom-extract-frame-properties (frame)
-      "Return a plist with the frame properties of FRAME used by custom."
-      (list 'type window-system
-	    'class (frame-property frame 'display-type)
-	    'background (or custom-background-mode
-			    (frame-property frame 'background-mode)
-			    (custom-background-mode frame))))))  
+;;; Code:
 
 ;;; 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 'load-gc)
-    ;; This should be allowed, somehow.
-    (error "Attempt to declare a face during dump"))
-  (unless (get face 'factory-face)
-    (put face 'factory-face spec)
+  (unless (get face 'face-defface-spec)
+    (put face 'face-defface-spec spec)
     (when (fboundp 'facep)
-      (unless (custom-facep face)
+      (unless (facep face)
 	;; If the user has already created the face, respect that.
 	(let ((value (or (get face 'saved-face) spec))
-	      (frames (custom-relevant-frames))
+	      (frames (frame-list))
 	      frame)
 	  ;; Create global face.
 	  (make-empty-face face)
-	  (custom-face-display-set face value)
 	  ;; Create frame local faces
 	  (while frames
 	    (setq frame (car frames)
 		  frames (cdr frames))
-	    (custom-face-display-set face value frame))
-	  (initialize-face-resources face))))
+	    (face-spec-set face value frame)))))
     (when (and doc (null (face-doc-string face)))
       (set-face-doc-string face doc))
     (custom-handle-all-keywords face args 'custom-face)
@@ -249,13 +61,13 @@ examine the brightness for you."
 (defconst custom-face-attributes
   '((:bold (toggle :format "Bold: %[%v%]\n"
 		   :help-echo "Control whether a bold font should be used.")
-	   custom-set-face-bold 
-	   custom-face-bold)
+	   set-face-bold-p
+	   face-bold-p)
     (:italic (toggle :format "Italic: %[%v%]\n"
 		     :help-echo "\
 Control whether an italic font should be used.")
-	     custom-set-face-italic
-	     custom-face-italic)
+	     set-face-italic-p
+	     face-italic-p)
     (:underline (toggle :format "Underline: %[%v%]\n"
 			:help-echo "\
 Control whether the text should be underlined.")
@@ -265,59 +77,37 @@ Control whether the text should be underlined.")
 			:value "black"
 			:help-echo "Set foreground color.")
 		 set-face-foreground
-		 custom-face-foreground)
+		 face-foreground)
     (:background (color :tag "Background"
 			:value "white"
 			:help-echo "Set background color.")
 		 set-face-background
-		 custom-face-background)
-    ;;    (:invert (const :format "Invert Face\n" 
-    ;;		    :sibling-args (:help-echo "
-    ;;Reverse the foreground and background color.
-    ;;If you haven't specified them for the face, the default colors will be used.")
-    ;;		    t)
-    ;;	     (lambda (face value &optional frame)
-    ;;	       ;; We don't use VALUE.
-    ;;	       (custom-invert-face face frame)))
+		 face-background)
     (:stipple (editable-field :format "Stipple: %v"
 			      :help-echo "Name of background bitmap file.")
-	      set-face-stipple custom-face-stipple))
+	      set-face-stipple
+	      face-stipple))
   "Alist of face attributes. 
-
-The elements are of the form (KEY TYPE SET GET) where KEY is a symbol
-identifying the attribute, TYPE is a widget type for editing the
-attibute, SET is a function for setting the attribute value, and GET is a function for getiing the attribute value. 
+The elements are of the form (KEY TYPE SET GET),
+where KEY is the name of the attribute,
+TYPE is a widget type for editing the attibute,
+SET is a function for setting the attribute value,
+and GET is a function for getiing 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
-optonally the frame where the face should be examined.")
-
-(defun custom-face-attributes-set (face frame &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)
-	(error nil)))))
+optionally the frame where the face should be examined.")
 
 (defun custom-face-attributes-get (face frame)
-  "For FACE on FRAME get the attributes [KEYWORD VALUE]....
+  "For FACE on FRAME, return an alternating list describing its attributes.
+The list has the form (KEYWORD VALUE KEYWORD VALUE...).
 Each keyword should be listed in `custom-face-attributes'.
+We include only those attributes that differ from the default face.
 
-If FRAME is nil, use the default face."
-  (condition-case nil
-      ;; Attempt to get `font.el' from w3.
-      (require 'font)
-    (error nil))
+If FRAME is nil, use the global defaults for FACE."
   (let ((atts custom-face-attributes)
 	att result get)
     (while atts
@@ -326,204 +116,13 @@ If FRAME is nil, use the default face."
 	    get (nth 3 att))
       (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))))))))
+	  (if (and (not (equal answer (funcall get 'default frame)))
+		   (widget-apply (nth 1 att) :match answer))
+	      (setq result (cons (nth 0 att) (cons answer result)))))))
     result))
 
-(defun custom-set-face-bold (face value &optional frame)
-  "Set the bold property of FACE to VALUE."
-  (if value
-      (make-face-bold face frame)
-    (make-face-unbold face frame)))
-
-(defun custom-face-bold (face &rest args)
-  "Return non-nil if the font of FACE is bold."
-  (let* ((font (apply 'custom-face-font-name face args))
-	 (fontobj (font-create-object font)))
-    (font-bold-p fontobj)))
-
-(defun custom-set-face-italic (face value &optional frame)
-  "Set the italic property of FACE to VALUE."
-  (if value
-      (make-face-italic face frame)
-    (make-face-unitalic face frame)))
-
-(defun custom-face-italic (face &rest args)
-  "Return non-nil if the font of FACE is italic."
-  (let* ((font (apply 'custom-face-font-name face args))
-	 (fontobj (font-create-object font)))
-    (font-italic-p fontobj)))
-
-(defun custom-face-stipple (face &rest args)
-  "Return the name of the stipple file used for FACE."
-  (if (string-match "XEmacs" emacs-version)
-      (let ((image  (apply 'specifier-instance 
-			   (face-background-pixmap face) args)))
-	(when image 
-	  (image-instance-file-name image)))
-    (apply 'face-stipple face args)))
-
-(when (string-match "XEmacs" emacs-version)
-  ;; Support for special XEmacs font attributes.
-  (autoload 'font-create-object "font" nil)
-
-  (defun custom-set-face-font-size (face size &rest args)
-    "Set the font of FACE to SIZE"
-    (let* ((font (apply 'custom-face-font-name face args))
-	   (fontobj (font-create-object font)))
-      (set-font-size fontobj size)
-      (apply 'font-set-face-font face fontobj args)))
-
-  (defun custom-face-font-size (face &rest args)
-    "Return the size of the font of FACE as a string."
-    (let* ((font (apply 'custom-face-font-name face args))
-	   (fontobj (font-create-object font)))
-      (format "%s" (font-size fontobj))))
-
-  (defun custom-set-face-font-family (face family &rest args)
-    "Set the font of FACE to FAMILY."
-    (let* ((font (apply 'custom-face-font-name face args))
-	   (fontobj (font-create-object font)))
-      (set-font-family fontobj family)
-      (apply 'font-set-face-font face fontobj args)))
-
-  (defun custom-face-font-family (face &rest args)
-    "Return the name of the font family of FACE."
-    (let* ((font (apply 'custom-face-font-name face args))
-	   (fontobj (font-create-object font)))
-      (font-family fontobj)))
-
-  (setq custom-face-attributes
-	(append '((: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)
-		  (:size (editable-field :format "Size: %v"
-					 :help-echo "\
-Text size (e.g. 9pt or 2mm).")
-			 custom-set-face-font-size
-			 custom-face-font-size)
-		  (:strikethru (toggle :format "Strikethru: %[%v%]\n"
-				      :help-echo "\
-Control whether the text should be strikethru.")
-			       set-face-strikethru-p
-			       face-strikethru-p))
-		custom-face-attributes)))
-
-;;; Frames.
-
-(defun custom-face-display-set (face spec &optional frame)
-  "Set FACE to the attributes to the first matching entry in SPEC.
-Iff optional FRAME is non-nil, set it for that frame only.
-See `defface' for information about SPEC."
-  (when (fboundp 'make-face)
-    (while spec 
-      (let* ((entry (car spec))
-	     (display (nth 0 entry))
-	     (atts (nth 1 entry)))
-	(setq spec (cdr spec))
-	(when (custom-display-match-frame display frame)
-	  ;; Avoid creating frame local duplicates of the global face.
-	  (unless (and frame (eq display (get face 'custom-face-display)))
-	    (apply 'custom-face-attributes-set face frame atts))
-	  (unless frame
-	    (put face 'custom-face-display display))
-	  (setq spec nil))))))
-
-(defvar custom-default-frame-properties nil
-  "The frame properties used for the global faces.
-Frames who doesn't match these propertiess should have frame local faces.
-The value should be nil, if uninitialized, or a plist otherwise.  
-See `defface' for a list of valid keys and values for the plist.")
-
-(defun custom-get-frame-properties (&optional frame)
-  "Return a plist with the frame properties of FRAME used by custom.
-If FRAME is nil, return the default frame properties."
-  (cond (frame
-	 ;; Try to get from cache.
-	 (let ((cache (frame-property frame 'custom-properties)))
-	   (unless cache
-	     ;; Oh well, get it then.
-	     (setq cache (custom-extract-frame-properties frame))
-	     ;; and cache it...
-	     (modify-frame-parameters frame 
-				      (list (cons 'custom-properties cache))))
-	   cache))
-	(custom-default-frame-properties)
-	(t
-	 (setq custom-default-frame-properties
-	       (custom-extract-frame-properties (selected-frame))))))
-
-(defun custom-display-match-frame (display frame)
-  "Non-nil iff DISPLAY matches FRAME.
-If FRAME is nil, the current FRAME is used."
-  ;; This is a kludge to get started, we really should use specifiers!
-  (if (eq display t)
-      t
-    (let* ((props (custom-get-frame-properties frame))
-	   (type (plist-get props 'type))
-	   (class (plist-get props 'class))
-	   (background (plist-get props 'background))
-	   (match t)
-	   (entries display)
-	   entry req options)
-      (while (and entries match)
-	(setq entry (car entries)
-	      entries (cdr entries)
-	      req (car entry)
-	      options (cdr entry)
-	      match (cond ((eq req 'type)
-			   (memq type options))
-			  ((eq req 'class)
-			   (memq class options))
-			  ((eq req 'background)
-			   (memq background options))
-			  (t
-			   (error "Unknown req `%S' with options `%S'" 
-				  req options)))))
-      match)))
-
-(defun custom-relevant-frames ()
-  "List of frames whose custom properties differ from the default."
-  (let ((relevant nil)
-	(default (custom-get-frame-properties))
-	(frames (frame-list))
-	frame)
-    (while frames
-      (setq frame (car frames)
-	    frames (cdr frames))
-      (unless (equal default (custom-get-frame-properties frame))
-	(push frame relevant)))
-    relevant))
-
-(defun custom-initialize-faces (&optional frame)
-  "Initialize all custom faces for FRAME.
-If FRAME is nil or omitted, initialize them for all frames."
-  (mapcar (lambda (symbol)
-	    (let ((spec (or (get symbol 'saved-face)
-			    (get symbol 'factory-face))))
-	      (when spec 
-		(custom-face-display-set symbol spec frame)
-		(initialize-face-resources symbol frame))))
-	  (face-list)))
-
-;;;###autoload
-(defun custom-initialize-frame (&optional frame)
-  "Initialize local faces for FRAME if necessary.
-If FRAME is missing or nil, the first member of (frame-list) is used."
-  (unless frame
-    (setq frame (car (frame-list))))
-  (unless (equal (custom-get-frame-properties) 
-		 (custom-get-frame-properties frame))
-    (custom-initialize-faces frame)))
-
 ;;; Initializing.
 
-(and (fboundp 'make-face)
-     (make-face 'custom-face-empty))
-
 ;;;###autoload
 (defun custom-set-faces (&rest args)
   "Initialize faces according to user preferences.
@@ -531,8 +130,8 @@ The arguments should be a list where each entry has the form:
 
   (FACE SPEC [NOW])
 
-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.
+SPEC is stored as the saved value for FACE.
+If NOW is present and non-nil, FACE is created now, according to SPEC.
 
 See `defface' for the format of SPEC."
   (while args
@@ -544,10 +143,9 @@ See `defface' for the format of SPEC."
 	    (put face 'saved-face spec)
 	    (when now
 	      (put face 'force-face t))
-	    (when (or now (custom-facep face))
-	      (when (fboundp 'copy-face)
-		(copy-face 'custom-face-empty face))
-	      (custom-face-display-set face spec))
+	    (when (or now (facep face))
+	      (make-empty-face face)
+	      (face-spec-set face spec))
 	    (setq args (cdr args)))
 	;; Old format, a plist of FACE SPEC pairs.
 	(let ((face (nth 0 args))