Merge remote-tracking branch 'origin/master' into omaster

[st.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 2de9a0a..2a7e098 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -9,6 +9,10 @@ static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=fals
 static int borderpx = 2;
 static char shell[] = "/bin/sh";
 
+/* Kerning / character bounding-box mutlipliers */
+float cwscale = 1.0;
+float chscale = 1.0;
+
 /*
  * word delimiter string
  *
@@ -33,6 +37,12 @@ static unsigned int actionfps = 30;
  */
 static unsigned int blinktimeout = 800;
 
+/*
+ * bell volume. It must be a value between -100 and 100. Use 0 for disabling
+ * it
+ */
+static int bellvolume = 0;
+
 /* TERM value */
 static char termname[] = "st-256color";
 
@@ -125,21 +135,21 @@ static Shortcut shortcuts[] = {
  * * < 0: crlf mode is disabled
  *
  * Be careful with the order of the definitons because st searchs in
- * this table sequencially, so any XK_ANY_MOD must be in the last
+ * this table sequentially, so any XK_ANY_MOD must be in the last
  * position for a key.
  */
 
 /*
- * If you want something else but the function keys of X11 (0xFF00 - 0xFFFF)
- * mapped below, add them to this array.
+ * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
+ * to be mapped below, add them to this array.
  */
 static KeySym mappedkeys[] = { -1 };
 
 /*
- * Which bits of the state should be ignored. By default the state bit for the
- * keyboard layout (XK_SWITCH_MOD) is ignored.
+ * State bits to ignore when matching key or button events.  By default,
+ * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
  */
-uint ignoremod = XK_SWITCH_MOD;
+static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
 
 /* key, mask, output, keypad, cursor, crlf */
 static Key key[] = {
@@ -160,7 +170,7 @@ static Key key[] = {
        { XK_KP_Right,      XK_ANY_MOD,     "\033[C",        0,   -1,    0},
        { XK_KP_Right,      XK_ANY_MOD,     "\033OC",        0,   +1,    0},
        { XK_KP_Prior,      ShiftMask,      "\033[5;2~",     0,    0,    0},
-       { XK_KP_Prior,      XK_ANY_MOD,     "\033[5~",       0,    0,    0},
+       { XK_KP_Prior,      XK_ANY_MOD,     "\033[5~",       0,    0,    0},
        { XK_KP_Begin,      XK_ANY_MOD,     "\033[E",        0,    0,    0},
        { XK_KP_End,        ControlMask,    "\033[J",       -1,    0,    0},
        { XK_KP_End,        ControlMask,    "\033[1;5F",    +1,    0,    0},
@@ -213,7 +223,7 @@ static Key key[] = {
        { XK_Left,          ShiftMask,      "\033[1;2D",     0,    0,    0},
        { XK_Left,          ControlMask,    "\033[1;5D",     0,    0,    0},
        { XK_Left,          Mod1Mask,       "\033[1;3D",     0,    0,    0},
-       { XK_Left,          XK_ANY_MOD,     "\033[D",        0,   -1,    0},
+       { XK_Left,          XK_ANY_MOD,     "\033[D",        0,   -1,    0},
        { XK_Left,          XK_ANY_MOD,     "\033OD",        0,   +1,    0},
        { XK_Right,         ShiftMask,      "\033[1;2C",     0,    0,    0},
        { XK_Right,         ControlMask,    "\033[1;5C",     0,    0,    0},