Changeset 335 for libcaca/trunk/src/caca.cTweet

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().

File:

• libcaca/trunk/src/caca.c (modified) (7 diffs)

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");