X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=blobdiff_plain;f=config.def.h;h=5c4c518f2b5db2a508a3ebc3a5f795bb23131cd1;hp=c1afd88d5242005a070aae869cc189f0ed2b7636;hb=5caa46cf575a48e6421aaf8757e066f6d32263d9;hpb=9d5ea14b9dffac863b41432e4ce12b5624592000

diff --git a/config.def.h b/config.def.h
index c1afd88..5c4c518 100644
--- a/config.def.h
+++ b/config.def.h
@@ -1,12 +1,15 @@
-#define TAB 8
-#define TNAME "st-256color"
-#define FONT "-*-*-medium-r-*-*-*-120-75-75-*-60-*-*"
-#define BOLDFONT "-*-*-bold-r-*-*-*-120-75-75-*-60-*-*"
+
+#define FONT "Liberation Mono:pixelsize=12:antialias=false:autohint=false"
+
+/* Space in pixels around the terminal buffer */
 #define BORDER 2
+
+/* Default shell to use if SHELL is not set in the env */
 #define SHELL "/bin/sh"
 
-/* Terminal colors */
+/* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
+	/* 8 normal colors */
 	"black",
 	"red3",
 	"green3",
@@ -15,6 +18,8 @@ static const char *colorname[] = {
 	"magenta3",
 	"cyan3",
 	"gray90",
+
+	/* 8 bright colors */
 	"gray50",
 	"red",
 	"green",
@@ -22,47 +27,57 @@ static const char *colorname[] = {
 	"#5c5cff",
 	"magenta",
 	"cyan",
-	"white"
+	"white",
+
+	[255] = 0,
+
+	/* more colors can be added after 255 to use with DefaultXX */
+	"#cccccc",
+	"#333333",
 };
 
-/* Default colors (colorname index) */
-/* foreground, background, cursor   */
-#define DefaultFG 7
-#define DefaultBG 0
-#define DefaultCS 1
+/* Default colors (colorname index)
+   foreground, background, cursor, unfocused cursor */
+#define DefaultFG  7
+#define DefaultBG  0
+#define DefaultCS  256
+#define DefaultUCS 257
+
+/* Special keys (change & recompile st.info accordingly)
+   Keep in mind that kpress() in st.c hardcodes some keys.
 
-/* Special keys (change & recompile st.info accordingly) */
-/*    key,        mask,  output */
+   Mask value:
+   * Use XK_ANY_MOD to match the key no matter modifiers state
+   * Use XK_NO_MOD to match the key alone (no modifiers)
+
+      key,        mask,  output */
 static Key key[] = {
-	{ XK_BackSpace, 0, "\177" },
-	{ XK_Insert,    0, "\033[2~" },
-	{ XK_Delete,    0, "\033[3~" },
-	{ XK_Home,      0, "\033[1~" },
-	{ XK_End,       0, "\033[4~" },
-	{ XK_Prior,     0, "\033[5~" },
-	{ XK_Next,      0, "\033[6~" },
-	{ XK_F1,        0, "\033OP"   },
-	{ XK_F2,        0, "\033OQ"   },
-	{ XK_F3,        0, "\033OR"   },
-	{ XK_F4,        0, "\033OS"   },
-	{ XK_F5,        0, "\033[15~" },
-	{ XK_F6,        0, "\033[17~" },
-	{ XK_F7,        0, "\033[18~" },
-	{ XK_F8,        0, "\033[19~" },
-	{ XK_F9,        0, "\033[20~" },
-	{ XK_F10,       0, "\033[21~" },
-	{ XK_F11,       0, "\033[23~" },
-	{ XK_F12,       0, "\033[24~" },
+	{ XK_BackSpace, XK_NO_MOD, "\177" },
+	{ XK_Insert,    XK_NO_MOD, "\033[2~" },
+	{ XK_Delete,    XK_NO_MOD, "\033[3~" },
+	{ XK_Home,      XK_NO_MOD, "\033[1~" },
+	{ XK_End,       XK_NO_MOD, "\033[4~" },
+	{ XK_Prior,     XK_NO_MOD, "\033[5~" },
+	{ XK_Next,      XK_NO_MOD, "\033[6~" },
+	{ XK_F1,        XK_NO_MOD, "\033OP"   },
+	{ XK_F2,        XK_NO_MOD, "\033OQ"   },
+	{ XK_F3,        XK_NO_MOD, "\033OR"   },
+	{ XK_F4,        XK_NO_MOD, "\033OS"   },
+	{ XK_F5,        XK_NO_MOD, "\033[15~" },
+	{ XK_F6,        XK_NO_MOD, "\033[17~" },
+	{ XK_F7,        XK_NO_MOD, "\033[18~" },
+	{ XK_F8,        XK_NO_MOD, "\033[19~" },
+	{ XK_F9,        XK_NO_MOD, "\033[20~" },
+	{ XK_F10,       XK_NO_MOD, "\033[21~" },
+	{ XK_F11,       XK_NO_MOD, "\033[23~" },
+	{ XK_F12,       XK_NO_MOD, "\033[24~" },
 };
 
-/* Line drawing characters (sometime specific to each font...) */
-static char gfx[] = {
-	['f'] = 'o',
-	['g'] = '+',
-	['i'] = '#',
-	[255] = 0,
-};
+/* Set TERM to this */
+#define TNAME "st-256color"
 
 /* double-click timeout (in milliseconds) between clicks for selection */
 #define DOUBLECLICK_TIMEOUT 300
 #define TRIPLECLICK_TIMEOUT (2*DOUBLECLICK_TIMEOUT)
+
+#define TAB 8