Changeset 2588Tweet

Timestamp:

Jul 27, 2008, 1:17:04 AM (14 years ago)

Author:

Pascal Terjan

Message:

• Rewrote detach handling, enjoy silent neercs

Location:

neercs/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• attach.c (modified) (6 diffs)
• input.c (modified) (1 diff)
• main.c (modified) (14 diffs)
• neercs.h (modified) (1 diff)
• server.c (added)

neercs/trunk/src/Makefile.am

@@ -4 +4 @@
 neercs_SOURCES = neercs.h mygetopt.c recurrent.c main.c screens.c term.c \
                  grab.c effects.c wm.c screensaver.c attach.c configuration.c \
-                 mytrace.c mytrace.h input.c lock.c
+                 mytrace.c mytrace.h input.c lock.c server.c
 neercs_CFLAGS = @CACA_CFLAGS@
 neercs_LDADD = @CACA_LIBS@ @UTIL_LIBS@ @PAM_LIBS@

neercs/trunk/src/attach.c

@@ -12 +12 @@
 #include <sys/stat.h>
 
+#include <caca.h>
+
 #include "neercs.h"
 
-static char * build_socket_path(char *socket_dir, char *session_name)
+char * build_socket_path(char *socket_dir, char *session_name)
 {
     char *path, *dir;
@@ -46 +48 @@
 
     myaddr.sun_family = AF_UNIX;
-    screen_list->socket_path = build_socket_path(screen_list->socket_path, screen_list->session_name);
     strncpy(myaddr.sun_path, screen_list->socket_path, sizeof(myaddr.sun_path) - 1);
-    unlink(myaddr.sun_path);
 
     if(bind(sock, (struct sockaddr *)&myaddr, sizeof(struct sockaddr_un)) < 0)
@@ -65 +65 @@
 
     return 0;
-}
-
-int detach(struct screen_list* screen_list, caca_display_t * dp)
-{
-    int fd;
-    int pid;
-
-    screen_list->attached = 0;
-    caca_free_display(dp);
-
-    close(0);
-    close(1);
-    close(2);
-
-    fd = open("/dev/null", O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
-    dup2(fd, 0);
-    if(fd != 0)
-        close(fd);
-    fd = open("/tmp/log.txt", O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
-    dup2(fd, 1);
-    dup2(fd, 2);
-    if (fd > 2)
-        close(fd);
-
-    if(!screen_list->socket)
-    {
-        pid = fork();
-        if (pid < 0)
-            return 1;
-        if (pid > 0)
-            exit(0);
-
-        create_socket(screen_list);
-        setsid();
-    }
-
-    return 0;
-}
-
-static int handle_command(char * cmd, struct screen_list* screen_list, cucul_canvas_t * cv, caca_display_t ** dp)
-{
-    int refresh = 0;
-    debug("Received command %s", cmd);
-    if(!strncmp("ENV ", cmd, 4))
-    {
-        putenv(strdup(cmd+4));
-    }
-    else if(!strncmp("ATTACH ", cmd, 7))
-    {
-        int fd;
-        screen_list->attached = 1;
-        close(screen_list->socket);
-        screen_list->socket= 0;
-        unlink(screen_list->socket_path);
-        screen_list->socket_path = NULL;
-        close(0);
-        fd=open(cmd+7, O_RDWR);
-        dup2(fd, 0);
-        close(1);
-        fd=open(cmd+7, O_RDWR);
-        dup2(fd, 1);
-        close(2);
-        fd=open(cmd+7, O_RDWR);
-        dup2(fd, 2);
-        *dp = caca_create_display(cv);
-        if(*dp)
-        {
-            caca_set_cursor(*dp, 1);
-            refresh = 1;
-        }
-    }
-    else
-    {
-        fprintf(stderr, "Unknown command received: %s\n", cmd);
-    }
-    return refresh;
-}
-
-int read_socket(struct screen_list* screen_list, cucul_canvas_t * cv, caca_display_t ** dp) {
-    ssize_t n;
-    char buf[4097];
-    int refresh = 0;
-
-    if(!screen_list->socket)
-        return 0;
-
-    while (screen_list->socket && (n = read(screen_list->socket, buf, sizeof(buf)-1)) > 0)
-    {
-        buf[n] = 0;
-        refresh |= handle_command(buf, screen_list, cv, dp);
-    }
-    return refresh;
 }
 
@@ -194 +102 @@
 }
 
-
-/* FIXME Is this really not defined anywhere ? */
-extern char **environ;
-
-int request_attach(char *socket_path)
+char * connect_server(char *socket_path, struct screen_list* screen_list)
 {
     int sock;
-    char fdstr[PATH_MAX], lnk[PATH_MAX];
-    char buf[4096];
     struct sockaddr_un addr;
 
@@ -210 +112 @@
     if ((sock = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0) {
         perror("request_attach:socket");
-        return 1;
+        return NULL;
     }
 
@@ -219 +121 @@
     {
         printf("Failed to connect to %s: %s\n", socket_path, strerror(errno));
-        return 1;
+        return NULL;
     }
+    fcntl(sock, F_SETFL, O_NONBLOCK);
 
-    debug("Sending environment", 0);
+    screen_list->socket_path = socket_path;
+    screen_list->socket = sock;
 
-    /* Send our environment */
-#define sendvar(var) if(getenv(var)) {snprintf(buf, 4096, "ENV %s=%s", var, getenv(var)); write(sock, buf, strlen(buf));}
-    sendvar("DISPLAY")
-    sendvar("CACA_DRIVER")
+    return strdup(socket_path); /* FIXME */
+}
 
-    snprintf(fdstr, sizeof(fdstr), "/proc/%d/fd/0", getpid());
-    readlink(fdstr, lnk, sizeof(lnk)-1);
-    lnk[PATH_MAX-1] = '\0';
+int request_attach(struct screen_list* screen_list)
+{
+    debug("Requesting attach");
 
-    close(0);
+    write(screen_list->socket, "ATTACH", strlen("ATTACH"));
 
-    debug("Requesting attach to %s", lnk);
+    return 0;
+}
 
-    /* Request attaching */
-    snprintf(buf, 4096, "ATTACH %s", lnk);
-    write(sock, buf, strlen(buf));
-    close(sock);
+int send_event(caca_event_t ev, int sock)
+{
+    enum caca_event_type t;
 
-    debug("Exiting", 0);
-    exit(0);
+    t = caca_get_event_type(&ev);
+
+    if(t & CACA_EVENT_KEY_PRESS)
+    {
+        char buf[16];
+        int bytes;
+        bytes = snprintf(buf, sizeof(buf)-1, "KEY %d", caca_get_event_key_ch(&ev));
+        buf[bytes] = '\0';
+        debug("Sending key press to server: %s", buf);
+        return write(sock, buf, strlen(buf)) <= 0;
+    }
+    else if(t & CACA_EVENT_RESIZE)
+        return write(sock, "RESIZE", strlen("RESIZE")) <= 0;
+    else if(t & CACA_EVENT_QUIT)
+        return write(sock, "QUIT", strlen("QUIT")) <= 0;
+
+    return 0;
 }
+

neercs/trunk/src/input.c

@@ -136 +136 @@
     case 'd':
     case 0x04: //CACA_KEY_CTRL_D:
-        detach(screen_list, screen_list->dp);
+        detach(screen_list);
         break;
     }

neercs/trunk/src/main.c

@@ -81 +81 @@
     struct screen_list *screen_list = NULL;
     struct passwd *user_info;
-    char *user_path = NULL, *user_dir = NULL, *session_name = NULL;
+    char *user_path = NULL, *user_dir = NULL;
     int i, args, s=0;
-    int eof = 0, refresh = 1, command = 0;
+    int refresh = 1;
     long long unsigned int last_key_time = 0;
     int mainret = 0;
     int attach = 0, forceattach = 0;
     int *to_grab = NULL;
+    char **to_start = NULL;
     int nb_to_grab = 0;
 
@@ -159 +160 @@
             break;
         case 'S':
-            if(screen_list->session_name)
-                free(screen_list->session_name);
-            screen_list->session_name = strdup(myoptarg);
+            if(!screen_list->session_name)
+                screen_list->session_name = strdup(myoptarg);
             s+=2;
             break;
@@ -175 +175 @@
             if(!to_grab)
             {
-                /* At most argc-1-s times -P <pid> */
-                to_grab = (int *)malloc(((argc-1-s)/2)*sizeof(int));
+                /* At most argc-1-s times -P <pid> + final 0 */
+                to_grab = (int *)malloc(((argc-1-s)/2+1)*sizeof(int));
                 if(!to_grab)
                 {
@@ -184 +184 @@
             }
             to_grab[nb_to_grab++] = pidopt;
+            to_grab[nb_to_grab] = 0;
             s+=2;
             break;
@@ -196 +197 @@
             if(myoptarg)
             {
-                session_name = strdup(myoptarg);
+                if(screen_list->session_name)
+                    free(screen_list->session_name);
+                screen_list->session_name = strdup(myoptarg);
                 s+=1;
             }
@@ -217 +220 @@
     }
 
+    if(s < argc - 1)
+    {
+        to_start = (char**)malloc((argc-s)*sizeof(char*));
+        if(!to_start)
+        {
+            fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
+            return -1;
+        }
+        for(i=0; i<(argc-1) - s; i++)
+        {
+            to_start[i] = strdup(argv[i+s+1]);
+        }
+        to_start[argc-1-s] = NULL;
+    }
+
     /* Read global configuration first */
     read_configuration_file("/etc/neercsrc", screen_list);
@@ -235 +253 @@
             return -1;
         }
-        sockets = list_sockets(screen_list->socket_dir, session_name);
-        if(!screen_list->session_name)
-            screen_list->session_name = session_name;
-        else
-            free(session_name);
+        sockets = list_sockets(screen_list->socket_dir, screen_list->session_name);
         if(sockets && sockets[0])
         {
-            request_attach(sockets[0]);
-            fprintf(stderr, "Failed to attach!\n");
+            char *session;
+            for(i=0; sockets[i]; i++);
+            i--;
+            session = connect_server(sockets[i], screen_list);
+            if(session)
+            {
+                request_attach(screen_list);
+                if(screen_list->session_name)
+                    free(screen_list->session_name);
+                screen_list->session_name = session;
+            }
+            else
+            {
+                fprintf(stderr, "Failed to attach!\n");
+                attach = 0;
+            }
             for(i=0; sockets[i]; i++)
                 free(sockets[i]);
@@ -251 +279 @@
         {
             fprintf(stderr, "No socket found!\n");
-        }
-        if(forceattach)
+            attach = 0;
+        }
+        if(forceattach && !attach)
             return -1;
     }
@@ -268 +297 @@
             return -1;
         }
+    }
+
+    /* Fork the server if needed */
+    if(!attach)
+    {
+        pid_t pid;
+
+        screen_list->socket_path = build_socket_path(screen_list->socket_path, screen_list->session_name);
+
+        pid = fork();
+        if(pid < 0)
+        {
+            fprintf(stderr, "Failed to create child process\n");
+            return -1;
+        }
+        if(pid == 0)
+        {
+            int fd;
+            close(0);
+            close(1);
+            close(2);
+            fd = open("/dev/null", O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
+            dup2(fd, 0);
+#ifndef DEBUG
+            dup2(fd, 1);
+            dup2(fd, 2);
+            if (fd > 2)
+                close(fd);
+#else
+            if(fd != 0)
+                close(fd);
+            fd = open("/tmp/log.txt", O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
+            dup2(fd, 1);
+            dup2(fd, 2);
+            if (fd > 2)
+                close(fd);
+#endif
+            setsid();
+            return server_main(to_grab, to_start, screen_list);
+        }
+
+        free(connect_server(screen_list->socket_path, screen_list));
     }
 
@@ -276 +347 @@
         return 1;
     caca_set_cursor(screen_list->dp, 1);
-
     screen_list->width  = cucul_get_canvas_width(screen_list->cv);
     screen_list->height = cucul_get_canvas_height(screen_list->cv) - ((screen_list->mini*6) + (screen_list->status));
 
-    if(nb_to_grab == 0 && s == argc -1)
-    {
-        add_screen(screen_list,
-                   create_screen(screen_list->width,
-                                 screen_list->height,
-                                 screen_list->default_shell));
-    }
-
-    /* Attach processes */
-    for(i=0; i<nb_to_grab; i++)
-    {
-        add_screen(screen_list,create_screen_grab(screen_list->width, screen_list->height, to_grab[i]));
-    }
-    free(to_grab);
-
-    /* Launch command line processes */
-    for(i=0; i<(argc-1) - s; i++)
-    {
-        add_screen(screen_list, create_screen(screen_list->width, screen_list->height, argv[i+s+1]));
-    }
-
-    /* Windows are in a temporary state, resize them to the right dimensions */
-    update_windows_props(screen_list);
-
     last_key_time = get_us();
 
@@ -310 +356 @@
         caca_event_t ev;
         int ret = 0;
-
-        /* Read program output */
-        refresh |= update_screens_contents(screen_list);
-
-        /* If screen was attached, read its output */
-        refresh |= read_socket(screen_list, screen_list->cv, &screen_list->dp);
-
-        /* No more screens, exit */
-        if(!screen_list->count) break;
-
-        /* Update each screen canvas  */
-        refresh |= update_terms(screen_list);
-
-        /* Get events, if any */
-        if(screen_list->attached)
-            ret = caca_get_event(screen_list->dp, CACA_EVENT_ANY, &ev, 0);
-        else
-            sleep(1);
-
-        if(ret && (caca_get_event_type(&ev) & CACA_EVENT_KEY_PRESS))
-        {
-            unsigned int c = caca_get_event_key_ch(&ev);
-            char *str = NULL;
-            int size = 0;
-            /* CTRL-A has been pressed before, handle this as a
-             * command, except that CTRL-A a sends literal CTRL-A */
-            if(command && (c != 'a'))
-            {
-                command = 0;
-                refresh |= handle_command_input(screen_list, c);
-            }
-            else
-            {
-                /* Not in command mode */
-                last_key_time = get_us();
-                caca_set_cursor(screen_list->dp, 1);
-
-                /* Kill screensaver */
-                if(screen_list->in_screensaver)
-                {
-                    screensaver_kill(screen_list);
-                    screen_list->in_screensaver = 0;
-                    refresh = 1;
-                    continue;
-                }
-                /* Handle lock window */
-                if(screen_list->locked)
-                    refresh |= update_lock(c, screen_list);
-                else
-                {
-                    switch(c)
-                    {
-                    case 0x01: //CACA_KEY_CTRL_A:
-                        command = 1; break;
-                    case CACA_KEY_ESCAPE:
-                        if(screen_list->help)
-                        {
-                            screen_list->help = 0;
-                            refresh = 1;
-                            break;
-                        }
-                    default:
-                        /* CTRL-A a sends literal CTRL-A */
-                        if (command && (c == 'a'))
-                        {
-                            c = 0x01;
-                        }
-                        /* Normal key, convert it if needed */
-                        str = convert_input_ansi(&c, &size);
-                        write(screen_list->screen[screen_list->pty]->fd, str, size);
-                        break;
-                    }
-                }
-            }
-        }
-        /* Window resized */
-        else if(ret && (caca_get_event_type(&ev) & CACA_EVENT_RESIZE))
-        {
-            update_windows_props(screen_list);
-            cucul_clear_canvas(screen_list->cv);
-            refresh = 1;
-        }
-        /* Window closed */
-        else if(ret && (caca_get_event_type(&ev) & CACA_EVENT_QUIT))
-        {
-            refresh = 1;
-            break;
-        }
-
-        /* Launch reccurents if any */
-        refresh |= handle_recurrents(screen_list);
-
-        /* Resfresh screen */
-        if(!screen_list->attached)
-        {
-            /* No need to refresh */
-        }
-        /* Draw lock window */
-        else if(screen_list->locked)
-        {
-            draw_lock(screen_list);
-            refresh = 1;
-        }
-        else
-        {
-            if((refresh || screen_list->in_bell) &&
-               (get_us() - last_key_time < screen_list->screensaver_timeout))
-            {
-                refresh_screens(screen_list);
-                if(screen_list->screen[screen_list->pty]->title)
-                    caca_set_display_title(screen_list->dp, screen_list->screen[screen_list->pty]->title);
-                else
-                    caca_set_display_title(screen_list->dp, PACKAGE_STRING);
-                refresh = 1;
-
-            }
-            if((get_us() - last_key_time > screen_list->screensaver_timeout))
-            {
-                if(!screen_list->in_screensaver)
-                    screensaver_init(screen_list);
-                screen_list->in_screensaver = 1;
-
-                caca_set_cursor(screen_list->dp, 0);
-                draw_screensaver(screen_list);
-                refresh = 1;
-            }
-
-            if((get_us() - last_key_time > screen_list->autolock_timeout))
-            {
-                screen_list->locked = 1;
-                refresh = 1;
-            }
-
-        }
-
-        /* Refresh screen if needed */
-        if(refresh)
-        {
-            caca_refresh_display(screen_list->dp);
-            refresh = 0;
-        }
-
-        eof = 1;
-        for(i=0; i < screen_list->count; i++)
-            if(screen_list->screen[i]->fd >= 0)
-                eof = 0;
-        if(eof)
+        ssize_t n;
+        char buf[4097];
+
+        while (screen_list->socket && (n = read(screen_list->socket, buf, sizeof(buf)-1)) > 0)
+        {
+            buf[n] = 0;
+            debug("Received from server: %s", buf);
+            if(!strncmp("DETACH", buf, 6))
+            {
+                ret = 1;
+                break;
+            }
+            else if(!strncmp("REFRESH", buf, 7))
+            {
+                /* FIXME update the canvas first */
+                caca_refresh_display(screen_list->dp);
+            }
+            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);
+            }
+        }
+        if(ret)
+            break;
+
+        ret = caca_get_event(screen_list->dp, CACA_EVENT_ANY, &ev, 100000);
+        if(ret)
+            ret = send_event(ev, screen_list->socket);
+
+        if(ret)
             break;
     }
@@ -472 +406 @@
 
     if(screen_list->socket_path) {
-        unlink(screen_list->socket_path);
         free(screen_list->socket_path);
     }
@@ -510 +443 @@
     return mainret;
 }
-
-
 
 
@@ -566 +497 @@
     return screen_list;
 }
-
-
-
-long long get_us(void)
-{
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return (tv.tv_sec*(1000000) + tv.tv_usec);
-}

neercs/trunk/src/neercs.h

@@ -216 +216 @@
 long long get_us(void);
 
-int detach(struct screen_list* screen_list, caca_display_t * dp);
-int request_attach(char *socket_path);
+int detach(struct screen_list* screen_list);
+int request_attach(struct screen_list* screen_list);
+char * build_socket_path(char *socket_dir, char *session_name);
 int create_socket(struct screen_list* screen_list);
-int read_socket(struct screen_list* screen_list, cucul_canvas_t * cv, caca_display_t ** dp);
+char * connect_server(char *socket_path, struct screen_list* screen_list);
 char ** list_sockets(char *socket_dir, char *session_name);
+int server_main(int *to_grab, char **to_start, struct screen_list *screen_list);
+int send_event(caca_event_t ev, int sock);
 
 /* Screens management */