commit e6e8cc32eb925057cb065f6eba79afe88748f09d
parent 7af60b6a9dac3fd45f11901ec7c7eb49d7ee01c0
Author: Szymon Mikulicz <szymon.mikulicz@posteo.net>
Date: Tue, 17 Mar 2020 21:53:01 +0100
st: upgrade to new version
Diffstat:
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/st/.st/config.h b/st/.st/config.h
@@ -151,19 +151,23 @@ static unsigned int mousebg = 0;
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[] = {
- /* button mask string */
- { Button4, XK_NO_MOD, "\031" },
- { Button5, XK_NO_MOD, "\005" },
-};
-
-MouseKey mkeys[] = {
- /* button mask function argument */
- { Button4, XK_NO_MOD, kscrollup, {.i = 5} },
- { Button5, XK_NO_MOD, kscrolldown, {.i = 5} },
+ /* mask button function argument release */
+ { XK_ANY_MOD, Button4, kscrollup, {.i = 1}, 0, /* !alt */ -1 },
+ { XK_ANY_MOD, Button5, kscrolldown, {.i = 1}, 0, /* !alt */ -1 },
+ { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 },
+ { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} },
+ { XK_ANY_MOD, Button5, ttysend, {.s = "\005"} },
};
/* Internal keyboard shortcuts. */
@@ -203,10 +207,6 @@ static Shortcut shortcuts[] = {
* * 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
@@ -226,13 +226,6 @@ static KeySym mappedkeys[] = { -1 };
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.
*/