Move opt_* into same file as main()/run()

[st.git] / st.h

diff --git a/st.h b/st.h
index 5d44411..09473c2 100644 (file)
--- a/st.h
+++ b/st.h
@@ -9,6 +9,7 @@
 #define LEN(a)                 (sizeof(a) / sizeof(a)[0])
 #define BETWEEN(x, a, b)       ((a) <= (x) && (x) <= (b))
 #define DIVCEIL(n, d)          (((n) + ((d) - 1)) / (d))
+#define DEFAULT(a, b)          (a) = (a) ? (a) : (b)
 #define LIMIT(x, a, b)         (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
 #define ATTRCMP(a, b)          ((a).mode != (b).mode || (a).fg != (b).fg || \
                                (a).bg != (b).bg)
@@ -176,6 +177,16 @@ typedef struct {
        const Arg arg;
 } Shortcut;
 
+typedef struct {
+       KeySym k;
+       uint mask;
+       char *s;
+       /* three valued logic variables: 0 indifferent, 1 on, -1 off */
+       signed char appkey;    /* application keypad */
+       signed char appcursor; /* application cursor */
+       signed char crlf;      /* crlf mode          */
+} Key;
+
 void die(const char *, ...);
 void redraw(void);
 
@@ -184,18 +195,15 @@ void tnew(int, int);
 void tresize(int, int);
 void tsetdirt(int, int);
 void tsetdirtattr(int);
-int match(uint, uint);
-void ttynew(void);
+void ttynew(char *, char *, char **);
 size_t ttyread(void);
-void ttyresize(void);
+void ttyresize(int, int);
 void ttysend(char *, size_t);
 void ttywrite(const char *, size_t);
 
 void resettitle(void);
 
-char *kmap(KeySym, uint);
 void selclear(void);
-
 void selinit(void);
 void selnormalize(void);
 int selected(int, int);
@@ -214,14 +222,6 @@ extern Term term;
 extern Selection sel;
 extern int cmdfd;
 extern pid_t pid;
-extern char **opt_cmd;
-extern char *opt_class;
-extern char *opt_embed;
-extern char *opt_font;
-extern char *opt_io;
-extern char *opt_line;
-extern char *opt_name;
-extern char *opt_title;
 extern int oldbutton;
 
 /* config.h globals */
@@ -255,7 +255,12 @@ extern MouseShortcut mshortcuts[];
 extern size_t mshortcutslen;
 extern Shortcut shortcuts[];
 extern size_t shortcutslen;
+extern KeySym mappedkeys[];
+extern size_t mappedkeyslen;
+extern uint ignoremod;
 extern uint forceselmod;
+extern Key key[];
+extern size_t keyslen;
 extern uint selmasks[];
 extern size_t selmaskslen;
 extern char ascii_printable[];