Changeset 231Tweet

Timestamp:

Nov 29, 2003, 3:41:37 PM (17 years ago)

Author:

Sam Hocevar

Message:

• configure.ac: + Default to ncurses, not slang, because slang only has 128 colour pairs.
• src/caca.c: + Disable scrolling to avoid hashmap scrolling optimization code.
• src/graphics.c: + Swap fg and bg in the colour pair indexing, so that bg is always

right.

+ Disable alt charset support to exploit my patched slang.

Location:

libcaca/trunk

Files:

• NOTES (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• src/caca.c (modified) (1 diff)
• src/graphics.c (modified) (8 diffs)

libcaca/trunk/NOTES

@@ -118 +118 @@
    o  S-Lang:
 
+      256 character pairs are definable, but only 128 can be used. This is
+      because slsmg.c's This_Color variable uses its 8th bit to indicate an
+      alternate character set. Replacing a few 0x7F with 0xFF in sldisply.c
+      works around the problem but gets rid of the alternate charset.
+
    o  MS-DOS: all bright colours, bright backgrounds, and bright combinations
       work using <conio.h>. No need to kludge anything.

libcaca/trunk/configure.ac

@@ -18 +18 @@
 AC_EGREP_CPP(foo,foo)
 
+AC_ARG_ENABLE(ncurses,
+  [  --enable-ncurses        ncurses graphics support (default enabled)])
 AC_ARG_ENABLE(slang,
-  [  --enable-slang          slang graphics support (default enabled)])
-AC_ARG_ENABLE(ncurses,
-  [  --enable-ncurses        ncurses graphics support (default disabled)])
+  [  --enable-slang          slang graphics support (default disabled)])
 AC_ARG_ENABLE(conio,
   [  --enable-conio          DOS conio.h graphics support (default disabled)])
@@ -41 +41 @@
   AC_DEFINE(USE_CONIO, 1, Define if the backend driver is conio.h)
   USE_CONIO=:
-elif test "${enable_ncurses}" = "yes"; then
+elif test "${enable_slang}" = "yes"; then
+  AC_CHECK_HEADER(slang.h,:,AC_MSG_ERROR([cannot find slang headers]))
+  AC_CHECK_LIB(slang,SLkp_init,:,AC_MSG_ERROR([cannot find slang library]))
+  AC_DEFINE(USE_SLANG, 1, Define if the backend driver is slang)
+  USE_SLANG=:
+elif test "${enable_ncurses}" != "no"; then
   AC_CHECK_HEADER(ncurses.h,:,AC_MSG_ERROR([cannot find ncurses headers]))
   AC_CHECK_LIB(ncurses,initscr,:,AC_MSG_ERROR([cannot find ncurses library]))
   AC_DEFINE(USE_NCURSES, 1, Define if the backend driver is ncurses)
   USE_NCURSES=:
-elif test "${enable_slang}" != "no"; then
-  AC_CHECK_HEADER(slang.h,:,AC_MSG_ERROR([cannot find slang headers]))
-  AC_CHECK_LIB(slang,SLkp_init,:,AC_MSG_ERROR([cannot find slang library]))
-  AC_DEFINE(USE_SLANG, 1, Define if the backend driver is slang)
-  USE_SLANG=:
 else
   AC_MSG_ERROR([could not find any terminal graphics interface])

libcaca/trunk/src/caca.c

@@ -97 +97 @@
     SLtt_set_mouse_mode(1, 0);
     SLsmg_refresh();
+
+    /* Disable scrolling so that hashmap scrolling optimization code
+     * does not cause ugly refreshes due to slow terminals */
+    SLtt_Term_Cannot_Scroll = 1;
 
 #elif defined(USE_NCURSES)

libcaca/trunk/src/graphics.c

@@ -40 +40 @@
 #endif
 
+#ifdef HAVE_INTTYPES_H
+#   include <inttypes.h>
+#endif
+
 #include <stdio.h> /* BUFSIZ */
 #include <string.h>
@@ -65 +69 @@
     _caca_bgcolor = bgcolor;
 #if defined(USE_SLANG)
-    SLsmg_set_color(fgcolor + 16 * bgcolor);
+    SLsmg_set_color((bgcolor + 16 * fgcolor) /*% 128*/);
 #elif defined(USE_NCURSES)
     attrset(_caca_attr[fgcolor + 16 * bgcolor]);
@@ -135 +139 @@
 #if defined(USE_SLANG)
     SLsmg_gotorc(y, x);
-    SLsmg_write_string(s);
+    SLsmg_write_string((char *)(intptr_t)s);
 #elif defined(USE_NCURSES)
     move(y, x);
@@ -199 +203 @@
     static char *slang_colors[16] =
     {
+        /* Standard colours */
         "black",
         "blue",
@@ -207 +212 @@
         "brown",
         "lightgray",
+        /* Bright colours */
         "gray",
         "brightblue",
@@ -219 +225 @@
     int fg, bg;
 
-    for(bg = 0; bg < 16; bg++)
-        for(fg = 0; fg < 16; fg++)
+    for(fg = 0; fg < 16; fg++)
+        for(bg = 0; bg < 16; bg++)
         {
-            int i = fg + 16 * bg;
+            int i = bg + 16 * fg;
             SLtt_set_color(i, NULL, slang_colors[fg], slang_colors[bg]);
         }
 
+    /* Disable alt charset support so that we get all 256 colour pairs */
+    SLtt_Has_Alt_Charset = 0;
+
 #elif defined(USE_NCURSES)
     static int curses_colors[] =
     {
+        /* Standard curses colours */
         COLOR_BLACK,
         COLOR_BLUE,
@@ -253 +263 @@
     start_color();
 
+    /* If COLORS == 16, it means the terminal supports full bright colours
+     * using setab and setaf (will use \e[90m \e[91m etc. for colours >= 8),
+     * we can build 16*16 colour pairs.
+     * If COLORS == 8, it means the terminal does not know about bright
+     * colours and we need to get them through A_BOLD and A_BLINK (\e[1m
+     * and \e[5m). We can only build 8*8 colour pairs. */
     max = COLORS >= 16 ? 16 : 8;
 
@@ -272 +288 @@
                 _caca_attr[fg + 16 * (bg + 8)] = A_BLINK | COLOR_PAIR(col);
                 /* Bright fg on bright bg */
-                _caca_attr[fg + 8 + 16 * (bg + 8)] = A_BLINK | A_BOLD | COLOR_PAIR(col);
+                _caca_attr[fg + 8 + 16 * (bg + 8)] = A_BLINK | A_BOLD
+                                                             | COLOR_PAIR(col);
             }
         }