Changeset 330 for libcacaTweet

Timestamp:

Jan 8, 2004, 7:40:29 PM (18 years ago)

Author:

Sam Hocevar

Message:

• test/event.c: + Display at least two digits for keycodes.
• configure.ac: + ScreenUpdate? is actually mandatory for our conio driver.

Location:

libcaca/trunk

Files:

• configure.ac (modified) (4 diffs)
• src/graphics.c (modified) (2 diffs)
• test/event.c (modified) (1 diff)

libcaca/trunk/configure.ac

@@ -33 +33 @@
 
 if test "${enable_conio}" != "no"; then
+  ac_cv_my_have_conio="no"
   AC_CHECK_HEADERS(conio.h,
-   [ac_cv_my_have_conio="yes"
-    AC_MSG_CHECKING(for ScreenUpdate in pc.h)
+   [AC_MSG_CHECKING(for ScreenUpdate in pc.h)
     AC_EGREP_HEADER(ScreenUpdate,pc.h,
-     [AC_MSG_RESULT(yes)
+     [ac_cv_my_have_conio="yes"
+      AC_MSG_RESULT(yes)
       AC_DEFINE(SCREENUPDATE_IN_PC_H, 1,
-                Define if <pc.h> defines ScreenUpdate.)],
-     [AC_MSG_RESULT(no)])
-    AC_DEFINE(USE_CONIO, 1, Define to activate the conio.h backend driver)
-    CACA_DRIVERS="${CACA_DRIVERS} conio"],
-   [ac_cv_my_have_conio="no"])
+                Define if <pc.h> defines ScreenUpdate.)
+      AC_DEFINE(USE_CONIO, 1, Define to activate the conio.h backend driver)
+      CACA_DRIVERS="${CACA_DRIVERS} conio"],
+     [AC_MSG_RESULT(no)])])
   if test "${ac_cv_my_have_conio}" = "no" -a "${enable_conio}" = "yes"; then
     AC_MSG_ERROR([cannot find conio.h])
@@ -50 +50 @@
 
 if test "${enable_slang}" != "no"; then
+  ac_cv_my_have_slang="no"
   AC_CHECK_HEADERS(slang.h slang/slang.h,
-   ac_cv_my_have_slang="no"
    [AC_CHECK_LIB(slang, SLkp_init,
      [ac_cv_my_have_slang="yes"
@@ -82 +82 @@
 
 if test "${enable_ncurses}" != "no"; then
+  ac_cv_my_have_ncurses="no"
   AC_CHECK_HEADERS(ncurses.h,
    [AC_CHECK_LIB(ncurses, initscr,
@@ -87 +88 @@
       AC_DEFINE(USE_NCURSES, 1, Define to activate the ncurses backend driver)
       CACA_LIBS="${CACA_LIBS} -lncurses"
-      CACA_DRIVERS="${CACA_DRIVERS} ncurses"],
-     [ac_cv_my_have_ncurses="no"])],
-   [ac_cv_my_have_ncurses="no"])
+      CACA_DRIVERS="${CACA_DRIVERS} ncurses"])])
   if test "${ac_cv_my_have_ncurses}" = "no" -a "${enable_ncurses}" = "yes"; then
     AC_MSG_ERROR([cannot find ncurses development files])

libcaca/trunk/src/graphics.c

@@ -325 +325 @@
         data[0] = c;
         data[1] = (_caca_bgcolor << 4) | _caca_fgcolor;
-//        gotoxy(x + 1, y + 1);
-//        putch(c);
         break;
 #endif
@@ -410 +408 @@
             *charbuf++ = (_caca_bgcolor << 4) | _caca_fgcolor;
         }
-//        gotoxy(x + 1, y + 1);
-//        cputs(s);
         break;
 #endif

libcaca/trunk/test/event.c

@@ -92 +92 @@
         break;
     case CACA_EVENT_KEY_PRESS:
-        caca_printf(x, y, "CACA_EVENT_KEY_PRESS 0x%x",
+        caca_printf(x, y, "CACA_EVENT_KEY_PRESS 0x%02x",
                     event & 0x00ffffff);
         break;
     case CACA_EVENT_KEY_RELEASE:
-        caca_printf(x, y, "CACA_EVENT_KEY_RELEASE 0x%x",
+        caca_printf(x, y, "CACA_EVENT_KEY_RELEASE 0x2%x",
                     event & 0x00ffffff);
         break;