Changeset 335Tweet

Timestamp:

Jan 11, 2004, 2:45:57 AM (19 years ago)

Author:

Sam Hocevar

Message:

• configure.ac: + Check for gettimeofday().
• src/time.c: + Created _caca_time(). + Ported _caca_getticks() to the Win32 API.
• src/caca.c: + Properly builds on Win32.
• test/event.c: + Added <stdlib.h> because we use malloc().

Location:

libcaca/trunk

Files:

• configure.ac (modified) (1 diff)
• src/caca.c (modified) (7 diffs)
• src/caca_internals.h (modified) (2 diffs)
• src/graphics.c (modified) (2 diffs)
• src/io.c (modified) (3 diffs)
• src/time.c (modified) (2 diffs)
• test/event.c (modified) (1 diff)

libcaca/trunk/configure.ac

@@ -30 +30 @@
 
 AC_CHECK_HEADERS(inttypes.h endian.h)
-AC_CHECK_FUNCS(vsnprintf getenv putenv strcasecmp usleep Sleep)
+AC_CHECK_FUNCS(vsnprintf getenv putenv strcasecmp usleep Sleep gettimeofday)
 AC_CHECK_LIB(m, sin, MATH_LIBS="${MATH_LIBS} -lm")
 

libcaca/trunk/src/caca.c

@@ -48 +48 @@
 #if defined(USE_X11)
 #   include <X11/Xlib.h>
+#endif
+#if defined(USE_WIN32)
+#   include <windows.h>
 #endif
 
@@ -157 +160 @@
 #endif
 #if defined(USE_X11)
-    /* Nothing to do */
+    if(_caca_driver == CACA_DRIVER_X11)
+    {
+        /* Nothing to do */
+    }
+    else
+#endif
+#if defined(USE_WIN32)
+    if(_caca_driver == CACA_DRIVER_WIN32)
+    {
+        /* Nothing to do */
+        printf("initialising win32 driver\n");
+    }
+    else
 #endif
     {
@@ -374 +389 @@
     else
 #endif
+#if defined(USE_WIN32)
+    if(_caca_driver == CACA_DRIVER_WIN32)
+    {
+        /* Nothing to do */
+    }
+    else
+#endif
     {
         /* Dummy */
@@ -391 +413 @@
     if(var && *var)
     {
+#if defined(USE_WIN32)
+        if(!strcasecmp(var, "win32"))
+            _caca_driver = CACA_DRIVER_WIN32;
+        else
+#endif
 #if defined(USE_CONIO)
         if(!strcasecmp(var, "conio"))
@@ -417 +444 @@
 #endif
 
+#if defined(USE_WIN32)
+    _caca_driver = CACA_DRIVER_WIN32;
+    return;
+#endif
 #if defined(USE_CONIO)
     _caca_driver = CACA_DRIVER_CONIO;
@@ -488 +519 @@
 static void caca_init_terminal(void)
 {
-#if defined(HAVE_GETENV) && defined(HAVE_PUTENV)
+#if defined(HAVE_GETENV) && defined(HAVE_PUTENV) && \
+     (defined(USE_SLANG) || defined(USE_NCURSES))
     char *term, *colorterm, *other;
+#endif
 
 #if defined(USE_SLANG)
@@ -499 +532 @@
     return;
 
+#if defined(HAVE_GETENV) && defined(HAVE_PUTENV) && \
+     (defined(USE_SLANG) || defined(USE_NCURSES))
     term = getenv("TERM");
     colorterm = getenv("COLORTERM");

libcaca/trunk/src/caca_internals.h

@@ -46 +46 @@
     CACA_DRIVER_X11 = 4,
 #endif
+#if defined(USE_WIN32)
+    CACA_DRIVER_WIN32 = 5,
+#endif
     CACA_DRIVER_NONE = 0
 };
@@ -65 +68 @@
 
 /* Timer functions */
+extern void _caca_sleep(unsigned int);
 extern unsigned int _caca_getticks(struct caca_timer *);
 

libcaca/trunk/src/graphics.c

@@ -62 +62 @@
 #include <string.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <stdarg.h>
 
@@ -936 +935 @@
         ticks += _caca_getticks(&timer))
     {
-#if defined(HAVE_USLEEP)
-        usleep(IDLE_USEC);
-#elif defined(HAVE_SLEEP)
-        Sleep(IDLE_USEC / 1000);
-#else
-        SLEEP
-#endif
+        _caca_sleep(IDLE_USEC);
     }
 

libcaca/trunk/src/io.c

@@ -48 +48 @@
 #   include <X11/keysym.h>
 #endif
-
-#include <unistd.h>
+#if defined(USE_WIN32)
+#   include <windows.h>
+#endif
 
 #include "caca.h"
@@ -122 +123 @@
             return event;
 
-#if defined(HAVE_USLEEP)
-        usleep(10000);
-#elif defined(HAVE_SLEEP)
-        Sleep(10);
-#else
-        SLEEP
-#endif
+        _caca_sleep(10000);
     }
 }
@@ -543 +538 @@
     else
 #endif
+#if defined(USE_WIN32)
+    if(_caca_driver == CACA_DRIVER_WIN32)
+    {
+        return CACA_EVENT_NONE;
+    }
+    else
+#endif
     {
         /* Dummy */

libcaca/trunk/src/time.c

@@ -34 +34 @@
 #include <time.h>
 
+#if defined(USE_WIN32)
+#   include <windows.h>
+#endif
+
+#include <unistd.h>
+
 #include "caca.h"
 #include "caca_internals.h"
 
+void _caca_sleep(unsigned int usec)
+{
+#if defined(HAVE_USLEEP)
+        usleep(usec);
+#elif defined(HAVE_SLEEP)
+        Sleep(usec / 1000);
+#else
+        SLEEP
+#endif
+}
+
 unsigned int _caca_getticks(struct caca_timer *timer)
 {
+#if defined(HAVE_GETTIMEOFDAY)
     struct timeval tv;
+#elif defined(USE_WIN32)
+    static long long int freq = -1LL;
+    long long int usec;
+#endif
     unsigned int ticks = 0;
+    int new_sec, new_usec;
 
+#if defined(HAVE_GETTIMEOFDAY)
     gettimeofday(&tv, NULL);
+    new_sec = tv.tv_sec;
+    new_usec = tv.tv_usec;
+#elif defined(USE_WIN32)
+    if(freq == -1LL)
+    {
+        if(!QueryPerformanceFrequency((LARGE_INTEGER *)&freq))
+            freq = 0;
+    }
+
+    QueryPerformanceCounter((LARGE_INTEGER *)&usec);
+    new_sec = usec / freq;
+    new_usec = usec % freq;
+#endif
 
     if(timer->last_sec != 0)
@@ -48 +85 @@
         /* If the delay was greater than 60 seconds, return 10 seconds
          * otherwise we may overflow our ticks counter. */
-        if(tv.tv_sec >= timer->last_sec + 60)
+        if(new_sec >= timer->last_sec + 60)
             ticks = 60 * 1000000;
         else
         {
-            ticks = (tv.tv_sec - timer->last_sec) * 1000000;
-            ticks += tv.tv_usec;
+            ticks = (new_sec - timer->last_sec) * 1000000;
+            ticks += new_usec;
             ticks -= timer->last_usec;
         }
     }
 
-    timer->last_sec = tv.tv_sec;
-    timer->last_usec = tv.tv_usec;
+    timer->last_sec = new_sec;
+    timer->last_usec = new_usec;
 
     return ticks;

libcaca/trunk/test/event.c

@@ -26 +26 @@
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "caca.h"