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

[Daniel Burrows]

Author: dburrows
Date: Sat Jun 25 17:52:15 2005
New Revision: 3428

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/curses++.cc
Log:
Preserve color information when generating cchar_ts.


Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Jun 25 17:52:15 2005
@@ -1,5 +1,10 @@
 2005-06-25  Daniel Burrows  <dburrows@debian.org>
 
+	* src/vscreen/curses++.cc:
+
+	  Fix the generation of attributes+wide characters to preserve
+	  color information.
+
 	* src/vscreen/transcode.cc:
 
 	  Doh, correct the actual name of the transcoding function.

Modified: branches/aptitude-0.3/aptitude/src/vscreen/curses++.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/curses++.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/curses++.cc	Sat Jun 25 17:52:15 2005
@@ -345,10 +345,12 @@
       dummy[1]=L'\0';
 
       // How can I notify the user of errors?
-      if(setcchar(&wch, dummy, str[i].attrs, 0, 0) == ERR)
+      if(setcchar(&wch, dummy, str[i].attrs,
+		  PAIR_NUMBER(str[i].attrs), 0) == ERR)
 	{
 	  rval=ERR;
-	  if(setcchar(&wch, L"?", get_style("Error").get_attrs(), 0, 0) == ERR)
+	  attr_t a=get_style("Error").get_attrs();
+	  if(setcchar(&wch, L"?", a, PAIR_NUMBER(a), 0) == ERR)
 	    continue;
 	}