Move config.h include from st.c to x.c

[st.git] / st.h

diff --git a/st.h b/st.h
index 28a751d..9314607 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 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)
 #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)


@@ -80,11 +81,6 @@ enum selection_snap {
        SNAP_LINE = 2
 };
 
        SNAP_LINE = 2
 };
 

-enum window_state {
-       WIN_VISIBLE = 1,
-       WIN_FOCUSED = 2
-};
-

 typedef unsigned char uchar;
 typedef unsigned int uint;
 typedef unsigned long ulong;
 typedef unsigned char uchar;
 typedef unsigned int uint;
 typedef unsigned long ulong;


@@ -92,6 +88,7 @@ typedef unsigned short ushort;
 
 typedef uint_least32_t Rune;
 
 
 typedef uint_least32_t Rune;
 

+#define Glyph Glyph_

 typedef struct {
        Rune u;           /* character code */
        ushort mode;      /* attribute flags */
 typedef struct {
        Rune u;           /* character code */
        ushort mode;      /* attribute flags */


@@ -115,7 +112,6 @@ typedef struct {
        Line *line;   /* screen */
        Line *alt;    /* alternate screen */
        int *dirty;  /* dirtyness of lines */
        Line *line;   /* screen */
        Line *alt;    /* alternate screen */
        int *dirty;  /* dirtyness of lines */

-       GlyphFontSpec *specbuf; /* font spec buffer used for rendering */

        TCursor c;    /* cursor */
        int top;      /* top    scroll limit */
        int bot;      /* bottom scroll limit */
        TCursor c;    /* cursor */
        int top;      /* top    scroll limit */
        int bot;      /* bottom scroll limit */


@@ -181,37 +177,50 @@ typedef struct {
        const Arg arg;
 } Shortcut;
 
        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);
 
 void die(const char *, ...);
 void redraw(void);
 

+void iso14755(const Arg *);
+void numlock(const Arg *);
+void printscreen(const Arg *);
+void printsel(const Arg *);
+void sendbreak(const Arg *);
+void toggleprinter(const Arg *);
+

 int tattrset(int);
 void tnew(int, int);
 int tattrset(int);
 void tnew(int, int);

+void tresize(int, int);

 void tsetdirt(int, int);
 void tsetdirtattr(int);
 void tsetdirt(int, int);
 void tsetdirtattr(int);

-int match(uint, uint);
-void ttynew(void);
+void ttynew(char *, char *, char **);

 size_t ttyread(void);
 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);
 
 void ttysend(char *, size_t);
 void ttywrite(const char *, size_t);
 
 void resettitle(void);
 

-char *kmap(KeySym, uint);
-void cresize(int, int);

 void selclear(void);
 void selclear(void);

-

 void selinit(void);
 void selnormalize(void);
 int selected(int, int);
 char *getsel(void);
 void selinit(void);
 void selnormalize(void);
 int selected(int, int);
 char *getsel(void);

-int x2col(int);
-int y2row(int);

 
 

-size_t utf8decode(char *, Rune *, size_t);
+size_t utf8decode(const char *, Rune *, size_t);

 size_t utf8encode(Rune, char *);
 
 void *xmalloc(size_t);
 size_t utf8encode(Rune, char *);
 
 void *xmalloc(size_t);

+void *xrealloc(void *, size_t);

 char *xstrdup(char *);
 
 /* Globals */
 char *xstrdup(char *);
 
 /* Globals */


@@ -220,51 +229,16 @@ extern Term term;
 extern Selection sel;
 extern int cmdfd;
 extern pid_t pid;
 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;
 
 extern int oldbutton;
 

-extern char *usedfont;
-extern double usedfontsize;
-extern double defaultfontsize;
-

 /* config.h globals */
 /* config.h globals */

-extern char font[];
-extern int borderpx;
-extern float cwscale;
-extern float chscale;
-extern unsigned int doubleclicktimeout;
-extern unsigned int tripleclicktimeout;
+extern char *shell;
+extern char *utmp;
+extern char *stty_args;
+extern char *vtiden;
+extern char *worddelimiters;

 extern int allowaltscreen;
 extern int allowaltscreen;

-extern unsigned int xfps;
-extern unsigned int actionfps;
-extern unsigned int cursorthickness;
-extern unsigned int blinktimeout;
-extern char termname[];
-extern const char *colorname[];
-extern size_t colornamelen;
+extern char *termname;
+extern unsigned int tabspaces;

 extern unsigned int defaultfg;
 extern unsigned int defaultbg;
 extern unsigned int defaultfg;
 extern unsigned int defaultbg;

-extern unsigned int defaultcs;
-extern unsigned int defaultrcs;
-extern unsigned int cursorshape;
-extern unsigned int cols;
-extern unsigned int rows;
-extern unsigned int mouseshape;
-extern unsigned int mousefg;
-extern unsigned int mousebg;
-extern unsigned int defaultattr;
-extern MouseShortcut mshortcuts[];
-extern size_t mshortcutslen;
-extern Shortcut shortcuts[];
-extern size_t shortcutslen;
-extern uint forceselmod;
-extern uint selmasks[];
-extern size_t selmaskslen;
-extern char ascii_printable[];