Changeset 3940 for neercs/trunk/src/main.cTweet

Timestamp:

Nov 18, 2009, 3:55:57 PM (11 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Move client's mainloop to client.c

File:

• neercs/trunk/src/main.c (modified) (2 diffs)

neercs/trunk/src/main.c

@@ -81 +81 @@
     struct screen_list *screen_list = NULL;
     int args;
-    long long unsigned int last_key_time = 0;
+
     int mainret = -1;
-#define NEERCS_RECV_BUFSIZE 128*1024
-    char * buf = NULL;
-    
+        
     screen_list = create_screen_list();
     screen_list->default_shell = getenv("SHELL");
@@ -152 +150 @@
     }
 
-    last_key_time = get_us();
-
-    for(;;)
-    {
-        caca_event_t ev;
-        int ret = 0;
-        ssize_t n;
-        if(!screen_list) goto end;
-        if(!buf)
-            buf = malloc(NEERCS_RECV_BUFSIZE);
-        if(!buf)
-        {
-            debug("Failed to allocate memory");
-            goto end;
-        }
-        if(screen_list->socket[SOCK_CLIENT] && (n = read(screen_list->socket[SOCK_CLIENT], buf, NEERCS_RECV_BUFSIZE-1)) > 0)
-        {
-            buf[n] = 0;
-            debug("Received from server: %s", buf);
-            if(!strncmp("DETACH", buf, 6))
-            {
-                ret = 1;
-                break;
-            }
-            else if(!strncmp("UPDATE ", buf, 7))
-            {
-                int x, y;
-                ssize_t l2 = 0, lb = 0;
-                char * buf2;
-                size_t l = 0;
-                /* FIXME check the length before calling atoi*/
-                x = atoi(buf+8);
-                y = atoi(buf+19);
-                /* 0 means we have valid data but incomplete, so read the rest */
-                while(l == 0)
-                {
-                    buf2 = realloc(buf, l2 + NEERCS_RECV_BUFSIZE);
-                    if(!buf2)
-                    {
-                        debug("Failed to allocate memory");
-                        goto end;
-                    }
-                    buf = buf2;
-                    fcntl(screen_list->socket[SOCK_CLIENT], F_SETFL, 0);
-                    lb = read(screen_list->socket[SOCK_CLIENT], buf+l2, NEERCS_RECV_BUFSIZE-1);
-                    if(lb < 0)
-                    {
-                        debug("Failed to read the end of the refresh message (%s)", strerror(errno));
-                        l = -1;
-                    }
-                    else
-                    {
-                        l2 += lb;
-#if defined HAVE_CACA_DIRTY_RECTANGLES
-                        l = caca_import_area_from_memory(screen_list->cv, x, y, buf, l2, "caca");
-#else
-                        l = caca_import_memory(screen_list->cv, buf, l2, "caca");
-#endif
-                    }
-                }
-                fcntl(screen_list->socket[SOCK_CLIENT], F_SETFL, O_NONBLOCK);
-            }
-            else if(!strncmp("REFRESH ", buf, 8))
-            {
-                int dt, x, y;
-                /* FIXME check the length before calling atoi*/
-                x = atoi(buf+8);
-                y = atoi(buf+19);
-                caca_gotoxy(screen_list->cv, x, y);
-                caca_refresh_display(screen_list->dp);
-                dt = caca_get_display_time(screen_list->dp);
-                debug("refreshtime=%dms (limit %d, requested %d)", dt/1000, screen_list->delay, screen_list->requested_delay);
-                /* Adjust refresh delay so that the server do not compute useless things */
-                if(dt > 2*1000*screen_list->delay && screen_list->delay <= 100)
-                {
-                    screen_list->delay*=2;
-                    send_delay(screen_list);
-                }
-                else if(dt < screen_list->delay*1000*1.2 &&
-                        screen_list->delay >= 3*screen_list->requested_delay/2)
-                {
-                    screen_list->delay=2*screen_list->delay/3;
-                    send_delay(screen_list);
-                }
-            }
-            else if(!strncmp("CURSOR ", buf, 7))
-            {
-                caca_set_cursor(screen_list->dp, atoi(buf+7));
-            }
-            else if(!strncmp("TITLE ", buf, 6))
-            {
-                caca_set_display_title(screen_list->dp, buf+6);
-                caca_refresh_display(screen_list->dp);
-            }
-            else
-            {
-                debug("Unknown message received from server: %s", buf);
-            }
-        }
+
+    mainloop(screen_list);
         
-        if(ret)
-            break;
-
-        ret = caca_get_event(screen_list->dp,
-                             CACA_EVENT_KEY_PRESS
-                             |CACA_EVENT_RESIZE
-                             |CACA_EVENT_QUIT,
-                             &ev, 10000);
-        if(ret)
-            ret = send_event(ev, screen_list);
-
-        if(ret)
-            break;
-    }
-
     /* Clean up */
     mainret = 0;
 end:
-    if(buf)
-        free(buf);
+
     if(screen_list)
     {