Changeset 2401 for neercs/trunk/srcTweet

Timestamp:

Jun 15, 2008, 2:50:12 PM (14 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Removed more stuff from main()

Location:

neercs/trunk/src

Files:

• main.c (modified) (5 diffs)
• neercs.h (modified) (1 diff)

neercs/trunk/src/main.c

@@ -77 +77 @@
     h = cucul_get_canvas_height(cv);
 
-    w = 80;
-    h = 25;
 
 
@@ -124 +122 @@
     /* Windows are in a temporary state, resize them to the right dimensions */
     update_windows_props(cv, screen_list, pty);
-
     caca_refresh_display(dp);
 
+
     for(;;)
     {
-        struct timeval tv;
-        fd_set fdset;
         caca_event_t ev;
-        int maxfd = 0, ret;
-
-        /* Read data, if any */
-        FD_ZERO(&fdset);
-        for(i = 0; i < screen_list->count; i++)
-        {
-            if(screen_list->screen[i]->fd >= 0)
-                FD_SET(screen_list->screen[i]->fd, &fdset);
-            if(screen_list->screen[i]->fd > maxfd)
-                maxfd = screen_list->screen[i]->fd;
-        }
-        tv.tv_sec = 0;
-        tv.tv_usec = 50000;
-        ret = select(maxfd + 1, &fdset, NULL, NULL, &tv);
-
-        if(ret < 0)
-        {
-            if(errno == EINTR)
-                ; /* We probably got a SIGWINCH, ignore it */
-            else
-            {
-                for(i = 0; i < screen_list->count; i++)
-                    if(screen_list->screen[i]->total)
-                        break;
-                if(i == screen_list->count)
-                    break;
-            }
-        }
-        else if(ret)
-        {
-            /* Read each terminal content */
-            refresh |= update_screens_contents(screen_list, &fdset, &pty, &prevpty);
-        }
+        int ret;
+
+        refresh |= update_screens_contents(screen_list,
+                                           &pty, &prevpty);
+
         /* No more screens, exit */
         if(!screen_list->count) break;
@@ -382 +350 @@
 
 int update_screens_contents(struct screen_list* screen_list,
-                             fd_set *fdset,
                              int *pty, int *prevpty)
 {
     int i, refresh = 0;
+    int maxfd = 0;
+    struct timeval tv;
+    fd_set fdset;
+    int ret;
+
+    /* Read data, if any */
+    FD_ZERO(&fdset);
+    for(i = 0; i < screen_list->count; i++)
+    {
+        if(screen_list->screen[i]->fd >= 0)
+            FD_SET(screen_list->screen[i]->fd, &fdset);
+        if(screen_list->screen[i]->fd > maxfd)
+            maxfd = screen_list->screen[i]->fd;
+    }
+    tv.tv_sec = 0;
+    tv.tv_usec = 50000;
+    ret = select(maxfd + 1, &fdset, NULL, NULL, &tv);
+
+    if(ret < 0)
+    {
+        if(errno == EINTR)
+            ; /* We probably got a SIGWINCH, ignore it */
+        else
+        {
+            for(i = 0; i < screen_list->count; i++)
+                if(screen_list->screen[i]->total)
+                    break;
+            if(i == screen_list->count)
+                return 0;
+        }
+    }
+    else if(ret)
+    {
+
     for(i = 0; i < screen_list->count; i++)
     {
@@ -392 +393 @@
 
         if(screen_list->screen[i]->fd < 0 ||
-           !FD_ISSET(screen_list->screen[i]->fd, fdset))
+           !FD_ISSET(screen_list->screen[i]->fd, &fdset))
             continue;
 
@@ -429 +430 @@
             break;
         }
+    }
     }
     return refresh;

neercs/trunk/src/neercs.h

@@ -74 +74 @@
                      int pty);
 int update_screens_contents(struct screen_list* screen_list,
-                             fd_set *fdset,
                              int *pty, int *prevpty);