update basic settings

- Tweaks some default keybindings
- Removes some unused keybindings
- Configures XResources names to conform to my system
- Better scroll and zoom speeds
Ryan 2023-09-19 19:00:27 -04:00
parent a65c371597
commit 683675c895
Signed by: ryan
GPG Key ID: 7D7E2E94267DAD95
1 changed files with 13 additions and 22 deletions

View File

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