1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-27 10:54:40 +00:00

(frame-set-background-mode): If a tty frame defines a

background color, use that to compute the background mode, instead
of always defaulting to "dark".
This commit is contained in:
Eli Zaretskii 2000-10-19 06:56:50 +00:00
parent 9f2feff636
commit 772139c0a6
2 changed files with 19 additions and 8 deletions

View File

@ -1,3 +1,9 @@
2000-10-19 Eli Zaretskii <eliz@is.elta.co.il>
* faces.el (frame-set-background-mode): If a tty frame defines a
background color, use that to compute the background mode, instead
of always defaulting to "dark".
2000-10-19 Miles Bader <miles@lsi.nec.co.jp>
* comint.el (comint-write-output): New function.

View File

@ -1308,22 +1308,27 @@ this won't have the expected effect."
(let* ((bg-resource
(and window-system
(x-get-resource ".backgroundMode" "BackgroundMode")))
(bg-color (frame-parameter frame 'background-color))
(bg-mode
(cond (frame-background-mode)
((null window-system)
;; No way to determine this automatically (?).
'dark)
(bg-resource
(intern (downcase bg-resource)))
((< (apply '+ (x-color-values
(frame-parameter frame 'background-color)
frame))
((and (null window-system) (null bg-color))
;; No way to determine this automatically (?).
'dark)
;; Unspecified frame background color can only happen
;; on tty's.
((memq bg-color '("unspecified" "unspecified-bg"))
'dark)
((eq bg-color "unspecified-fg") ; inverted colors
'light)
((>= (apply '+ (x-color-values bg-color frame))
;; Just looking at the screen, colors whose
;; values add up to .6 of the white total
;; still look dark to me.
(* (apply '+ (x-color-values "white" frame)) .6))
'dark)
(t 'light)))
'light)
(t 'dark)))
(display-type
(cond ((null window-system)
(if (tty-display-color-p frame) 'color 'mono))