Changeset 2356

Timestamp:

06/11/08 15:11:15 (5 years ago)

Author:

pterjan

Message:

• Exit when requested by window manager
• Exit when all terms are exited
• Free the buffers during final cleanup
• Don't wait for a key before exiting

File:

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

neercs/trunk/src/main.c

@@ -100 +100 @@
         for(i = 0; i < n; i++)
         {
-            FD_SET(screen[i].fd, &fdset);
+            if(screen[i].fd >= 0)
+                FD_SET(screen[i].fd, &fdset);
             if(screen[i].fd > maxfd)
                 maxfd = screen[i].fd;
@@ -126 +127 @@
              * each of them starved at least once. */
 
-            if(!FD_ISSET(screen[i].fd, &fdset))
+            if(screen[i].fd < 0 || !FD_ISSET(screen[i].fd, &fdset))
                 continue;
 
@@ -142 +143 @@
                 }
 
-                if(nr == 0 || errno != EWOULDBLOCK)
-                    eof = 1;
+                if(nr == 0 || errno != EWOULDBLOCK) {
+                    close(screen[i].fd);                        
+                    screen[i].fd = -1;
+                }
 
                 break;
@@ -229 +232 @@
             {
                 cucul_set_canvas_size(screen[i].cv, w, h);
-                set_tty_size(screen[i].fd, w, h);
+                if(screen[i].fd >= 0)
+                    set_tty_size(screen[i].fd, w, h);
             }
             cucul_clear_canvas(cv);
             refresh = 1;
         }
+        else if(ret && (caca_get_event_type(&ev) & CACA_EVENT_QUIT))
+        {
+            break;
+        }
 
         /* Refresh screen */
@@ -244 +252 @@
             for(i = 0; i < n; i++)
             {
+                if(screen[i].fd < 0)
+                    continue;
                 int j = (pty + n - 1 - i) % n;
                 cucul_blit(cv, (n - 1 - j) * XTAB + 1,
@@ -307 +317 @@
         }
 
+        eof = 1;
+        for(i = 0; i < n; i++)
+            if(screen[i].fd >= 0)
+                eof = 0;
         if(eof)
-        {
-            for(i = 0; i < n; i++)
-                if(screen[i].total)
-                    break;
-            if(i == n)
-                break;
-        }
-    }
-
-    caca_get_event(dp, CACA_EVENT_KEY_PRESS, NULL, -1);
+            break;
+    }
 
     /* Clean up */
@@ -323 +329 @@
     cucul_free_canvas(cv);
     for(i = 0; i < n; i++)
+    {
+        free(screen[i].buf);
         cucul_free_canvas(screen[i].cv);
+    }
 
     return 0;