Changeset 707 for libcacaTweet

Timestamp:

Mar 29, 2006, 11:41:30 AM (15 years ago)

Author:

Sam Hocevar

Message:

• cacaserver works again (but needs a complete rewrite because it's really become ugly). You can now emulate the previous network driver behaviour by doing: "CACA_DRIVER=raw cacaplas | cacaserver".

File:

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

libcaca/trunk/src/cacaserver.c

@@ -98 +98 @@
 
     /* Input buffer */
+    uint8_t *input;
+    unsigned int read;
 
     char prefix[sizeof(INIT_PREFIX)];
 
+    cucul_t *qq;
     struct cucul_export *ex;
 
@@ -115 +118 @@
 int main(void)
 {
-    cucul_t *qq;
     int i, yes = 1, flags;
     struct server *server;
@@ -121 +123 @@
 
     server = malloc(sizeof(struct server));
+
+    server->input = malloc(12);
+    server->read = 0;
 
     server->client_count = 0;
@@ -169 +174 @@
     }
 
+    server->qq = NULL;
     server->ex = NULL;
 
@@ -180 +186 @@
     for(;;)
     {
+        uint8_t *buf = server->input;
+        uint32_t width, height;
+        unsigned int size;
+
         /* Manage new connections as this function will be called sometimes
          * more often than display */
@@ -185 +195 @@
 
         /* Read data from stdin */
-        /* FIXME: read data, then continue if there was a new image */
+        read(0, buf, 12);
+
+        while(buf[0] != 'C' && buf[1] != 'A' && buf[2] != 'C' && buf[3] != 'A')
+        {
+            memmove(buf, buf + 1, 11);
+            read(0, buf + 11, 1);
+        }
+
+        width = ((uint32_t)buf[4] << 24) | ((uint32_t)buf[5] << 16)
+              | ((uint32_t)buf[6] << 8) | (uint32_t)buf[7];
+        height = ((uint32_t)buf[8] << 24) | ((uint32_t)buf[9] << 16)
+               | ((uint32_t)buf[10] << 8) | (uint32_t)buf[11];
+
+        size = 12 + width * height * 5 + 4;
+        server->input = realloc(server->input, size);
+        read(0, buf + 12, size - 12);
+
+        /* Free the previous canvas, if any */
+        if(server->qq)
+            cucul_free(server->qq);
+
+        server->qq = cucul_load(buf, size);
 
         /* Free the previous export buffer, if any */
@@ -196 +227 @@
         /* Get ANSI representation of the image and skip the end-of buffer
          * linefeed ("\r\n\0", 3 bytes) */
-        server->ex = cucul_create_export(qq, "ansi");
+        server->ex = cucul_create_export(server->qq, "ansi");
         server->ex->size -= 3;