Changeset 4052 for neercsTweet

Timestamp:

Nov 27, 2009, 1:46:25 PM (11 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Server's mainloop now repeatedly calls server_iteration()

Location:

neercs/trunk/src

Files:

• screensaver.c (modified) (2 diffs)
• server.c (modified) (11 diffs)
• term.c (modified) (6 diffs)

neercs/trunk/src/screensaver.c

@@ -33 +33 @@
 void screensaver_init(struct screen_list *screen_list)
 {
-
     screensaver_flying_toasters_init(screen_list);
 }
@@ -39 +38 @@
 void screensaver_kill(struct screen_list *screen_list)
 {
-
     screensaver_flying_toasters_kill(screen_list);
 }

neercs/trunk/src/server.c

@@ -42 +42 @@
 static int handle_attach(struct screen_list *screen_list, char *buf);
 
-static int send_to_client(const char *msg, int size, struct screen_list *screen_list)
+static int send_to_client(const char *msg, int size,
+                          struct screen_list *screen_list)
 {
     int ret;
@@ -149 +150 @@
             written = 0;
             sprintf(buf2, "UPDATE %10d %10d", x, y);
-            ret = send_to_client(buf2, strlen(buf2)+1, screen_list);
+            ret = send_to_client(buf2, strlen(buf2) + 1, screen_list);
             if (ret < 29 && errno != EAGAIN)
             {
@@ -161 +162 @@
                 /* Block to write the end of the message */
                 fcntl(screen_list->socket[SOCK_CLIENT], F_SETFL, 0);
-                n = send_to_client((char*) buf+written, towrite > bufsize ? bufsize : towrite, screen_list);
+                n = send_to_client((char *)buf + written,
+                                   towrite > bufsize ? bufsize : towrite,
+                                   screen_list);
                 if (n < 0)
                 {
@@ -178 +181 @@
                 caca_get_cursor_y(screen_list->cv));
         /* FIXME check value of r */
-            int r = send_to_client(buf2, strlen(buf2) + 1,screen_list);
+        int r = send_to_client(buf2, strlen(buf2) + 1, screen_list);
         (void)r;
 #if defined HAVE_CACA_DIRTY_RECTANGLES
@@ -201 +204 @@
 }
 
+static int server_iteration(struct screen_list *screen_list)
+{
+    int i;
+    int eof = 0, refresh = 0;
+
+    int quit = 0;
+    ssize_t n;
+    char buf[128];
+    
+    /* Read program output */
+    refresh |= update_screens_contents(screen_list);
+    
+    /* Check if we got something from the client */
+    while (screen_list->socket[SOCK_SERVER]
+           && (n =
+               read(screen_list->socket[SOCK_SERVER], buf,
+                    sizeof(buf) - 1)) > 0)
+    {
+        buf[n] = 0;
+        debug("Received command %s", buf);
+        if (!strncmp("ATTACH ", buf, 7))
+        {
+            refresh |= handle_attach(screen_list, buf);
+        }
+        else if (!strncmp("QUIT", buf, 4))
+        {
+            quit = 1;
+        }
+        else if (!strncmp("DELAY ", buf, 6))
+        {
+            /* FIXME check the length before calling atoi */
+            screen_list->delay = atoi(buf + 6);
+        }
+        else if (!strncmp("RESIZE ", buf, 7))
+        {
+            caca_free_canvas(screen_list->cv);
+            /* FIXME check the length before calling atoi */
+            screen_list->cv =
+            caca_create_canvas(atoi(buf + 7), atoi(buf + 18));
+            screen_list->changed = 1;
+            refresh = 1;
+        }
+        else if (!strncmp("KEY ", buf, 4))
+        {
+            unsigned int c = atoi(buf + 4);
+            refresh |= handle_key(screen_list, c, refresh);
+        }
+        else
+        {
+            fprintf(stderr, "Unknown command received: %s\n", buf);
+        }
+    }
+    
+    /* No more screens, exit */
+    if (!screen_list->count)
+        return -1;
+    
+    /* User requested to exit */
+    if (quit)
+        return -2;
+    
+    /* Update each screen canvas */
+    refresh |= update_terms(screen_list);
+    
+    /* Launch recurrents if any */
+    refresh |= handle_recurrents(screen_list);
+    
+    /* Refresh screen */
+    refresh |= refresh_screen(screen_list, refresh);
+    
+    eof = 1;
+    for (i = 0; i < screen_list->count; i++)
+        if (screen_list->screen[i]->fd >= 0)
+            eof = 0;
+    if (eof)
+        return -3;
+
+}
+
 static void server_main(struct screen_list *screen_list)
 {
-    int i;
-    int eof = 0, refresh = 1;
-
-
-
     screen_list->last_key_time = 0;
     screen_list->attached = 0;
@@ -221 +298 @@
     for (;;)
     {
-        int quit = 0;
-        ssize_t n;
-        char buf[128];
-
-        /* Read program output */
-        refresh |= update_screens_contents(screen_list);
-
-        /* Check if we got something from the client */
-        while (screen_list->socket[SOCK_SERVER]
-               && (n =
-                   read(screen_list->socket[SOCK_SERVER], buf,
-                        sizeof(buf) - 1)) > 0)
-        {
-            buf[n] = 0;
-            debug("Received command %s", buf);
-            if (!strncmp("ATTACH ", buf, 7))
-            {
-                refresh |= handle_attach(screen_list, buf);
-            }
-            else if (!strncmp("QUIT", buf, 4))
-            {
-                quit = 1;
-            }
-            else if (!strncmp("DELAY ", buf, 6))
-            {
-                /* FIXME check the length before calling atoi */
-                screen_list->delay = atoi(buf + 6);
-            }
-            else if (!strncmp("RESIZE ", buf, 7))
-            {
-                caca_free_canvas(screen_list->cv);
-                /* FIXME check the length before calling atoi */
-                screen_list->cv =
-                    caca_create_canvas(atoi(buf + 7), atoi(buf + 18));
-                screen_list->changed = 1;
-                refresh = 1;
-            }
-            else if (!strncmp("KEY ", buf, 4))
-            {
-                unsigned int c = atoi(buf + 4);
-                refresh |= handle_key(screen_list, c, refresh);
-            }
-            else
-            {
-                fprintf(stderr, "Unknown command received: %s\n", buf);
-            }
-        }
-
-        /* No more screens, exit */
-        if (!screen_list->count)
-            break;
-
-        /* User requested to exit */
-        if (quit)
-            break;
-
-        /* Update each screen canvas */
-        refresh |= update_terms(screen_list);
-
-        /* Launch recurrents if any */
-        refresh |= handle_recurrents(screen_list);
-
-        /* Refresh screen */
-        refresh |= refresh_screen(screen_list, refresh);
-
-        eof = 1;
-        for (i = 0; i < screen_list->count; i++)
-            if (screen_list->screen[i]->fd >= 0)
-                eof = 0;
-        if (eof)
-            break;
+                if(server_iteration(screen_list)) break;
     }
 
@@ -301 +308 @@
     python_close(screen_list);
 #endif
-    
+
     exit(0);
 }
@@ -318 +325 @@
         long long int tdiff =
             (current_time - screen_list->last_refresh_time) / 1000;
-        
+
         if (screen_list->force_refresh)
         {
@@ -380 +387 @@
     int i;
     debug("Screen list at %p\n", screen_list);
-    
+
     /* Create socket and bind it */
     create_socket(screen_list, SOCK_SERVER);
@@ -560 +567 @@
         close(screen_list->outfd);
 #endif
-        return 0;
+    return 0;
 }
 
@@ -576 +583 @@
     {
         int r = install_fds(screen_list);
-        if(r) return r;
+        if (r)
+            return r;
         setsid();
 

neercs/trunk/src/term.c

@@ -146 +146 @@
     {
         if (!sc->bell)
-            screen_list->in_bell=10;
+            screen_list->in_bell = 10;
         sc->bell = 1;
     }
@@ -442 +442 @@
                     }
                 }
+                x = 0;
+                y = 0;
                 skip += 2;
                 break;
@@ -658 +660 @@
                 }
             case 'c':          /* DA -- Device Attributes */
-                    /* 
-                     0 Base VT100, no options 
-                     1 Processor options (STP) 
-                     2 Advanced video option (AVO) 
-                     3 AVO and STP 
-                     4 Graphics processor option (GPO) 
-                     5 GPO and STP 
-                     6 GPO and AVO 
-                     7 GPO, STP, and AVO 
-                     */
-                    /* Warning, argument is Pn */
-                debug("ansi Got command c, argc %d, argv[0] (%d)\n", argc, argv[0], argv[0]);
+                /* 
+                   0 Base VT100, no options 1 Processor options (STP) 2
+                   Advanced video option (AVO) 3 AVO and STP 4 Graphics
+                   processor option (GPO) 5 GPO and STP 6 GPO and AVO 7
+                   GPO, STP, and AVO */
+                /* Warning, argument is Pn */
+                debug("ansi Got command c, argc %d, argv[0] (%d)\n", argc,
+                      argv[0], argv[0]);
                 if (!argc || argv[0] == 0)
                 {
                     send_ansi_sequence(screen_list, "\x1b[?1;0c");
                 }
-                else 
+                else
                 {
                     switch (argv[0])
@@ -699 +697 @@
                         send_ansi_sequence(screen_list, "\x1b[?\x1;\x7c");
                         break;
-                        default:
-                            debug("Unsupported DA option '%d'\n", argv[0]);
-                            break;
+                    default:
+                        debug("Unsupported DA option '%d'\n", argv[0]);
+                        break;
                     }
                 }
@@ -737 +735 @@
                 break;
             case 'n':
-                    debug("ansi command n, argc %d, argv[0] %d\n", argc, argv[0]);
-                    if(!argc) break;
-                    
-                    switch(argv[0])
-                    {
-                        case 5:
-                        /* Term ok */
-                        send_ansi_sequence(screen_list, "\x1b[0n"); 
-                        break;
-                    case 6:
-                        /* Cursor Position */
-                        sprintf(b, "\x1b[%d;%dR", 
-                                y+1,
-                                x+1);
-                        send_ansi_sequence(screen_list, b); 
-                        break;
-                    }
-                    
+                debug("ansi command n, argc %d, argv[0] %d\n", argc, argv[0]);
+                if (!argc)
+                    break;
+
+                switch (argv[0])
+                {
+                case 5:
+                    /* Term ok */
+                    send_ansi_sequence(screen_list, "\x1b[0n");
+                    break;
+                case 6:
+                    /* Cursor Position */
+                    sprintf(b, "\x1b[%d;%dR", y + 1, x + 1);
+                    send_ansi_sequence(screen_list, b);
+                    break;
+                }
+
                 break;
             case 's':          /* Private (save cursor position) */
@@ -846 +843 @@
                 if (((ch > ' ') && (ch <= '~'))
                     &&
-                    (sc->conv_state.
-                     gn[sc->conv_state.ss ? sc->conv_state.
-                        gn[sc->conv_state.ss] : sc->conv_state.glr[0]] == '0'))
+                    (sc->
+                     conv_state.gn[sc->conv_state.ss ? sc->
+                                   conv_state.gn[sc->conv_state.ss] : sc->
+                                   conv_state.glr[0]] == '0'))
                 {
                     ch = dec_acs(ch);