Commit d5179a01 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

(display-color-p): Use framep-on-display.

(display-grayscale-p): New function.
parent 9911648b
2000-02-02 Eli Zaretskii <eliz@is.elta.co.il>
* frame.el (frames-on-display-list, framep-on-display): New
functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
* term/tty-colors.el (tty-color-gray-shades): New function.
* faces.el (display-color-p): Use framep-on-display.
(display-grayscale-p): New function.
2000-01-31 Dave Love <fx@gnu.org> 2000-01-31 Dave Love <fx@gnu.org>
* emacs-lisp/fontset.el (standard-fontset-spec): Purecopy it. * emacs-lisp/fontset.el (standard-fontset-spec): Purecopy it.
......
...@@ -1201,13 +1201,20 @@ If COLOR is the symbol `unspecified' or one of the strings ...@@ -1201,13 +1201,20 @@ If COLOR is the symbol `unspecified' or one of the strings
The optional argument DISPLAY specifies which display to ask about. The optional argument DISPLAY specifies which display to ask about.
DISPLAY should be either a frame or a display name (a string). DISPLAY should be either a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display." If omitted or nil, that stands for the selected frame's display."
(if (and (stringp display) (not (fboundp 'x-display-list))) (if (memq (framep-on-display display) '(x w32))
nil (xw-display-color-p display)
(if (memq (framep (or display (selected-frame))) '(x w32)) (tty-display-color-p display)))
(xw-display-color-p display)
(tty-display-color-p display))))
(defalias 'x-display-color-p 'display-color-p) (defalias 'x-display-color-p 'display-color-p)
(defun display-grayscale-p (&optional display)
"Return non-nil if frames on DISPLAY can display shades of gray."
(let ((frame-type (framep-on-display display)))
(cond
((memq frame-type '(x w32 mac))
(x-display-grayscale-p display))
(t
(> (tty-color-gray-shades display) 2)))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Background mode. ;;; Background mode.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment