From 4f4c6e1eeed61f03459d7da4f10829e010348134 Mon Sep 17 00:00:00 2001
From: Ryan <ryan@carelesslisper.xyz>
Date: Tue, 19 Sep 2023 19:00:27 -0400
Subject: [PATCH] update basic settings

- Tweaks some default keybindings
- Removes some unused keybindings
- Configures XResources names to conform to my system
- Better scroll and zoom speeds
---
 config.h | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/config.h b/config.h
index 26b2000..5149e3e 100644
--- a/config.h
+++ b/config.h
@@ -180,12 +180,12 @@ static uint forcemousemod = ShiftMask;
 /*
  * The number of lines to scroll by.
  */
-const unsigned int scrollrate = 1;
+const unsigned int scrollrate = 5;
 
 /*
  * The rate to zoom in (adjust the font size).
  */
-const unsigned int zoomrate = 1;
+const unsigned int zoomrate = 5;
 
 /*
  * Xresources preferences to load at startup
@@ -208,19 +208,10 @@ ResourcePref resources[] = {
 		{ "color13",      STRING,  &colorname[13] },
 		{ "color14",      STRING,  &colorname[14] },
 		{ "color15",      STRING,  &colorname[15] },
-		{ "background",   STRING,  &colorname[256] },
-		{ "foreground",   STRING,  &colorname[257] },
-		{ "cursorColor",  STRING,  &colorname[258] },
-		{ "termname",     STRING,  &termname },
-		{ "shell",        STRING,  &shell },
-		{ "minlatency",   INTEGER, &minlatency },
-		{ "maxlatency",   INTEGER, &maxlatency },
-		{ "blinktimeout", INTEGER, &blinktimeout },
-		{ "bellvolume",   INTEGER, &bellvolume },
-		{ "tabspaces",    INTEGER, &tabspaces },
+		{ "background",   STRING,  &colorname[259] },
+		{ "foreground",   STRING,  &colorname[258] },
+		{ "cursorColor",  STRING,  &colorname[256] },
 		{ "borderpx",     INTEGER, &borderpx },
-		{ "cwscale",      FLOAT,   &cwscale },
-		{ "chscale",      FLOAT,   &chscale },
 };
 
 /*
@@ -229,8 +220,10 @@ ResourcePref resources[] = {
  */
 static MouseShortcut mshortcuts[] = {
 	/* mask                 button   function        argument       release */
-        { XK_ANY_MOD,           Button4, kscrollup,      {.i = scrollrate}, 0, /* !alt */ -1 },
-	{ XK_ANY_MOD,           Button5, kscrolldown,    {.i = scrollrate}, 0, /* !alt */ -1 },
+        { XK_NO_MOD,            Button4, kscrollup,      {.i = scrollrate}, 0, /* !alt */ -1 },
+	{ XK_NO_MOD,            Button5, kscrolldown,    {.i = scrollrate}, 0, /* !alt */ -1 },
+        { ControlMask,          Button4, zoom,           {.f = zoomrate * +1} },
+	{ ControlMask,          Button5, zoom,           {.f = zoomrate * -1} },
 	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
 	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
 	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
@@ -248,16 +241,14 @@ static Shortcut shortcuts[] = {
 	{ ControlMask,          XK_Print,       toggleprinter,  {.i =  0} },
 	{ ShiftMask,            XK_Print,       printscreen,    {.i =  0} },
 	{ XK_ANY_MOD,           XK_Print,       printsel,       {.i =  0} },
-	{ TERMMOD,              XK_Prior,       zoom,           {.f = +1 * zoomrate} },
-	{ TERMMOD,              XK_Next,        zoom,           {.f = -1 * zoomrate} },
+	{ TERMMOD,              XK_Up,          zoom,           {.f = +1 * zoomrate} },
+	{ TERMMOD,              XK_Down,        zoom,           {.f = -1 * zoomrate} },
 	{ TERMMOD,              XK_Home,        zoomreset,      {.f =  0} },
 	{ TERMMOD,              XK_C,           clipcopy,       {.i =  0} },
 	{ TERMMOD,              XK_V,           clippaste,      {.i =  0} },
 	{ 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 * scrollrate} },
-	{ ShiftMask,            XK_Page_Down,   kscrolldown,    {.i = -1 * scrollrate} },
+	{ MODKEY,               XK_Up,          kscrollup,      {.i = -1 * scrollrate} },
+	{ MODKEY,               XK_Down,        kscrolldown,    {.i = -1 * scrollrate} },
 };
 
 /*