From 60add40bd1bcb1548fe264c8e809910049b2676e Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Mon, 5 Apr 2021 09:26:55 -0400 Subject: revert to older, better scrollback patch, fix #284, #289 --- config.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'config.h') diff --git a/config.h b/config.h index 763b936..a0d8c1f 100644 --- a/config.h +++ b/config.h @@ -20,7 +20,7 @@ static int borderpx = 2; static char *shell = "/bin/sh"; char *utmp = NULL; /* scroll program: to enable use a string like "scroll" */ -char *scroll = "scroll"; +char *scroll = NULL; char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400"; /* identification sequence returned in DA and DECID */ @@ -225,6 +225,8 @@ ResourcePref resources[] = { */ static MouseShortcut mshortcuts[] = { /* mask button function argument release */ + { XK_NO_MOD, Button4, kscrollup, {.i = 1} }, + { XK_NO_MOD, Button5, kscrolldown, {.i = 1} }, { XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1 }, { ShiftMask, Button4, ttysend, {.s = "\033[5;2~"} }, { XK_ANY_MOD, Button4, ttysend, {.s = "\031"} }, @@ -257,6 +259,16 @@ static Shortcut shortcuts[] = { { MODKEY, XK_v, clippaste, {.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} }, + { MODKEY, XK_Page_Up, kscrollup, {.i = -1} }, + { MODKEY, XK_Page_Down, kscrolldown, {.i = -1} }, + { MODKEY, XK_k, kscrollup, {.i = 1} }, + { MODKEY, XK_j, kscrolldown, {.i = 1} }, + { MODKEY, XK_Up, kscrollup, {.i = 1} }, + { MODKEY, XK_Down, kscrolldown, {.i = 1} }, + { MODKEY, XK_u, kscrollup, {.i = -1} }, + { MODKEY, XK_d, kscrolldown, {.i = -1} }, { MODKEY, XK_s, changealpha, {.f = -0.05} }, { MODKEY, XK_a, changealpha, {.f = +0.05} }, { TERMMOD, XK_Up, zoom, {.f = +1} }, -- cgit v1.2.3