X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=config.def.h;h=1f0291ea4962fc0bb0dcdf5ca5d52885c44511aa;hb=246d704ba0c1d83b3eed2388483300687276b797;hp=35f36cb6ce112da1c114c0504865b1dc62ec078f;hpb=907cb8bfa69926616639f9a19127117b37326029;p=st.git

diff --git a/config.def.h b/config.def.h
index 35f36cb..1f0291e 100644
--- a/config.def.h
+++ b/config.def.h
@@ -1,12 +1,18 @@
-#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 "DejaVu Sans Mono:pixelsize=12:antialias=true:autohint=true"
+#define BOLDFONT FONT ":weight=bold"
+#define ITALICFONT FONT ":slant=italic,oblique"
+#define ITALICBOLDFONT BOLDFONT ":slant=italic,oblique"
+
+/* 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 (16 first used in escape sequence) */
 static const char *colorname[] = {
+	/* 8 normal colors */
 	"black",
 	"red3",
 	"green3",
@@ -15,6 +21,8 @@ static const char *colorname[] = {
 	"magenta3",
 	"cyan3",
 	"gray90",
+
+	/* 8 bright colors */
 	"gray50",
 	"red",
 	"green",
@@ -22,14 +30,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 +52,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,6 +76,9 @@ static Key key[] = {
 	{ XK_F12,       XK_NO_MOD, "\033[24~" },
 };
 
+/* Set TERM to this */
+#define TNAME "st-256color"
+
 /* Line drawing characters (sometime specific to each font...) */
 static char gfx[] = {
 	['f'] = 'o',
@@ -72,3 +90,5 @@ static char gfx[] = {
 /* double-click timeout (in milliseconds) between clicks for selection */
 #define DOUBLECLICK_TIMEOUT 300
 #define TRIPLECLICK_TIMEOUT (2*DOUBLECLICK_TIMEOUT)
+
+#define TAB 8