Changeset 2588 for neercs/trunk/src/attach.c

Timestamp:

07/27/08 01:17:04 (5 years ago)

Author:

pterjan

Message:

• Rewrote detach handling, enjoy silent neercs

File:

• neercs/trunk/src/attach.c (modified) (6 diffs)

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;
 }
+