Changeset 2143Tweet

Timestamp:

Dec 16, 2007, 1:08:27 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Require libcaca >= 0.99beta13.
• Update event code to comply with the last API change.

Location:

neercs/trunk

Files:

• configure.ac (modified) (1 diff)
• src/main.c (modified) (3 diffs)

neercs/trunk/configure.ac

@@ -27 +27 @@
 
 CACA="no"
-PKG_CHECK_MODULES(CACA, caca >= 0.99.beta10,
+PKG_CHECK_MODULES(CACA, caca >= 0.99.beta13,
  [CACA="yes"],
  [AC_MSG_RESULT(no)
-  AC_MSG_ERROR([you need libcaca version 0.99.beta10 or later])])
+  AC_MSG_ERROR([you need libcaca version 0.99.beta13 or later])])
 
 AC_CHECK_HEADERS(stdio.h pty.h)

neercs/trunk/src/main.c

@@ -165 +165 @@
         /* Get events, if any */
         ret = caca_get_event(dp, CACA_EVENT_ANY, &ev, 0);
-        if(ret && (ev.type & CACA_EVENT_KEY_PRESS))
-        {
+        if(ret && (caca_get_event_type(&ev) & CACA_EVENT_KEY_PRESS))
+        {
+            unsigned int c = caca_get_event_key_ch(&ev);
             if(command)
             {
                 command = 0;
 
-                switch(ev.data.key.ch)
+                switch(c)
                 {
                 case 0x01: //CACA_KEY_CTRL_A:
@@ -202 +203 @@
             else
             {
-                switch(ev.data.key.ch)
+                switch(c)
                 {
                 case 0x01: //CACA_KEY_CTRL_A:
@@ -215 +216 @@
                     write(screen[pty].fd, "\x1b[D", 3); break;
                 default:
-                    write(screen[pty].fd, &ev.data.key.ch, 1); break;
+                    write(screen[pty].fd, &c, 1); break;
                 }
             }
         }
-        else if(ret && (ev.type & CACA_EVENT_RESIZE))
+        else if(ret && (caca_get_event_type(&ev) & CACA_EVENT_RESIZE))
         {
             w = cucul_get_canvas_width(cv);