Changeset 4380 for neercs/trunk/src/mini-client.cTweet

Timestamp:

Mar 6, 2010, 6:10:39 PM (12 years ago)

Author:

Sam Hocevar

Message:

Implement bidirectional communication in mini-neercs.

File:

• neercs/trunk/src/mini-client.c (modified) (5 diffs)

neercs/trunk/src/mini-client.c

@@ -17 +17 @@
 #endif
 
+#include <stdio.h> /* BUFSIZ */
+#include <string.h> /* strncmp() */
+
+#include <caca.h>
+
 #include "mini-neercs.h"
 #include "mini-socket.h"
-
-#include <caca.h>
 
 static caca_display_t *dp;
@@ -28 +31 @@
 void client_init(void)
 {
-    int i, usec = 1000;
+    int i, usec = 10000;
 
     cv = caca_create_canvas(0, 0);
     dp = caca_create_display(cv);
     caca_set_display_title(dp, "Press Esc to quit");
+
+    insock = socket_open("/tmp/neercs.sock.client", 1);
 
     for (i = 0; i < 10; i++)
@@ -43 +48 @@
     }
 
-    insock = socket_open("/tmp/neercs.sock.client", 1);
-
     socket_puts(outsock, "CONNECT /tmp/neercs.sock.client");
 }
@@ -51 +54 @@
 {
     caca_event_t ev;
+    int ret;
+
+    /* Handle client sockets */
+    ret = socket_select(insock, 1000);
+    if (ret > 0)
+    {
+        char buf[BUFSIZ];
+        ssize_t bytes = socket_read(insock, buf, BUFSIZ);
+        if (bytes <= 0)
+            return 1;
+
+        /* Parse message */
+        if (!strncmp(buf, "OK", strlen("OK")))
+        {
+            printf("Connection established\n");
+        }
+    }
+
+    /* Handle libcaca events */
     if(caca_get_event(dp, CACA_EVENT_KEY_PRESS, &ev, 1000)
         && caca_get_event_key_ch(&ev) == CACA_KEY_ESCAPE)
         return 0;
+
     return 1;
 }
@@ -61 +84 @@
     caca_free_display(dp);
     caca_free_canvas(cv);
+    if (insock)
+        socket_close(insock);
+    if (outsock)
+        socket_close(outsock);
 }