diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2005-04-09 15:25:50 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2005-04-09 15:25:50 +0000 |
| commit | ce102cb1e3feeb1e490c732e4aa49401f9647f70 (patch) | |
| tree | b657ff4dc0d1b18ddb0897f99576be78c3ca1f31 /lisp/term | |
| parent | 1cf21850176ab21c115d148d0f8e95209898e4b7 (diff) | |
| download | emacs-ce102cb1e3feeb1e490c732e4aa49401f9647f70.tar.gz | |
(xterm-rgb-convert-to-16bit): Simplify.
(xterm-register-default-colors): Update color values computation
to match xterm-200.
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/xterm.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index 44688e82b6d..b62f6efd478 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el @@ -123,7 +123,7 @@ (defun xterm-rgb-convert-to-16bit (prim) "Convert an 8-bit primary color value PRIM to a corresponding 16-bit value." - (min 65535 (round (* (/ prim 255.0) 65535.0)))) + (logior prim (lsh prim 8))) (defun xterm-register-default-colors () "Register the default set of colors for xterm or compatible emulator. @@ -160,9 +160,10 @@ versions of xterm." (tty-color-define (format "color-%d" (- 256 ncolors)) (- 256 ncolors) (mapcar 'xterm-rgb-convert-to-16bit - (list (round (* r 42.5)) - (round (* g 42.5)) - (round (* b 42.5))))) + (list (if (zerop r) 0 (+ (* r 40) 55)) + (if (zerop g) 0 (+ (* g 40) 55)) + (if (zerop b) 0 (+ (* b 40) 55))))) + (setq b (1+ b)) (if (> b 5) (setq g (1+ g) @@ -200,7 +201,7 @@ versions of xterm." ;; Now the 8 gray colors (while (> ncolors 0) (setq color (xterm-rgb-convert-to-16bit - (round + (floor (if (= ncolors 8) 46.36363636 (+ (* (- 8 ncolors) 23.18181818) 69.54545454))))) |