# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1113060350 0
# Node ID 6550784a652ab566c53d96df2d351d5b4b7884d7
# Parent  8cfd32d71cf45f6fe0c427a739fbf00d3340f6e7
(xterm-rgb-convert-to-16bit): Simplify.
(xterm-register-default-colors): Update color values computation
to match xterm-200.

diff -r 8cfd32d71cf4 -r 6550784a652a lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Apr 09 08:43:23 2005 +0000
+++ b/lisp/ChangeLog	Sat Apr 09 15:25:50 2005 +0000
@@ -1,3 +1,9 @@
+2005-04-09  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* term/xterm.el (xterm-rgb-convert-to-16bit): Simplify.
+	(xterm-register-default-colors): Update color values computation
+	to match xterm-200.
+
 2005-04-09  Kenichi Handa  <handa@m17n.org>
 
 	* international/code-pages.el (iso-latin-7): Fix the map.
diff -r 8cfd32d71cf4 -r 6550784a652a lisp/term/xterm.el
--- a/lisp/term/xterm.el	Sat Apr 09 08:43:23 2005 +0000
+++ b/lisp/term/xterm.el	Sat Apr 09 15:25:50 2005 +0000
@@ -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 @@
 	    (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 @@
 	;; 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)))))