Changeset 159 for libcaca/trunk/libee/io.cTweet

Timestamp:

Nov 12, 2003, 10:18:50 PM (19 years ago)

Author:

Sam Hocevar

Message:

• libee/ee.h: + Added ee_color_names[] containing our 16 color names.
• libee/ee.c: + Extended our color set to the full 16 instead of 10. + Precalculate ncurses attributes.
• libee/graphics.c: + Clip color value in ee_set_color(). + Clip characters in ee_putchar(). + Partially clip characters in ee_putstr(), overflows aren't checked yet.
• libee/ee_internals.h: + New file to share extern variables within libee.

• test/demo.c: + Added a simple demo_color() to output all colors. + Replaced four ee_draw_line() with ee_draw_thin_box(). + Replaced x1, y1, x2 etc. with xa, ya, xb etc. because <math.h> already

defines y1.

+ Randomized colours from 0 to 15 instead of 1 to 10.

• src/Makefiles.am: + Added -lm to the ttyvaders linking flags because of the intro.

• README BUGS TODO: + Updated.

File:

• libcaca/trunk/libee/io.c (modified) (2 diffs)

libcaca/trunk/libee/io.c

@@ -23 +23 @@
 #include "config.h"
 
-#ifdef USE_SLANG
+#if defined(USE_SLANG)
 #   include <slang.h>
-#elif USE_NCURSES
+#elif defined(USE_NCURSES)
 #   include <curses.h>
-#elif USE_CONIO
+#elif defined(USE_CONIO)
 #   include <conio.h>
 #else
@@ -34 +34 @@
 
 #include "ee.h"
+#include "ee_internals.h"
 
 char ee_get_key(void)
 {
-#ifdef USE_SLANG
-    if(SLang_input_pending(0))
-    {
-        return SLang_getkey();
-    }
-#elif USE_NCURSES
+#if defined(USE_SLANG)
+    return SLang_input_pending(0) ? SLang_getkey() : 0;
+
+#elif defined(USE_NCURSES)
     char key = getch();
+    return key != ERR ? key : 0;
 
-    if(key != ERR)
-    {
-        return key;
-    }
-#elif USE_CONIO
+#elif defined(USE_CONIO)
     return _conio_kbhit() ? getch() : 0;
 
 #endif
-
-    return 0;
 }