st

commit ffe5924a125ac579bf1c681bac51fa1cac8556a8
parent cf80136b1bd97a28c7a54694b34d9d6472db6be0
Author: deurzen <m.deurzen@tum.de>
Date:   Thu, 14 Jan 2021 01:51:42 +0100

applies st-scrollback-mouse-increment-0.8.2.diff

Diffstat:
M
.gitignore
 | 
1
+
M
config.def.h
 | 
5
+++--
D
config.def.h.rej
 | 
11
-----------

3 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 /st.o
 /x.o
 /*.orig
+/*.rej
diff --git a/config.def.h b/config.def.h
@@ -182,10 +182,11 @@ static uint forcemousemod = ShiftMask;
  * Internal mouse shortcuts.
  * Beware that overloading Button1 will disable the selection.
  */
+const unsigned int mousescrollincrement = 3;
 static MouseShortcut mshortcuts[] = {
 	/* 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,           Button4, kscrollup,      {.i = mousescrollincrement},      0, /* !alt */ -1 },
+	{ XK_ANY_MOD,           Button5, kscrolldown,    {.i = mousescrollincrement},      0, /* !alt */ -1 },
 	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
 	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
 	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
diff --git a/config.def.h.rej b/config.def.h.rej
@@ -1,11 +0,0 @@
---- config.def.h
-+++ config.def.h
-@@ -199,6 +199,8 @@ static Shortcut shortcuts[] = {
- 	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
- 	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
- 	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
-+	{ ShiftMask,            XK_Page_Up,     kscrollup,      {.i = -1} },
-+	{ ShiftMask,            XK_Page_Down,   kscrolldown,    {.i = -1} },
- };
- 
- /*