Changeset 883 for libcaca/trunk/cucul/import.cTweet

Timestamp:

Apr 25, 2006, 8:16:42 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Really fixed bold in ANSI loader, and removed dead code.

File:

• libcaca/trunk/cucul/import.c (modified) (6 diffs)

libcaca/trunk/cucul/import.c

@@ -200 +200 @@
 unsigned char _get_ansi_command(unsigned char const *buffer, int size);
 int _parse_tuple(unsigned int *ret, unsigned char const *buffer, int size);
-void _manage_modifiers(int i, int *fg, int *bg, int *save_fg, int *save_bg);
+void _manage_modifiers(int i, int *fg, int *bg, int *save_fg, int *save_bg, int *bold);
 
 static cucul_canvas_t *import_ansi(void const *data, unsigned int size)
@@ -213 +213 @@
     int save_x = 0, save_y = 0;
     unsigned int j, add = 0;
-    int fg, bg, save_fg, save_bg;
+    int fg, bg, save_fg, save_bg, bold;
 
     fg = save_fg = CUCUL_COLOR_LIGHTGRAY;
     bg = save_bg = CUCUL_COLOR_BLACK;
+    bold = 0;
 
     cv = cucul_create_canvas(width, height);
@@ -285 +286 @@
             case 'm':
                 for(j = 0; j < count; j++)
-                    _manage_modifiers(tuple[j], &fg, &bg, &save_fg, &save_bg);
+                    _manage_modifiers(tuple[j], &fg, &bg, &save_fg, &save_bg, &bold);
+                if(bold && fg < 8)
+                    fg += 8;
+                if(bold && bg < 8)
+                    bg += 8;
                 cucul_set_color(cv, fg, bg);
                 break;
@@ -306 +311 @@
             else
             {
-                if((buffer[i] >= 0x20) || (buffer[i] <= 0x7E))
-                {
-                    _cucul_putchar32(cv, x, y,_cucul_cp437_to_utf32(buffer[i]));
-
-                    //  cucul_putchar(cv, x, y, buffer[i]);
-                }
-                else
-                    cucul_putchar(cv, x, y, '?');
+                _cucul_putchar32(cv, x, y,_cucul_cp437_to_utf32(buffer[i]));
                 x++;
             }
@@ -391 +389 @@
 
 
-void _manage_modifiers(int i, int *fg, int *bg, int *save_fg, int *save_bg)
+void _manage_modifiers(int i, int *fg, int *bg, int *save_fg, int *save_bg, int *bold)
 {
     static uint8_t const ansi2cucul[] =
@@ -422 +420 @@
         *fg = CUCUL_COLOR_DEFAULT;
         *bg = CUCUL_COLOR_DEFAULT;
+        *bold = 0;
         break;
     case 1: /* BOLD */
-        if(*fg < 8)
-            *fg += 8;
-        if(*bg < 8)
-            *bg += 8;
+        *bold = 1;
         break;
     case 4: // Underline