Changeset 3327 for neercs/trunkTweet

Timestamp:

Nov 16, 2008, 10:55:46 PM (12 years ago)

Author:

Pascal Terjan

Message:

• Have an interactive menu to select the session to attach

File:

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

neercs/trunk/src/attach.c

@@ -33 +33 @@
 }
 
+static char * socket_to_session(char const * sockpath)
+{
+    char *p, *s;
+    p = strrchr(sockpath, '/');
+    if(!p)
+    {
+        debug("Invalid socket path %s", sockpath);
+        return NULL;
+    }
+    p+=8; /* skip neercs. */
+    s = strdup(p);
+    p = strrchr(s, '.');
+    *p = '\0'; /* drop .sock */
+    p = strrchr(s, '.');
+    *p = '\0'; /* drop .srv */
+    p = strdup(s);
+    free(s);
+    return p;
+}
+
 int create_socket(struct screen_list* screen_list, enum socket_type socktype)
 {
@@ -109 +129 @@
     int sock;
     struct sockaddr_un addr;
-    char *p, *s;
 
     debug("Connecting to %s", screen_list->socket_path[socktype]);
@@ -134 +153 @@
     if(socktype == SOCK_SERVER)
     {
-        p = strrchr(screen_list->socket_path[socktype], '/');
-        p+=8; /* skip neercs. */
-        s = strdup(p);
-        p = strrchr(s, '.');
-        *p = '\0'; /* drop .sock */
-        p = strrchr(s, '.');
-        *p = '\0'; /* drop .srv */
-        p = strdup(s);
-        free(s);
-        return p;
+        return socket_to_session(screen_list->socket_path[socktype]);
     }
     else
@@ -163 +173 @@
 }
 
+static char * select_socket(struct screen_list* screen_list)
+{
+    char **sockets = NULL, **usable_sockets = NULL;
+    int i, sock, nb_usable_sockets = 0;
+    char *ret = NULL;
+
+    sockets = list_sockets(screen_list->socket_dir, screen_list->session_name);
+    if(sockets)
+    {
+        for(i=0; sockets[i]; i++);
+
+        /* Return the socket or NULL if there is not more than one match */
+        if(i<=1)
+        {
+            if(sockets[0])
+                ret = strdup(sockets[0]);
+            goto end;
+        }
+
+        /* Else ask the user to chose one */
+        usable_sockets = malloc(i*sizeof(char*));
+        for(i=0; sockets[i]; i++)
+        {
+            struct sockaddr_un addr;
+            if ((sock = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0) {
+                perror("select_socket:socket");
+                goto end;
+            }
+            memset(&addr,0,sizeof(addr));
+            addr.sun_family = AF_UNIX;
+            strcpy(addr.sun_path, sockets[i]);
+            if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0)
+            {
+                switch(errno)
+                {
+                case EACCES:
+                    debug("Connection refused on %s", sockets[i]);
+                    break;
+                case ECONNREFUSED:
+                    fprintf(stderr, "%s is dead\n", sockets[i]);
+                    break;
+                default:
+                    fprintf(stderr, "Unknown error on %s:%s\n", sockets[i], strerror(errno));
+                }
+            }
+            else
+            {
+                usable_sockets[nb_usable_sockets] = strdup(sockets[i]);
+                nb_usable_sockets++;
+                close(sock);
+            }
+        }
+        if(!nb_usable_sockets)
+            goto end;
+        if(nb_usable_sockets == 1)
+        {
+            ret = usable_sockets[0];
+            goto end;
+        }
+        else
+        {
+            caca_event_t ev;
+            enum caca_event_type t;
+            int current_line = 1;
+            int refresh = 1;
+            screen_list->cv = caca_create_canvas(0, 0);
+            screen_list->dp = caca_create_display(screen_list->cv);
+            if(!screen_list->dp)
+                goto end;
+            caca_set_cursor(screen_list->dp, 0);
+            caca_printf(screen_list->cv, 1, 0, "Please select a session to reconnect:");
+            while(1)
+            {
+                if(refresh)
+                {
+                    for(i=0; i<nb_usable_sockets; i++)
+                    {
+                        if(i == current_line-1)
+                        {
+                            caca_set_attr(screen_list->cv, CACA_BOLD);
+                            caca_set_color_ansi(screen_list->cv, CACA_GREEN, CACA_BLACK);
+                            caca_put_char(screen_list->cv, 0, i+1, '>');
+                        }
+                        else
+                        {
+                            caca_set_attr(screen_list->cv, 0);
+                            caca_set_color_ansi(screen_list->cv, CACA_LIGHTGRAY, CACA_BLACK);
+                            caca_put_char(screen_list->cv, 0, i+1, ' ');
+                        }
+                        caca_printf(screen_list->cv,
+                                    1, i+1,
+                                    "%s",
+                                    socket_to_session(usable_sockets[i]));
+                    }
+                    caca_refresh_display(screen_list->dp);
+                    refresh = 0;
+                }
+
+                if(!caca_get_event(screen_list->dp,
+                                  CACA_EVENT_KEY_PRESS
+                                  |CACA_EVENT_RESIZE
+                                  |CACA_EVENT_QUIT,
+                                  &ev, 10000))
+                    continue;
+
+                t = caca_get_event_type(&ev);
+
+                if(t & CACA_EVENT_KEY_PRESS)
+                {
+                    unsigned int c = caca_get_event_key_ch(&ev);
+                    switch(c)
+                    {
+                    case CACA_KEY_UP:
+                        if(current_line>1)
+                            current_line--;
+                        break;
+                    case CACA_KEY_DOWN:
+                        if(current_line<nb_usable_sockets)
+                            current_line++;
+                        break;
+                    case CACA_KEY_RETURN:
+                        ret = strdup(usable_sockets[current_line-1]);
+                        goto end;
+                        break;
+                    default:
+                        break;
+                    }
+                    refresh = 1;
+                }
+                else if(t & CACA_EVENT_RESIZE)
+                {
+                    refresh = 1;
+                }
+                else if(t & CACA_EVENT_QUIT)
+                    goto end;
+            }
+        }
+    }
+
+end:
+    if(sockets)
+    {
+        for(i=0; sockets[i]; i++)
+            free(sockets[i]);
+        free(sockets);
+    }
+    if(usable_sockets)
+    {
+        for(i=0; i<nb_usable_sockets; i++)
+            free(usable_sockets[i]);
+        free(usable_sockets);
+    }
+    if(screen_list->dp)
+    {
+        caca_free_display(screen_list->dp);
+        screen_list->dp = NULL;
+    }
+    if(screen_list->cv)
+    {
+        caca_free_canvas(screen_list->cv);
+        screen_list->cv = NULL;
+    }
+    return ret;
+}
+
 void attach(struct screen_list* screen_list)
 {
-    char **sockets;
-    int i;
-
-    sockets = list_sockets(screen_list->socket_dir, screen_list->session_name);
-    if(sockets && sockets[0])
+    screen_list->socket_path[SOCK_SERVER] = select_socket(screen_list);
+
+    if(screen_list->socket_path[SOCK_SERVER])
     {
         char *session;
-        for(i=0; sockets[i]; i++);
-        i--;
-        screen_list->socket_path[SOCK_SERVER] = strdup(sockets[i]);
         session = connect_socket(screen_list, SOCK_SERVER);
-        while(!session && i > 0)
-        {
-            free(screen_list->socket_path[SOCK_SERVER]);
-            i--;
-            screen_list->socket_path[SOCK_SERVER] = strdup(sockets[i]);
-            session = connect_socket(screen_list, SOCK_SERVER);
-        }
-        debug("Connected to session %s", session);
         if(session)
         {
+            debug("Connected to session %s", session);
             /* Create main canvas and associated caca window */
             screen_list->cv = caca_create_canvas(0, 0);
@@ -208 +371 @@
             screen_list->attach = 0;
         }
-        for(i=0; sockets[i]; i++)
-            free(sockets[i]);
-        free(sockets);
     }
     else