[Aptitude-svn-commit] r3337 - in branches/aptitude-0.3/aptitude: . src/vscreen/config

[Daniel Burrows]

Author: dburrows
Date: Mon Jun  6 23:15:10 2005
New Revision: 3337

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/config/colors.cc
Log:
Fix color mixing. Again.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Jun  6 23:15:10 2005
@@ -1,5 +1,10 @@
 2005-06-06  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/config/colors.cc:
+
+	Correct color updating: use PAIR_NUMBER to retrieve the old pair
+	number (since color is now an attribute set, not a pair number).
+
 	* src/vscreen/vscreen.cc:
 
 	Fix menu coloration by putting full style information into each

Modified: branches/aptitude-0.3/aptitude/src/vscreen/config/colors.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/config/colors.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/config/colors.cc	Mon Jun  6 23:15:10 2005
@@ -72,8 +72,8 @@
     return color & A_COLOR;
   else
     {
-      short old_fg=color/COLORS;
-      short old_bg=color%COLORS;
+      short old_fg=PAIR_NUMBER(color)/COLORS;
+      short old_bg=PAIR_NUMBER(color)%COLORS;
 
       if(fg == -1)
 	return COLOR_PAIR(get_color_pair(old_fg, bg));