Changeset 3974

Timestamp:

11/20/09 13:27:05 (3 years ago)

Author:

jylam

Message:

• Moved client initialisation to client.c

Location:

neercs/trunk/src

Files:

• client.c (modified) (1 diff)
• main.c (modified) (1 diff)
• neercs.h (modified) (1 diff)
• server.c (modified) (2 diffs)

neercs/trunk/src/client.c

@@ -37 +37 @@
 
 #define NEERCS_RECV_BUFSIZE 128*1024
+
+
+int start_client(struct screen_list * screen_list)
+{
+    char *sess = NULL;
+    create_socket(screen_list, SOCK_CLIENT);
+    while ((sess = connect_socket(screen_list, SOCK_SERVER)) == NULL)
+        usleep(100);
+    free(sess);
+
+    /* Create main canvas and associated caca window */
+    screen_list->cv = caca_create_canvas(0, 0);
+    screen_list->dp = caca_create_display(screen_list->cv);
+
+    if (!screen_list->dp)
+        return -3;
+
+    caca_set_display_time(screen_list->dp, screen_list->delay * 1000);
+    caca_set_cursor(screen_list->dp, 1);
+
+    request_attach(screen_list);
+    
+    return 0;
+}
+
+
 
 void mainloop(struct screen_list *screen_list)

neercs/trunk/src/main.c

@@ -158 +158 @@
         debug("Spawning a new server");
         if (start_server(screen_list))
+            goto end;
+        if (start_client(screen_list)) 
             goto end;
     }

neercs/trunk/src/neercs.h

@@ -243 +243 @@
 void free_screen_list(struct screen_list *screen_list);
 
+int start_client(struct screen_list * screen_list);
 void mainloop(struct screen_list *screen_list);
 

neercs/trunk/src/server.c

@@ -531 +531 @@
 {
     pid_t pid;
-    char *sess;
 
     pid = fork();
@@ -573 +572 @@
     }
     
-    
-    create_socket(screen_list, SOCK_CLIENT);
-    while ((sess = connect_socket(screen_list, SOCK_SERVER)) == NULL)
-        usleep(100);
-    free(sess);
-
-    /* Create main canvas and associated caca window */
-    screen_list->cv = caca_create_canvas(0, 0);
-    screen_list->dp = caca_create_display(screen_list->cv);
-
-    if (!screen_list->dp)
-        return -3;
-
-    caca_set_display_time(screen_list->dp, screen_list->delay * 1000);
-    caca_set_cursor(screen_list->dp, 1);
-
-    request_attach(screen_list);
-
     return 0;
 }