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

[st.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 8cb8804..2a7e098 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -37,6 +37,12 @@ static unsigned int actionfps = 30;
  */
 static unsigned int blinktimeout = 800;
 
  */
 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";
 
 /* TERM value */
 static char termname[] = "st-256color";
 


@@ -129,21 +135,21 @@ static Shortcut shortcuts[] = {
  * * < 0: crlf mode is disabled
  *
  * Be careful with the order of the definitons because st searchs in
  * * < 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.
  */
 
 /*
  * 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 };
 
 /*
  */
 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[] = {
 
 /* key, mask, output, keypad, cursor, crlf */
 static Key key[] = {