mouse shortcuts: allow override for all shortcuts

[st.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 482901e..a0a0d2d 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -150,14 +150,21 @@ static unsigned int mousebg = 0;
  */
 static unsigned int defaultattr = 11;
 
  */
 static unsigned int defaultattr = 11;
 

+/*
+ * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set).
+ * Note that if you want to use ShiftMask with selmasks, set this to an other
+ * modifier, set to 0 to not use it.
+ */
+static uint forcemousemod = ShiftMask;
+

 /*
  * Internal mouse shortcuts.
  * Beware that overloading Button1 will disable the selection.
  */
 static MouseShortcut mshortcuts[] = {
 /*
  * Internal mouse shortcuts.
  * Beware that overloading Button1 will disable the selection.
  */
 static MouseShortcut mshortcuts[] = {

-       /* button               mask            string */
-       { Button4,              XK_ANY_MOD,     "\031" },
-       { Button5,              XK_ANY_MOD,     "\005" },
+       /* mask                 button   function        argument */
+       { XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
+       { XK_ANY_MOD,           Button5, ttysend,        {.s = "\005"} },

 };
 
 /* Internal keyboard shortcuts. */
 };
 
 /* Internal keyboard shortcuts. */


@@ -195,10 +202,6 @@ static Shortcut shortcuts[] = {
  * * 0: no value
  * * > 0: cursor application mode enabled
  * * < 0: cursor application mode disabled
  * * 0: no value
  * * > 0: cursor application mode enabled
  * * < 0: cursor application mode disabled

- * crlf value
- * * 0: no value
- * * > 0: crlf mode is enabled
- * * < 0: crlf mode is disabled

  *
  * Be careful with the order of the definitions because st searches in
  * this table sequentially, so any XK_ANY_MOD must be in the last
  *
  * Be careful with the order of the definitions because st searches in
  * this table sequentially, so any XK_ANY_MOD must be in the last


@@ -217,13 +220,6 @@ static KeySym mappedkeys[] = { -1 };
  */
 static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
 
  */
 static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
 

-/*
- * Override mouse-select while mask is active (when MODE_MOUSE is set).
- * Note that if you want to use ShiftMask with selmasks, set this to an other
- * modifier, set to 0 to not use it.
- */
-static uint forceselmod = ShiftMask;
-

 /*
  * This is the huge key array which defines all compatibility to the Linux
  * world. Please decide about changes wisely.
 /*
  * This is the huge key array which defines all compatibility to the Linux
  * world. Please decide about changes wisely.