Changeset 2480Tweet

Timestamp:

Jun 23, 2008, 11:39:11 PM (15 years ago)

Author:

Pascal Terjan

Message:

• Move most actions outside of option parsing

File:

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

neercs/trunk/src/main.c

@@ -3 +3 @@
  *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
  *                2008 Jean-Yves Lamoureux <jylam@lnxscene.org>
+ *                2008 Pascal Terjan <pterjan@linuxfr.org>
  *                All Rights Reserved
  *
@@ -83 +84 @@
     int lock_offset = 0;
     int mainret = 0;
+    int attach = 0;
+    int *to_grab = NULL;
+    int nb_to_grab = 0;
 
     default_shell = getenv("SHELL");
@@ -95 +99 @@
     if(args==0)
         args = 1;
-
-    /* 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);
-    if(!dp)
-        return 1;
-    caca_set_cursor(dp, 1);
-
-    w = cucul_get_canvas_width(cv);
-    h = cucul_get_canvas_height(cv);
-
 
     /* Create screen list */
@@ -122 +114 @@
     }
 
-
     screen_list->count = 0;
-    screen_list->width  = cucul_get_canvas_width(cv);
     screen_list->mini = 1;
     screen_list->help = 0;
     screen_list->status = 1;
-    screen_list->height = cucul_get_canvas_height(cv) - ((screen_list->mini*6) + (screen_list->status));
     screen_list->wm_type = WM_VSPLIT;
     screen_list->in_bell = 0;
@@ -168 +157 @@
     {
         int option_index = 0;
-        char **sockets;
-        int grab = 0;
+        int pidopt;
         static struct myoption long_options[] =
             {
@@ -189 +177 @@
         {
         case 'P': /* --pid */
-            add_screen(screen_list,create_screen_grab(w, h, atoi(myoptarg)));
+            pidopt = atoi(myoptarg);
+            if(pidopt <= 0)
+            {
+                fprintf(stderr, "Invalid pid %d\n", pidopt);
+                if(to_grab)
+                    free(to_grab);
+                return -1;
+            }
+            if(!to_grab)
+            {
+                /* At most argc-1-s times -P <pid> */
+                to_grab = (int *)malloc(((argc-1-s)/2)*sizeof(int));
+                if(!to_grab)
+                {
+                    fprintf(stderr, "Can't allocate memory at %s:%d\n", __FUNCTION__, __LINE__);
+                    return -1;
+                }
+            }
+            to_grab[nb_to_grab++] = pidopt;
             s+=2;
-            grab = 1;
             break;
         case 'R':
-            if(grab)
-            {
-                fprintf(stderr, "-P and -R can not be used together!\n");
-                mainret = -1;
-                goto end;
-            }
-            caca_free_display(dp);
-            dp = NULL;
-            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);
-            }
-            else
-            {
-                fprintf(stderr, "No socket found!\n");
-                mainret = -1;
-            }
-            goto end;
+            attach = 1;
+            s+=1;
             break;
         case 'h': /* --help */
             usage(argc, argv);
-            goto end;
+            return 0;
             break;
         case 'v': /* --version */
             version();
-            goto end;
+            return 0;
             break;
         default:
             fprintf(stderr, "Unknown argument #%d\n", myoptind);
-            mainret = -1;
-            goto end;
-            break;
-        }
-    }
-
-
-    if(s == 0 && argc<2)
+            return -1;
+            break;
+        }
+    }
+
+    if(attach)
+    {
+        char **sockets;
+        if(nb_to_grab || (argc-1 > s))
+        {
+            fprintf(stderr, "-R can be associated with commands or pids!\n");
+            return -1;
+        }
+        sockets = list_sockets(screen_list->socket_dir);
+        if(sockets && sockets[0])
+        {
+            request_attach(sockets[0]);
+            fprintf(stderr, "Failed to attach!\n");
+            for(i=0; sockets[i]; i++)
+                free(sockets[i]);
+            free(sockets);
+        }
+        else
+        {
+            fprintf(stderr, "No socket found!\n");
+        }
+        return -1;
+    }
+
+    /* Create main canvas and associated caca window */
+    cv = cucul_create_canvas(0, 0);
+    dp = caca_create_display(cv);
+    if(!dp)
+        return 1;
+    caca_set_cursor(dp, 1);
+
+    w = cucul_get_canvas_width(cv);
+    h = cucul_get_canvas_height(cv);
+
+    screen_list->width  = cucul_get_canvas_width(cv);
+    screen_list->height = cucul_get_canvas_height(cv) - ((screen_list->mini*6) + (screen_list->status));
+
+    if(nb_to_grab == 0 && s == argc -1)
     {
         add_screen(screen_list, create_screen(w, h, default_shell));
     }
+
+    /* Attach processes */
+    for(i=0; i<nb_to_grab - s; i++)
+    {
+        add_screen(screen_list,create_screen_grab(w, h, to_grab[i]));
+    }
+    free(to_grab);
 
     /* Launch command line processes */
@@ -244 +271 @@
         add_screen(screen_list, create_screen(w, h, argv[i+s+1]));
     }
-
 
     /* Windows are in a temporary state, resize them to the right dimensions */
@@ -534 +560 @@
     }
 
-end:
     /* Clean up */
     if(dp)