diff --git a/config.h b/config.h index a6c70ac..55795b3 100644 --- a/config.h +++ b/config.h @@ -132,7 +132,8 @@ static const char *colorname[] = { /* more colors can be added after 255 to use with DefaultXX */ "#add8e6", /* 256 -> cursor */ "#555555", /* 257 -> rev cursor*/ - "#282828", /* 258 -> bg */ + // "#282828", /* 258 -> bg */ + "#232937", /* 258 -> bg */ "#ebdbb2", /* 259 -> fg */ }; @@ -224,7 +225,8 @@ static MouseShortcut mshortcuts[] = { /* Internal keyboard shortcuts. */ #define MODKEY Mod1Mask -#define TERMMOD (Mod1Mask|ShiftMask) +#define TERMMOD (ControlMask|ShiftMask) +#define CTRLALT (ControlMask|Mod1Mask) MouseKey mkeys[] = { /* button mask function argument */ @@ -248,12 +250,10 @@ 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} }, - { TERMMOD, XK_Next, zoom, {.f = -1} }, { MODKEY, XK_Home, zoomreset, {.f = 0} }, - { MODKEY, XK_c, clipcopy, {.i = 0} }, + { TERMMOD, XK_c, clipcopy, {.i = 0} }, { ShiftMask, XK_Insert, clippaste, {.i = 0} }, - { MODKEY, XK_v, clippaste, {.i = 0} }, + { TERMMOD, XK_v, clippaste, {.i = 0} }, { XK_ANY_MOD, Button2, selpaste, {.i = 0} }, { MODKEY, XK_Num_Lock, numlock, {.i = 0} }, { MODKEY, XK_Control_L, iso14755, {.i = 0} }, @@ -261,23 +261,13 @@ static Shortcut shortcuts[] = { { 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} }, - { TERMMOD, XK_Down, zoom, {.f = -1} }, - { TERMMOD, XK_K, zoom, {.f = +1} }, - { TERMMOD, XK_J, zoom, {.f = -1} }, - { TERMMOD, XK_U, zoom, {.f = +2} }, - { TERMMOD, XK_D, zoom, {.f = -2} }, - { MODKEY, XK_l, externalpipe, {.v = openurlcmd } }, - { MODKEY, XK_y, externalpipe, {.v = copyurlcmd } }, - { MODKEY, XK_o, externalpipe, {.v = copyoutput } }, + { TERMMOD, XK_k, kscrollup, {.i = 1} }, + { TERMMOD, XK_j, kscrolldown, {.i = 1} }, + { TERMMOD, XK_Up, kscrollup, {.i = 1} }, + { TERMMOD, XK_Down, kscrolldown, {.i = 1} }, + { CTRLALT, XK_l, externalpipe, {.v = openurlcmd } }, + { CTRLALT, XK_y, externalpipe, {.v = copyurlcmd } }, + { CTRLALT, XK_o, externalpipe, {.v = copyoutput } }, }; /* diff --git a/config.mk b/config.mk index dcf5706..12ff4e5 100644 --- a/config.mk +++ b/config.mk @@ -4,7 +4,7 @@ VERSION = 0.8.2 # Customize below to fit your system # paths -PREFIX ?= /usr/local +PREFIX = ~/.local MANPREFIX = $(PREFIX)/share/man X11INC = /usr/X11R6/include