[ekg2-commit] r3842 - trunk/ekg: trunk/ekg/protocol.c

[SVN commit]

Author: wiechu
Date: 2008-03-04 19:51:48 +0100 (Tue, 04 Mar 2008)
New Revision: 3842

Modified:
   trunk/ekg/protocol.c
Log:

Fix attribute settings.


Modified: trunk/ekg/protocol.c
===================================================================
--- trunk/ekg/protocol.c	2008-03-04 15:21:56 UTC (rev 3841)
+++ trunk/ekg/protocol.c	2008-03-04 18:51:48 UTC (rev 3842)
@@ -535,24 +535,29 @@
 			attrmap = "nTgGbBrR";
 
 		for (i = 0; text[i]; i++) {
-			if (i == 0 || format[i] != format[i - 1]) {
+
+			uint32_t f = format[i];
+
+			if (i == 0 || f != format[i - 1]) {
 				char attr = 'n';
 
-				if ((format[i] & EKG_FORMAT_COLOR)) {
-					attr = color_map(format[i] & 0x0000ff, (format[i] & 0x0000ff00) >> 8, (format[i] & 0x00ff0000) >> 16);
+				if ((f & EKG_FORMAT_COLOR)) {
+					attr = color_map(f & EKG_FORMAT_B_MASK, (f & EKG_FORMAT_G_MASK) >> 8, (f & EKG_FORMAT_B_MASK) >> 16);
 					if (attr == 'k')
 						attr = 'n';
 				}
 
-				if ((format[i] & 0xfe000000)) {
-					uint32_t f = (format[i] & 0xff000000);
+				if ((f & ~(EKG_FORMAT_COLOR | EKG_FORMAT_RGB_MASK))) {
 
-					if ((format[i] & EKG_FORMAT_COLOR))
+					if ((f & EKG_FORMAT_COLOR))
 						attr = toupper(attr);
 					else
 						attr = attrmap[(f >> 25) & 7];
 				}
 
+				if (attr=='N')
+					attr='T';
+
 				string_append_c(s, '%');
 				string_append_c(s, attr);
 			}