Changeset 2474 for neercs/trunk/src/main.cTweet

Timestamp:

Jun 22, 2008, 11:57:21 AM (14 years ago)

Author:

Pascal Terjan

Message:

• First more or less working version of attach

File:

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

neercs/trunk/src/main.c

@@ -71 +71 @@
     printf("Options :\n");
     printf("\t--pid\t\t-P <pid>\t\tattach <pid>\n");
+    printf("\t\t\t-R\t\t\tre-attach another neercs\n");
     printf("\t--version\t-v \t\t\tdisplay version and exit\n");
     printf("\t--help\t\t-h \t\t\tthis help\n");
@@ -86 +87 @@
     long long unsigned int last_key_time = 0;
     int lock_offset = 0;
-
+    int mainret = 0;
 
     default_shell = getenv("SHELL");
@@ -101 +102 @@
 
     /* Create main canvas and associated caca window */
+    /* FIXME: do not create display for -R/-h/-v */
     cv = cucul_create_canvas(0, 0);
     dp = caca_create_display(cv);
@@ -141 +143 @@
     screen_list->locked = 0;
     screen_list->attached = 1;
+    screen_list->socket = 0;
+    screen_list->socket_dir = NULL;
+    screen_list->socket_path = NULL;
     memset(screen_list->lockmsg, 0, 1024);
     memset(screen_list->lockpass, 0, 1024);
-
 
     if(!read_configuration_file("neercs.ini", screen_list))
@@ -169 +173 @@
     {
         int option_index = 0;
+        char **sockets;
+        int grab = 0;
         static struct myoption long_options[] =
             {
@@ -178 +184 @@
             };
 #if defined USE_GRAB
-        int c = mygetopt(argc, argv, "P:hv", long_options, &option_index);
+        int c = mygetopt(argc, argv, "RP:hv", long_options, &option_index);
 #else
-        int c = mygetopt(argc, argv, "hv", long_options, &option_index);
+        int c = mygetopt(argc, argv, "Rhv", long_options, &option_index);
 #endif
         if(c == -1)
@@ -190 +196 @@
             add_screen(screen_list,create_screen_grab(w, h, atoi(myoptarg)));
             s+=2;
+            grab = 1;
+            break;
+        case 'R':
+            if(grab)
+            {
+                fprintf(stderr, "-P and -R can not be used together!\n");
+                mainret = -1;
+                goto end;
+            }
+            sockets = list_sockets(screen_list->socket_dir);
+            if(sockets && sockets[0])
+            {
+                request_attach(sockets[0]);
+                for(i=0; sockets[i]; i++)
+                    free(sockets[i]);
+                free(sockets);
+            }
+            goto end;
             break;
         case 'h': /* --help */
             usage(argc, argv);
-            return 0;
+            goto end;
             break;
         case 'v': /* --version */
@@ -200 +224 @@
             break;
         default:
-            fprintf(stderr, "Unknow argument #%d\n", myoptind);
-            return -1;
+            fprintf(stderr, "Unknown argument #%d\n", myoptind);
+            mainret = -1;
+            goto end;
             break;
         }
@@ -233 +258 @@
 
         refresh |= update_screens_contents(screen_list);
+
+        refresh |= read_socket(screen_list, cv, &dp);
 
         /* No more screens, exit */
@@ -510 +537 @@
     }
 
+    if(screen_list->socket_path) {
+        unlink(screen_list->socket_path);
+        free(screen_list->socket_path);
+    }
+    if(screen_list->socket)
+        close(screen_list->socket);
+
     free(screen_list->screen);
 
@@ -536 +570 @@
     free(recurrent_list);
 
-    return 0;
+    return mainret;
 }