Changeset 724 for libcaca/trunk/cacaTweet

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.

Location:

libcaca/trunk/caca

Files:

• driver_conio.c (modified) (2 diffs)
• driver_gl.c (modified) (4 diffs)
• driver_ncurses.c (modified) (2 diffs)
• driver_raw.c (modified) (2 diffs)
• driver_slang.c (modified) (4 diffs)
• driver_vga.c (modified) (2 diffs)
• driver_win32.c (modified) (1 diff)
• driver_x11.c (modified) (3 diffs)

libcaca/trunk/caca/driver_conio.c

@@ -99 +99 @@
 {
     char *screen = kk->drv.p->screen;
-    uint8_t *attr = kk->qq->attr;
+    uint32_t *attr = kk->qq->attr;
     uint32_t *chars = kk->qq->chars;
     int n;
@@ -106 +106 @@
     {
         *screen++ = _cucul_utf32_to_cp437(*chars++);
-        *screen++ = *attr++;
+        *screen++ = _cucul_rgba32_to_ansi8(*attr++);
     }
 #   if defined(SCREENUPDATE_IN_PC_H)

libcaca/trunk/caca/driver_gl.c

@@ -246 +246 @@
     for(y = 0; y < kk->drv.p->height; y += kk->drv.p->font_height)
     {
-        uint8_t *attr = kk->qq->attr + line * kk->qq->width;
+        uint32_t *attr = kk->qq->attr + line * kk->qq->width;
 
         for(x = 0; x < kk->drv.p->width; x += kk->drv.p->font_width)
         {
             glDisable(GL_TEXTURE_2D);
-            glColor4bv(gl_bgpal[attr[0] >> 4]);
+            glColor4bv(gl_bgpal[_cucul_rgba32_to_ansi4bg(*attr++)]);
             glBegin(GL_QUADS);
                 glVertex2f(x, y);
@@ -259 +259 @@
                 glVertex2f(x, y + kk->drv.p->font_height);
             glEnd();
-
-            attr++;
         }
 
@@ -274 +272 @@
     for(y = 0; y < kk->drv.p->height; y += kk->drv.p->font_height)
     {
-        uint8_t *attr = kk->qq->attr + line * kk->qq->width;
+        uint32_t *attr = kk->qq->attr + line * kk->qq->width;
         uint32_t *chars = kk->qq->chars + line * kk->qq->width;
 
@@ -284 +282 @@
             {
                 glBindTexture(GL_TEXTURE_2D, kk->drv.p->id[c - 32]);
-                glColor4bv(gl_bgpal[attr[0] & 0xf]);
+                glColor4bv(gl_bgpal[_cucul_rgba32_to_ansi4fg(*attr)]);
                 glBegin(GL_QUADS);
                     glTexCoord2f(0, kk->drv.p->sh);

libcaca/trunk/caca/driver_ncurses.c

@@ -191 +191 @@
 {
     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++)
@@ -198 +198 @@
         for(x = kk->qq->width; x--; )
         {
-            attrset(kk->drv.p->attr[*attr++]);
+            attrset(kk->drv.p->attr[_cucul_rgba32_to_ansi8(*attr++)]);
             ncurses_write_utf32(*chars++);
         }

libcaca/trunk/caca/driver_raw.c

@@ -56 +56 @@
 static void raw_display(caca_t *kk)
 {
-    uint8_t *attr = kk->qq->attr;
+    uint32_t *attr = kk->qq->attr;
     uint32_t *chars = kk->qq->chars;
     uint32_t w, h;
@@ -71 +71 @@
     {
         uint32_t c = *chars++;
-        uint8_t a = *attr++;
+        uint32_t a = *attr++;
 
-        fprintf(stdout, "%c%c%c%c%c", (c >> 24), (c >> 16) & 0xff,
-                                      (c >> 8) & 0xff, c & 0xff, a);
+        fprintf(stdout, "%c%c%c%c%c%c%c%c",
+                (c >> 24), (c >> 16) & 0xff, (c >> 8) & 0xff, c & 0xff,
+                (a >> 24), (a >> 16) & 0xff, (a >> 8) & 0xff, a & 0xff);
     }
 

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

libcaca/trunk/caca/driver_vga.c

@@ -117 +117 @@
 {
     char *screen = (char *)(intptr_t)0x000b8000;
-    uint8_t *attr = kk->qq->attr;
+    uint32_t *attr = kk->qq->attr;
     uint32_t *chars = kk->qq->chars;
     int n;
@@ -124 +124 @@
     {
         *screen++ = _cucul_utf32_to_cp437(*chars++);
-        *screen++ = *attr++;
+        *screen++ = _cucul_rgba32_to_ansi8(*attr++);
     }
 }

libcaca/trunk/caca/driver_win32.c

@@ -211 +211 @@
 
         kk->drv.p->buffer[i].Attributes =
-                win32_fg_palette[kk->qq->attr[i] & 0xf]
-                 | win32_bg_palette[kk->qq->attr[i] >> 4];
+                win32_fg_palette[_cucul_rgba32_to_ansi4fg(kk->qq->attr[i])]
+                 | win32_bg_palette[_cucul_rgba32_to_ansi4bg(kk->qq->attr[i])];
     }
 

libcaca/trunk/caca/driver_x11.c

@@ -260 +260 @@
         for(x = 0; x < kk->qq->width; x += len)
         {
-            uint8_t *attr = kk->qq->attr + x + y * kk->qq->width;
+            uint32_t *attr = kk->qq->attr + x + y * kk->qq->width;
+            uint8_t bg = _cucul_rgba32_to_ansi4bg(*attr);
 
             len = 1;
             while(x + len < kk->qq->width
-                   && (attr[len] >> 4) == (attr[0] >> 4))
+                   && _cucul_rgba32_to_ansi4bg(attr[len]) == bg)
                 len++;
 
             XSetForeground(kk->drv.p->dpy, kk->drv.p->gc,
-                           kk->drv.p->colors[attr[0] >> 4]);
+                           kk->drv.p->colors[_cucul_rgba32_to_ansi4bg(*attr)]);
             XFillRectangle(kk->drv.p->dpy, kk->drv.p->pixmap, kk->drv.p->gc,
                            x * kk->drv.p->font_width, y * kk->drv.p->font_height,
@@ -284 +285 @@
         for(x = 0; x < kk->qq->width; x++, chars++)
         {
-            uint8_t *attr = kk->qq->attr + x + y * kk->qq->width;
+            uint32_t *attr = kk->qq->attr + x + y * kk->qq->width;
 
             /* Skip spaces */
@@ -291 +292 @@
 
             XSetForeground(kk->drv.p->dpy, kk->drv.p->gc,
-                           kk->drv.p->colors[*attr & 0xf]);
+                           kk->drv.p->colors[_cucul_rgba32_to_ansi4fg(*attr)]);
 
             /* Plain ASCII, no problem. */