Move zoom functions into x.c

[st.git] / arg.h

diff --git a/arg.h b/arg.h
index 4df77a7..ba3fb3f 100644 (file)
--- a/arg.h
+++ b/arg.h
@@ -10,8 +10,8 @@ extern char *argv0;
 
 /* use main(int argc, char *argv[]) */
 #define ARGBEGIN       for (argv0 = *argv, argv++, argc--;\
 
 /* use main(int argc, char *argv[]) */
 #define ARGBEGIN       for (argv0 = *argv, argv++, argc--;\

-                                       argv[0] && argv[0][1]\
-                                       && argv[0][0] == '-';\
+                                       argv[0] && argv[0][0] == '-'\
+                                       && argv[0][1];\

                                        argc--, argv++) {\
                                char argc_;\
                                char **argv_;\
                                        argc--, argv++) {\
                                char argc_;\
                                char **argv_;\


@@ -28,26 +28,11 @@ extern char *argv0;
                                                break;\
                                        argc_ = argv[0][0];\
                                        switch (argc_)
                                                break;\
                                        argc_ = argv[0][0];\
                                        switch (argc_)

-
-/* Handles obsolete -NUM syntax */
-#define ARGNUM                         case '0':\
-                                       case '1':\
-                                       case '2':\
-                                       case '3':\
-                                       case '4':\
-                                       case '5':\
-                                       case '6':\
-                                       case '7':\
-                                       case '8':\
-                                       case '9'
-

 #define ARGEND                 }\
                        }
 
 #define ARGC()         argc_
 
 #define ARGEND                 }\
                        }
 
 #define ARGC()         argc_
 

-#define ARGNUMF(base)  (brk_ = 1, estrtol(argv[0], (base)))
-

 #define EARGF(x)       ((argv[0][1] == '\0' && argv[1] == NULL)?\
                                ((x), abort(), (char *)0) :\
                                (brk_ = 1, (argv[0][1] != '\0')?\
 #define EARGF(x)       ((argv[0][1] == '\0' && argv[1] == NULL)?\
                                ((x), abort(), (char *)0) :\
                                (brk_ = 1, (argv[0][1] != '\0')?\