Changeset 557 for libcaca/trunk/cacaTweet

Timestamp:

Mar 8, 2006, 11:29:00 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Make output drivers more error resilient when handling UTF-32 characters, by simply ignoring everything non ASCII :-)

Location:

libcaca/trunk/caca

Files:

• driver_conio.c (modified) (1 diff)
• driver_gl.c (modified) (7 diffs)
• driver_ncurses.c (modified) (1 diff)
• driver_slang.c (modified) (2 diffs)
• driver_win32.c (modified) (1 diff)
• driver_x11.c (modified) (2 diffs)

libcaca/trunk/caca/driver_conio.c

@@ -104 +104 @@
     for(n = kk->qq->height * kk->qq->width; n--; )
     {
-        *screen++ = *chars++ & 0x7f;
+        uint32_t c = *chars++;
+
+        if(c > 0x00000020 && c < 0x00000080)
+            *screen++ = (char)c;
+        else
+            *screen++ = ' ';
+
         *screen++ = *attr++;
     }

libcaca/trunk/caca/driver_gl.c

@@ -79 +79 @@
     float font_width, font_height;
     float incx, incy;
-    int id[94];
+    int id[128 - 32];
     unsigned char bit;
     unsigned char mouse_changed, mouse_clicked;
@@ -165 +165 @@
     glEnable(GL_TEXTURE_2D);
 
-    for(i = 0; i < 94; i++)
-    {
-        glGenTextures(1, (GLuint*)&kk->drv.p->id[i]);
-        glBindTexture(GL_TEXTURE_2D, kk->drv.p->id[i]);
+    for(i = 32; i < 128; i++)
+    {
+        glGenTextures(1, (GLuint*)&kk->drv.p->id[i - 32]);
+        glBindTexture(GL_TEXTURE_2D, kk->drv.p->id[i - 32]);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -175 +175 @@
     }
 
-    for(i = 0; i < 94; i++)
+    for(i = 32; i < 128; i++)
     {
         glDisable(GL_TEXTURE_2D);
@@ -182 +182 @@
         glColor3f(1, 1, 1);
         glRasterPos2f(0, 15);
-        glutBitmapCharacter(GLUT_BITMAP_9_BY_15, i + 32);
+        glutBitmapCharacter(GLUT_BITMAP_9_BY_15, i);
 
         glEnable(GL_TEXTURE_2D);
-        glBindTexture(GL_TEXTURE_2D, kk->drv.p->id[i]);
+        glBindTexture(GL_TEXTURE_2D, kk->drv.p->id[i - 32]);
         glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB,
                          0, kk->drv.p->height - 16, 16, 16, 0);
@@ -237 +237 @@
                 glVertex2f(x, y);
                 glVertex2f(x + kk->drv.p->font_width, y);
-                glVertex2f(x + kk->drv.p->font_width, y + kk->drv.p->font_height);
+                glVertex2f(x + kk->drv.p->font_width,
+                           y + kk->drv.p->font_height);
                 glVertex2f(x, y + kk->drv.p->font_height);
             glEnd();
@@ -260 +261 @@
         for(x = 0; x < kk->drv.p->width; x += kk->drv.p->font_width)
         {
-            if(*chars != (uint32_t)' ')
+            uint32_t c = *chars++;
+
+            if(c > 0x00000020 && c < 0x00000080)
             {
-                char ch = *chars & 0x7f;
-
-                /* FIXME: check ch bounds */
-                glBindTexture(GL_TEXTURE_2D, kk->drv.p->id[ch - 32]);
+                glBindTexture(GL_TEXTURE_2D, kk->drv.p->id[c - 32]);
                 glColor4bv(gl_bgpal[attr[0] & 0xf]);
                 glBegin(GL_QUADS);
@@ -280 +280 @@
 
             attr++;
-            chars++;
         }
         line++;

libcaca/trunk/caca/driver_ncurses.c

@@ -193 +193 @@
         for(x = kk->qq->width; x--; )
         {
+            uint32_t c = *chars++;
+
             attrset(kk->drv.p->attr[*attr++]);
-            addch(*chars++ & 0x7f);
+            if(c > 0x00000020 && c < 0x00000080)
+                addch((char)c);
+            else
+                addch(' ');
         }
     }

libcaca/trunk/caca/driver_slang.c

@@ -204 +204 @@
         for(x = kk->qq->width; x--; )
         {
+            uint32_t c = *chars++;
+
 #if defined(OPTIMISE_SLANG_PALETTE)
+            uint8_t fgcolor = *attr & 0xf;
+            uint8_t bgcolor = *attr >> 4;
+
             /* If foreground == background, just don't use this colour
              * pair, and print a space instead of the real character. */
-            uint8_t fgcolor = *attr & 0xf;
-            uint8_t bgcolor = *attr >> 4;
             if(fgcolor != bgcolor)
             {
                 SLsmg_set_color(slang_assoc[*attr++]);
-                SLsmg_write_char(*chars++ & 0x7f);
+                if(c > 0x00000020 && 0x00000080)
+                    SLsmg_write_char((char)c);
+                else
+                    SLsmg_write_char(' ');
             }
             else
@@ -225 +231 @@
                 SLsmg_set_color(slang_assoc[fgcolor + 16 * bgcolor]);
                 SLsmg_write_char(' ');
-                chars++;
                 attr++;
             }
 #else
             SLsmg_set_color(*attr++);
-            SLsmg_write_char(*chars++ & 0x7f);
+            if(c > 0x00000020 && 0x00000080)
+                SLsmg_write_char((char)c);
+            else
+                SLsmg_write_char(' ');
 #endif
         }

libcaca/trunk/caca/driver_win32.c

@@ -199 +199 @@
     for(i = 0; i < kk->qq->width * kk->qq->height; i++)
     {
-        kk->drv.p->buffer[i].Char.AsciiChar = kk->qq->chars[i] & 0x7f;
+        uint32_t c = kk->qq->chars[i];
+
+        if(c > 0x00000020 && c < 0x00000080)
+            kk->drv.p->buffer[i].Char.AsciiChar = (char)c;
+        else
+            kk->drv.p->buffer[i].Char.AsciiChar = ' ';
+
         kk->drv.p->buffer[i].Attributes =
                 win32_fg_palette[kk->qq->attr[i] & 0xf]

libcaca/trunk/caca/driver_x11.c

@@ -272 +272 @@
     for(y = 0; y < kk->qq->height; y++)
     {
+        unsigned int yoff = (y + 1) * kk->drv.p->font_height
+                                    - kk->drv.p->font_offset;
+
         for(x = 0; x < kk->qq->width; x += len)
         {
@@ -281 +284 @@
 
             /* Skip spaces */
-            if(chars[0] == ' ')
+            if(chars[0] <= 0x00000020 || chars[0] >= 0x00000080)
                 continue;
 
-            buffer[0] = chars[0] & 0x7f;
+            buffer[0] = (char)chars[0];
 
             while(x + len < kk->qq->width
                    && (attr[len] & 0xf) == (attr[0] & 0xf))
             {
-                buffer[len] = chars[len] & 0x7f;
+                if(chars[len] > 0x00000020 && chars[len] < 0x00000080)
+                    buffer[len] = (char)chars[len];
+                else
+                    buffer[len] = ' ';
                 len++;
             }
 
-            XSetForeground(kk->drv.p->dpy, kk->drv.p->gc, kk->drv.p->colors[attr[0] & 0xf]);
+            XSetForeground(kk->drv.p->dpy, kk->drv.p->gc,
+                           kk->drv.p->colors[attr[0] & 0xf]);
             XDrawString(kk->drv.p->dpy, kk->drv.p->pixmap, kk->drv.p->gc,
-                        x * kk->drv.p->font_width,
-                        (y + 1) * kk->drv.p->font_height - kk->drv.p->font_offset,
-                        buffer, len);
-        }
-    }
-
-    XCopyArea(kk->drv.p->dpy, kk->drv.p->pixmap, kk->drv.p->window, kk->drv.p->gc, 0, 0,
+                        x * kk->drv.p->font_width, yoff, buffer, len);
+        }
+    }
+
+    XCopyArea(kk->drv.p->dpy, kk->drv.p->pixmap, kk->drv.p->window,
+              kk->drv.p->gc, 0, 0,
               kk->qq->width * kk->drv.p->font_width,
               kk->qq->height * kk->drv.p->font_height,