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

diff --git a/config.def.h b/config.def.h
index 37f9620..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,14 +27,21 @@ 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
+   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.
@@ -37,11 +49,11 @@ static const char *colorname[] = {
    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, XK_NO_MOD, "\177" },
-   	{ XK_Insert,    XK_NO_MOD, "\033[2~" },
+	{ 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~" },
@@ -61,14 +73,11 @@ static Key key[] = {
 	{ 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