Changeset 724 for libcaca/trunk/caca/driver_slang.cTweet

Timestamp:

Apr 6, 2006, 3:41:56 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Store colour information on 32 bits, for future 12-bit colour support.

File:

• libcaca/trunk/caca/driver_slang.c (modified) (4 diffs)

libcaca/trunk/caca/driver_slang.c

@@ -203 +203 @@
 {
     int x, y;
-    uint8_t *attr = kk->qq->attr;
+    uint32_t *attr = kk->qq->attr;
     uint32_t *chars = kk->qq->chars;
     for(y = 0; y < (int)kk->qq->height; y++)
@@ -213 +213 @@
 
 #if defined(OPTIMISE_SLANG_PALETTE)
-            uint8_t fgcolor = *attr & 0xf;
-            uint8_t bgcolor = *attr >> 4;
+            uint8_t fgcolor = _cucul_rgba32_to_ansi4fg(*attr);
+            uint8_t bgcolor = _cucul_rgba32_to_ansi4bg(*attr);
 
             /* If foreground == background, just don't use this colour
@@ -220 +220 @@
             if(fgcolor != bgcolor)
             {
-                SLsmg_set_color(slang_assoc[*attr++]);
+                SLsmg_set_color(slang_assoc[_cucul_rgba32_to_ansi8(*attr++)]);
                 slang_write_utf32(c);
             }
@@ -237 +237 @@
             }
 #else
-            SLsmg_set_color(*attr++);
+            SLsmg_set_color(_cucul_rgba32_to_ansi8(*attr++));
             slang_write_utf32(c);
 #endif