Changeset 487Tweet

Timestamp:

Jun 23, 2005, 12:06:42 AM (16 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Added Null driver and html3 exporter.

Location:

libcaca/trunk

Files:

• configure.ac (modified) (2 diffs)
• src/caca.c (modified) (4 diffs)
• src/caca.h (modified) (2 diffs)
• src/caca_internals.h (modified) (1 diff)
• src/event.c (modified) (1 diff)
• src/graphics.c (modified) (8 diffs)

libcaca/trunk/configure.ac

@@ -38 +38 @@
 AC_ARG_ENABLE(gl,
   [  --enable-gl             OpenGL support (autodetected)])
+AC_ARG_ENABLE(null,
+  [  --enable-null           Null driver support (autodetected)])
 
 dnl example programs features
@@ -139 +141 @@
 fi
 
+if test "${enable_null}" != "no"; then
+  ac_cv_my_have_null="yes"
+  AC_DEFINE(USE_NULL, 1, Define to activate the Null backend driver)
+  CACA_DRIVERS="${CACA_DRIVERS} null"
+fi
+
 if test "${enable_ncurses}" != "no"; then
   ac_cv_my_have_ncurses="no"

libcaca/trunk/src/caca.c

@@ -200 +200 @@
 #if defined(USE_GL)
     if(_caca_driver == CACA_DRIVER_GL)
+    {
+        /* Nothing to do */
+    }
+    else
+#endif
+#if defined(USE_NULL)
+    if(_caca_driver == CACA_DRIVER_NULL)
     {
         /* Nothing to do */
@@ -443 +450 @@
     else
 #endif
+#if defined(USE_NULL)
+    if(_caca_driver == CACA_DRIVER_NULL)
+    {
+        /* Nothing to do */
+    }
+    else
+#endif
     {
         /* Dummy */
@@ -490 +504 @@
         else
 #endif
+#if defined(USE_NULL)
+        if(!strcasecmp(var, "null"))
+          {
+            _caca_driver = CACA_DRIVER_NULL;
+          }
+        else
+#endif
+
             _caca_driver = CACA_DRIVER_NONE;
 
@@ -525 +547 @@
     return;
 #endif
+#if defined(USE_NULL)
+    _caca_driver = CACA_DRIVER_NULL;
+    return;
+#endif
+
     _caca_driver = CACA_DRIVER_NONE;
     return;

libcaca/trunk/src/caca.h

@@ -64 +64 @@
  *      - \c x11 uses the native X11 driver.
  *      - \c gl uses freeglut and opengl libraries.
+ *      - \c null uses nothing at all, and will display nothing as well.
  *
  *  \li \b CACA_GEOMETRY: set the video display size. The format of this
@@ -361 +362 @@
  *  @{ */
 char* caca_get_html(void);
+char* caca_get_html3(void);
 char* caca_get_irc(void);
 /*  @} */

libcaca/trunk/src/caca_internals.h

@@ -51 +51 @@
 #if defined(USE_GL)
     CACA_DRIVER_GL = 6,
+#endif
+#if defined(USE_NULL)
+    CACA_DRIVER_NULL = 7,
 #endif
     CACA_DRIVER_NONE = 0

libcaca/trunk/src/event.c

@@ -195 +195 @@
     unsigned int ticks;
 #endif
+#if defined(USE_NULL)
+    {
+      if(_caca_driver == CACA_DRIVER_NULL)
+        return CACA_EVENT_NONE;
+    }
+#endif
+
     unsigned int event = _lowlevel_event();
 

libcaca/trunk/src/graphics.c

@@ -404 +404 @@
         break;
 #endif
+#if defined(USE_NULL)
+    case CACA_DRIVER_NULL:
+        /* Nothing to do */
+        break;
+#endif
     default:
         break;
@@ -491 +496 @@
 #if defined(USE_GL)
     case CACA_DRIVER_GL:
+        break;
+#endif
+#if defined(USE_NULL)
+    case CACA_DRIVER_NULL:
         break;
 #endif
@@ -590 +599 @@
 #if defined(USE_GL)
     case CACA_DRIVER_GL:
+        break;
+#endif
+#if defined(USE_NULL)
+    case CACA_DRIVER_NULL:
         break;
 #endif
@@ -1048 +1061 @@
     else
 #endif
-
+#if defined(USE_NULL)
+      if(_caca_driver == CACA_DRIVER_NULL)
+        {
+          if(getenv("CACA_GEOMETRY") && *(getenv("CACA_GEOMETRY")))
+            sscanf(getenv("CACA_GEOMETRY"),
+                   "%ux%u", &_caca_width, &_caca_height);  
+          if(!_caca_width)
+            _caca_width = 80;
+          if(!_caca_height)
+            _caca_height = 32;
+        }
+      else
+#endif
     {
         /* Dummy */
@@ -1127 +1152 @@
         {
           glutDestroyWindow(gl_window);
+        }
+      else
+#endif
+#if defined(USE_NULL)
+      if(_caca_driver == CACA_DRIVER_NULL)
+        {
+          /* I'm bored to write 'nothing to do'.
+           * So I don't.
+           */
         }
       else
@@ -1510 +1544 @@
 else
 #endif
+#if defined(USE_NULL)
+      if(_caca_driver == CACA_DRIVER_NULL)
+        {
+          /* Do I told you about my cat ? */
+        }
+#endif
     {
         /* Dummy */
@@ -1630 +1670 @@
     }
     else
+#endif
+#if defined(USE_NULL)
+    if(_caca_driver == CACA_DRIVER_NULL)
+    {
+      /* \_o< pOaK */
+      /* By the way, we should never reach this,
+       * as events are not handled
+       */
+    }
 #endif
     {
@@ -1843 +1892 @@
 }
 
+/** \brief Generate HTML3 representation of current image.
+ *
+ *  This function generates and returns the HTML3 representation of 
+ *  the current image. It is way bigger than caca_get_html(), but
+ *  permits viewing in old browsers (or limited ones such as links)
+ *
+ */
+char* caca_get_html3(void)
+{
+  char *buffer;
+  unsigned int x,y;
+
+  /* 13000 -> css palette
+     40 -> max size used for a pixel (plus 10, never know)*/
+
+  buffer = malloc((13000 + ((_caca_width*_caca_height)*40))*sizeof(char));
+  
+
+  /* Table */
+  sprintf(buffer, "<table cols='%d' cellpadding='0' cellspacing='0'>\n", caca_get_height());
+
+  for(y=0;y<_caca_height;y++)
+    {
+      sprintf(buffer, 
+              "%s<tr>",buffer);
+
+      for(x=0;x<_caca_width;x++)
+        {
+          int len;
+          int i;
+          uint8_t *attr = cache_attr + x + y * _caca_width;
+
+          /* Use colspan option to factorize cells with same attributes 
+             (see below) */
+          len=1;
+          while(x + len < _caca_width
+                && (attr[len]>>4) == (attr[0]>>4) &&
+                (attr[len]&0x0f) == (attr[0]&0x0f))
+            len++;
+          
+          if(len==1)
+            {
+              sprintf(buffer, 
+                      "%s<td bgcolor=#%06X ><font color='#%06X'>%c</font></td>", buffer,
+                      html_palette[cache_attr[x+y*caca_get_width()]>>4], 
+                      html_palette[cache_attr[x+y*caca_get_width()]&0x0f],
+                      cache_char[x+y*caca_get_width()]);
+            }
+          else
+            {
+              sprintf(buffer, 
+                      "%s<td bgcolor=#%06X colspan=%d><font color='#%06X'>",buffer,
+                      html_palette[cache_attr[x+y*caca_get_width()]>> 4], 
+                      len+1,
+                      html_palette[cache_attr[x+y*caca_get_width()]&0x0f]);
+              
+              for(i=0;i<len;i++)
+                {
+                  if(cache_char[x+y*caca_get_width()]!=' ')
+                    sprintf(buffer, "%s%c", buffer, cache_char[x+y*caca_get_width()]);
+                  else
+                    sprintf(buffer, "%s&nbsp;", buffer);
+                  x++;
+                }
+              sprintf(buffer, "%s</font></td>", buffer);
+              
+            }
+
+        }
+      sprintf(buffer, "%s</tr>\n",buffer);
+    }
+
+  /* Footer */
+  sprintf(buffer, "%s</table>\n",buffer);
+
+  /* Crop to really used size */
+  buffer = realloc(buffer, (strlen(buffer)+1) * sizeof(char));
+
+  return buffer;
+}
+
 
 static int const irc_palette[] =