fixed optimized drawing routine and factored some code.

[st.git] / config.h

diff --git a/config.h b/config.h
index 5d91627..53795c6 100644 (file)
--- a/config.h
+++ b/config.h
@@ -1,20 +1,27 @@
-#define SHELL "/bin/bash"

 #define TAB    8
 #define TAB    8

-
-#define FONT "fixed"
-#define BORDER 3
-#define LINESPACE 1 /* additional pixel between each line */
+#define TNAME "st-256color"
+#define FONT "6x13"
+#define BOLDFONT FONT"bold"
+#define BORDER 2

 
 /* Terminal colors */
 static const char *colorname[] = {
        "black",
 
 /* Terminal colors */
 static const char *colorname[] = {
        "black",

-       "red",
-       "green",
-       "yellow",
-       "blue",
-       "magenta",
-       "cyan",
-       "white",
+       "#CC0000",
+       "#4E9A06",
+       "#C4A000",
+       "#3465A4",
+       "#75507B",
+       "#06989A",
+       "#888a85",
+       "#555753",
+       "#EF2929",
+       "#8AE234",
+       "#FCE94F",
+       "#729FCF",
+       "#AD7FA8",
+       "#34E2E2",
+       "#EEEEEC"

 };
 
 /* Default colors (colorname index) */
 };
 
 /* Default colors (colorname index) */


@@ -23,17 +30,62 @@ static const char *colorname[] = {
 #define DefaultBG 0
 #define DefaultCS 1
 #define BellCol   DefaultFG
 #define DefaultBG 0
 #define DefaultCS 1
 #define BellCol   DefaultFG

-
+#define BellTime  30000 /* microseconds */

 
 /* special keys */
 
 /* special keys */

-static const char *key[] = {
-       [XK_Delete] = "\033[3~", 
-       [XK_Home]   = "\033[1~",
-       [XK_End]    = "\033[4~",
-       [XK_Prior]  = "\033[5~",
-       [XK_Next]   = "\033[6~",
-       [XK_Left]   = "\033[D",
-       [XK_Right]  = "\033[C",
-       [XK_Up]     = "\033[A",
-       [XK_Down]   = "\033[B",
+static Key key[] = {
+       { XK_BackSpace, "\177" },
+       { XK_Delete, "\033[3~" },
+       { XK_Home,   "\033[1~" },
+       { XK_End,    "\033[4~" },
+       { XK_Prior,  "\033[5~" },
+       { XK_Next,   "\033[6~" },
+       { XK_F1,        "\033OP"   },
+       { XK_F2,        "\033OQ"   },
+       { XK_F3,        "\033OR"   },
+       { XK_F4,        "\033OS"   },
+       { XK_F5,        "\033[15~" },
+       { XK_F6,        "\033[17~" },
+       { XK_F7,        "\033[18~" },
+       { XK_F8,        "\033[19~" },
+       { XK_F9,        "\033[20~" },
+       { XK_F10,       "\033[21~" },
+       { XK_F11,       "\033[23~" },
+       { XK_F12,       "\033[24~" },
+};
+
+static char gfx[] = {
+       ['}'] = 'f',
+       ['.'] = 'v',
+       [','] = '<',
+       ['+'] = '>',
+       ['-'] = '^',
+       ['h'] = '#',
+       ['~'] = 'o',
+       ['a'] = ':',
+       ['f'] = '\\',
+       ['`'] = '+',
+       ['z'] = '>',
+       ['{'] = '*',
+       ['q'] = '-',
+       ['i'] = '#',
+       ['n'] = '+',
+       ['y'] = '<',
+       ['m'] = '+',
+       ['j'] = '+',
+       ['|'] = '!',
+       ['g'] = '#',
+       ['o'] = '~',
+       ['p'] = '-',
+       ['r'] = '-',
+       ['s'] = '_',
+       ['0'] = '#',
+       ['w'] = '+',
+       ['u'] = '+',
+       ['t'] = '+',
+       ['v'] = '+',
+       ['l'] = '+',
+       ['k'] = '+',
+       ['x'] = '|',
+       [255] = 0,

 };
 };