Move key-matching functions into x.c

[st.git] / st.h

diff --git a/st.h b/st.h
index 9ece72f..c255b7c 100644 (file)
--- a/st.h
+++ b/st.h
@@ -80,11 +80,6 @@ enum selection_snap {
        SNAP_LINE = 2
 };
 
-enum window_state {
-       WIN_VISIBLE = 1,
-       WIN_FOCUSED = 2
-};
-
 typedef unsigned char uchar;
 typedef unsigned int uint;
 typedef unsigned long ulong;
@@ -92,6 +87,7 @@ typedef unsigned short ushort;
 
 typedef uint_least32_t Rune;
 
+#define Glyph Glyph_
 typedef struct {
        Rune u;           /* character code */
        ushort mode;      /* attribute flags */
@@ -100,7 +96,6 @@ typedef struct {
 } Glyph;
 
 typedef Glyph *Line;
-typedef XftGlyphFontSpec GlyphFontSpec;
 
 typedef struct {
        Glyph attr; /* current char attributes */
@@ -116,7 +111,6 @@ typedef struct {
        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 */
@@ -182,37 +176,43 @@ 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);
 
 int tattrset(int);
 void tnew(int, int);
+void tresize(int, int);
 void tsetdirt(int, int);
 void tsetdirtattr(int);
-int match(uint, uint);
 void ttynew(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);
 
-char *kmap(KeySym, uint);
-void cresize(int, int);
 void selclear(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 utf8encode(Rune, char *);
 
 void *xmalloc(size_t);
+void *xrealloc(void *, size_t);
 char *xstrdup(char *);
 
 /* Globals */
@@ -231,10 +231,6 @@ extern char *opt_name;
 extern char *opt_title;
 extern int oldbutton;
 
-extern char *usedfont;
-extern double usedfontsize;
-extern double defaultfontsize;
-
 /* config.h globals */
 extern char font[];
 extern int borderpx;
@@ -246,6 +242,7 @@ extern int allowaltscreen;
 extern unsigned int xfps;
 extern unsigned int actionfps;
 extern unsigned int cursorthickness;
+extern int bellvolume;
 extern unsigned int blinktimeout;
 extern char termname[];
 extern const char *colorname[];
@@ -265,7 +262,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[];