Changeset 609 for libcaca/trunk/cacaTweet

Timestamp:

Mar 14, 2006, 11:05:34 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Replaced all cucul_get_* exporters with a generic cucul_export() function.
• Got rid of static buffers; we now use cucul_free() to free exported buffers.
• Fixed light background in the ANSI exporter by adding escape sequences for most terminal emulators.

File:

• libcaca/trunk/caca/driver_network.c (modified) (13 diffs)

libcaca/trunk/caca/driver_network.c

@@ -86 +86 @@
     char prefix[sizeof(INIT_PREFIX)];
 
-    char *buffer;
-    int size;
+    struct cucul_buffer *ex;
 
     int client_count;
@@ -170 +169 @@
     }
 
-    kk->drv.p->buffer = NULL;
-    kk->drv.p->size = 0;
+    kk->drv.p->ex = NULL;
 
     /* Ignore SIGPIPE */
@@ -192 +190 @@
     }
 
+    if(kk->drv.p->ex)
+        cucul_free(kk->drv.p->ex);
+
     /* Restore SIGPIPE handler */
     signal(SIGPIPE, kk->drv.p->sigpipe_handler);
@@ -220 +221 @@
     int i;
 
+    /* Free the previous export buffer, if any */
+    if(kk->drv.p->ex)
+    {
+        cucul_free(kk->drv.p->ex);
+        kk->drv.p->ex = NULL;
+    }
+
     /* Get ANSI representation of the image and skip the end-of buffer
      * linefeed ("\r\n\0", 3 bytes) */
-    kk->drv.p->buffer = cucul_get_ansi(kk->qq, 0, &kk->drv.p->size);
-    kk->drv.p->size -= 3;
+    kk->drv.p->ex = cucul_export(kk->qq, CUCUL_FORMAT_ANSI);
+    kk->drv.p->ex->size -= 3;
 
     for(i = 0; i < kk->drv.p->client_count; i++)
@@ -371 +379 @@
 
     /* No error, there's just nothing to send yet */
-    if(!kk->drv.p->buffer)
+    if(!kk->drv.p->ex)
         return 0;
 
@@ -396 +404 @@
             c->start += ret;
 
-            if(c->stop - c->start + strlen(ANSI_PREFIX) + kk->drv.p->size
+            if(c->stop - c->start + strlen(ANSI_PREFIX) + kk->drv.p->ex->size
                 > OUTBUFFER)
             {
@@ -407 +415 @@
 
             /* Need to move? */
-            if(c->stop + strlen(ANSI_PREFIX) + kk->drv.p->size > OUTBUFFER)
+            if(c->stop + strlen(ANSI_PREFIX) + kk->drv.p->ex->size > OUTBUFFER)
             {
                 memmove(c->outbuf, c->outbuf + c->start, c->stop - c->start);
@@ -416 +424 @@
             memcpy(c->outbuf + c->stop, ANSI_PREFIX, strlen(ANSI_PREFIX));
             c->stop += strlen(ANSI_PREFIX);
-            memcpy(c->outbuf + c->stop, kk->drv.p->buffer, kk->drv.p->size);
-            c->stop += kk->drv.p->size;
+            memcpy(c->outbuf + c->stop, kk->drv.p->ex->buffer, kk->drv.p->ex->size);
+            c->stop += kk->drv.p->ex->size;
 
             return 0;
@@ -437 +445 @@
     if(ret < (ssize_t)strlen(ANSI_PREFIX))
     {
-        if(strlen(ANSI_PREFIX) + kk->drv.p->size > OUTBUFFER)
+        if(strlen(ANSI_PREFIX) + kk->drv.p->ex->size > OUTBUFFER)
         {
             /* Overflow! Empty buffer and start again */
@@ -448 +456 @@
         memcpy(c->outbuf, ANSI_PREFIX, strlen(ANSI_PREFIX) - ret);
         c->stop = strlen(ANSI_PREFIX) - ret;
-        memcpy(c->outbuf + c->stop, kk->drv.p->buffer, kk->drv.p->size);
-        c->stop += kk->drv.p->size;
+        memcpy(c->outbuf + c->stop, kk->drv.p->ex->buffer, kk->drv.p->ex->size);
+        c->stop += kk->drv.p->ex->size;
 
         return 0;
@@ -455 +463 @@
 
     /* Send actual data */
-    ret = nonblock_write(c->fd, kk->drv.p->buffer, kk->drv.p->size);
+    ret = nonblock_write(c->fd, kk->drv.p->ex->buffer, kk->drv.p->ex->size);
     if(ret == -1)
     {
@@ -464 +472 @@
     }
 
-    if(ret < kk->drv.p->size)
-    {
-        if(kk->drv.p->size > OUTBUFFER)
+    if(ret < (int)kk->drv.p->ex->size)
+    {
+        if(kk->drv.p->ex->size > OUTBUFFER)
         {
             /* Overflow! Empty buffer and start again */
@@ -475 +483 @@
         }
 
-        memcpy(c->outbuf, kk->drv.p->buffer, kk->drv.p->size - ret);
-        c->stop = kk->drv.p->size - ret;
+        memcpy(c->outbuf, kk->drv.p->ex->buffer, kk->drv.p->ex->size - ret);
+        c->stop = kk->drv.p->ex->size - ret;
 
         return 0;