Changeset 2444Tweet

Timestamp:

Jun 16, 2008, 1:04:49 PM (15 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Changed command line parsing to sam's mygetopt.c

Location:

neercs/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• grab.c (modified) (5 diffs)
• main.c (modified) (6 diffs)
• mygetopt.c (added)
• mygetopt.h (added)
• neercs.h (modified) (2 diffs)
• term.c (modified) (2 diffs)

neercs/trunk/src/Makefile.am

@@ -7 +7 @@
 endif
 
-neercs_SOURCES = neercs.h $(grab_c) main.c screens.c term.c effects.c wm.c
+neercs_SOURCES = neercs.h $(grab_c) mygetopt.c main.c screens.c term.c effects.c wm.c
 neercs_CFLAGS = @CACA_CFLAGS@
 neercs_LDADD = @CACA_LIBS@ @UTIL_LIBS@

neercs/trunk/src/grab.c

@@ -16 +16 @@
 
 #include "neercs.h"
+int grab_process(pid_t pid, char *ptyname, int ptyfd);
 
 static int memcpy_from_target(pid_t pid, void* dest, void* src, size_t n)
@@ -125 +126 @@
     regs.ebx = oldfd;
     regs.ecx = newfd;
-   
+
     return do_syscall(pid, &regs);
 }
@@ -149 +150 @@
 
     /* +4 because it's trcuncated on a multiple of 4 and we need 1 */
-    memcpy_into_target(pid, target_page, path, strlen(path)+4); 
+    memcpy_into_target(pid, target_page, path, strlen(path)+4);
 
     regs.eax = SYS_open;
@@ -155 +156 @@
     regs.ecx = O_RDWR;
     regs.edx = 0755;
-   
+
     if((ret = do_syscall(pid, &regs)) < 0)
     {
@@ -309 +310 @@
         }
     }
-    
+
     kill(pid, SIGWINCH);
 

neercs/trunk/src/main.c

@@ -31 +31 @@
 #   include <util.h> /* for OS X */
 #endif
+#if !defined HAVE_GETOPT_LONG
+#   include "mygetopt.h"
+#elif defined HAVE_GETOPT_H
+#   include <getopt.h>
+#endif
+#if defined HAVE_GETOPT_LONG
+#   define mygetopt getopt_long
+#   define myoptind optind
+#   define myoptarg optarg
+#   define myoption option
+#endif
 #include <errno.h>
 #include <cucul.h>
@@ -36 +47 @@
 
 #include "neercs.h"
+
+
+void version(void)
+{
+    printf("%s\n", PACKAGE_STRING);
+    printf("Copyright (C) 2006, 2008 Sam Hocevar <sam@zoy.org>\n");
+    printf("                         Jean-Yves Lamoureux <jylam@lnxscene.org>\n\n");
+    printf("This is free software.  You may redistribute copies of it under the\n");
+    printf("terms of the Do What The Fuck You Want To Public License, Version 2\n");
+    printf("<http://sam.zoy.org/wtfpl/>.\n");
+    printf("There is NO WARRANTY, to the extent permitted by law.\n");
+    printf("\n");
+    printf("For more informations, visit http://libcaca.zoy.org/wiki/neercs\n");
+}
+
 
 int main(int argc, char **argv)
@@ -43 +69 @@
     struct screen_list *screen_list = NULL;
     char *default_shell = NULL;
-    int i, w, h, args;
+    int i, w, h, args, s=0;
     int eof = 0, refresh = 1, command = 0;
 
@@ -65 +91 @@
     caca_set_cursor(dp, 1);
 
-
     w = cucul_get_canvas_width(cv);
     h = cucul_get_canvas_height(cv);
-
 
 
@@ -94 +118 @@
     screen_list->pty = screen_list->prevpty = 0;
 
-    for(i = 0; i < args; i++)
-    {
-        struct screen *tmp;
-        if(argc < 2)
-            tmp = create_screen(w, h, default_shell);
-        else
-        {
-            if(!strcmp(argv[i + 1], "-P"))
+    for(;;)
+    {
+        int option_index = 0;
+        static struct myoption long_options[] =
             {
 #ifdef USE_GRAB
-                if(i + 2 > argc)
-                {
-                    fprintf(stderr, "-P needs a parameter !\n");
-                    exit(1);
-                }
-                tmp = create_screen_grab(w, h, atoi(argv[i + 2]));
-                i++;
-#else
-                fprintf(stderr, "Grabbing process is not supported, sorry\n");
-                exit(1);
-#endif
-            }
-            else
-                tmp = create_screen(w, h, argv[i + 1]);
-        }
-
-        if(tmp)
-        {
-            if(add_screen(screen_list, tmp) < 0)
-            {
-                fprintf(stderr, "Can't add %p to %p\n", tmp, screen_list);
-            }
-        }
-        else
-        {
-            fprintf(stderr, "Can't create screen\n");
-        }
-    }
+                { "pid",         1, NULL, 'P' },
+#endif
+                { "help",        0, NULL, 'h' },
+                { "version",     0, NULL, 'v' },
+            };
+        int c = mygetopt(argc, argv, "P:hv", long_options, &option_index);
+        if(c == -1)
+            break;
+
+        switch(c)
+        {
+#ifdef USE_GRAB
+        case 'P': /* --pid */
+            add_screen(screen_list,create_screen_grab(w, h, atoi(myoptarg)));
+            s+=2;
+            break;
+#endif
+        case 'h': /* --help */
+            //   usage(argc, argv);
+            return 0;
+            break;
+        case 'v': /* --version */
+            version();
+            goto end;
+            break;
+        default:
+            fprintf(stderr, "Unknow argument #%d\n", myoptind);
+            return -1;
+            break;
+        }
+    }
+
+
+    if(s == 0 && argc<2)
+    {
+        add_screen(screen_list, create_screen(w, h, default_shell));
+    }
+
+    /* Launch command line processes */
+    for(i=0; i<(argc-1) - s; i++)
+    {
+        add_screen(screen_list, create_screen(w, h, argv[i+s+1]));
+    }
+
 
     /* Windows are in a temporary state, resize them to the right dimensions */
@@ -262 +298 @@
     }
 
+end:
     /* Clean up */
     caca_free_display(dp);

neercs/trunk/src/neercs.h

@@ -16 +16 @@
 #include <stdint.h>
 #include <caca.h>
-
-#define CURRENTSCREEN screen_list->screen[screen_list->pty]
-
 
 enum wm_types
@@ -74 +71 @@
 
 
+void version(void);
+
+
+
 int create_pty(char *cmd, unsigned int w, unsigned int h, int *cpid);
 #ifdef USE_GRAB

neercs/trunk/src/term.c

@@ -167 +167 @@
              * ECMA-48 5.4: Control sequences, and the code definitions are
              * given in ECMA-48 8.3: Definition of control functions. */
-
+            debug("Got command '%c'\n", buffer[i + final]);
             switch(buffer[i + final])
             {
@@ -256 +256 @@
                 break;
             case 'r': /* SS  (0x72) - Scroll Screen FIXME */
-
+                if(scrolled) break;
                 if((argv[0]==0 && argv[1]==0)  || scrolled) break;
                 for(j = argv[0]-1; j < argv[1]-1; j++)