*** empty log message ***

diff --git a/Changes b/Changes
index 034eb0f73b7dc7ad798268cde989bb65ed16b0cd..255f65bdbe4d3bde158bffb49bd2d464dc60251f 100644 (file)
--- a/Changes
+++ b/Changes
@@ -20,7 +20,7 @@ WISH: http://www120.pair.com/mccarthy/nextstep/intro.htmld/Workspace.html is the
 WISH: kick out xpm.C, replace by pixbuf
 DUMB: support tex fonts
 
-TODO: fix rounding of colors when !xft (#aaaaaa => #a9a900) (do not use correct, but expected value)
+8.2
        - fix make depend in src/, reported by exg.
         - fixed typo in urxvt::GET_CUSTOM, causing the result to be wrong.
           (patch by Sergey Vlasov).
@@ -45,6 +45,8 @@ TODO: fix rounding of colors when !xft (#aaaaaa => #a9a900) (do not use correct,
         - rip out support for non-POSIX termios variants.
         - update libptytty.
         - update iom.C, make it call ptytty::sanitise_stdfd on init.
+        - when !XFT, change rounding of colours to use a less correct formula to
+          meet user expectancies (#aaa becomes #a000a000a000 not #9f9f9f9f9f9f).
 
 8.1  Thu Dec  7 22:27:25 CET 2006
         - ｹﾘｽﾏｽﾌ゚ﾚｾ゙ﾝﾄ - zomg!!1, it's too early!!!

diff --git a/src/rxvttoolkit.C b/src/rxvttoolkit.C
index 967556aac88261ba5afec3f196577617c46abcea..149bf6db49c2e64ecbc84d5de9926ab377c037eb 100644 (file)
--- a/src/rxvttoolkit.C
+++ b/src/rxvttoolkit.C
@@ -709,12 +709,9 @@ rxvt_color::alloc (rxvt_screen *screen, const rgba &color)
 
   if (screen->visual->c_class == TrueColor)
     {
-      c.pixel = (color.r * (screen->visual->red_mask   >> ctz (screen->visual->red_mask  ))
-                         / rgba::MAX_CC) << ctz (screen->visual->red_mask  )
-              | (color.g * (screen->visual->green_mask >> ctz (screen->visual->green_mask))
-                         / rgba::MAX_CC) << ctz (screen->visual->green_mask)
-              | (color.b * (screen->visual->blue_mask  >> ctz (screen->visual->blue_mask ))
-                         / rgba::MAX_CC) << ctz (screen->visual->blue_mask );
+      c.pixel = (color.r >> (16 - popcount (screen->visual->red_mask  )) << ctz (screen->visual->red_mask  ))
+              | (color.g >> (16 - popcount (screen->visual->green_mask)) << ctz (screen->visual->green_mask))
+              | (color.b >> (16 - popcount (screen->visual->blue_mask )) << ctz (screen->visual->blue_mask ));
 
       return true;
     }

diff --git a/src/version.h b/src/version.h
index 3fb418d1d6b341d1b9dc9805a49ed431326f1813..2404a3d639234b2f7a4f07a119393edc91c42ebb 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,3 +1,3 @@
 // VERSION _must_ be \d.\d+
-#define VERSION "8.1"
-#define DATE   "2006-12-07"
+#define VERSION "8.2"
+#define DATE   "2007-02-12"