diff --git a/config.h b/config.h index 03e01c9..e08c137 100644 --- a/config.h +++ b/config.h @@ -77,6 +77,7 @@ static Key keys[] = { { MODKEY, XK_Tab, view, {0} }, { MODKEY, XK_q, killclient, {0} }, { MODKEY, XK_w, spawn, SHCMD("$BROWSER")}, + { MODKEY|ShiftMask, XK_w, spawn, SHCMD("$TERM -e nmtui")}, { MODKEY, XK_r, spawn, SHCMD("$TERM -e ranger")}, { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_z, setlayout, {.v = &layouts[1]} }, @@ -89,7 +90,7 @@ static Key keys[] = { { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, { MODKEY, XK_comma, focusmon, {.i = -1 } }, { MODKEY, XK_period, focusmon, {.i = +1 } }, - { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, + { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, TAGKEYS( XK_1, 0) TAGKEYS( XK_2, 1) @@ -101,8 +102,8 @@ static Key keys[] = { TAGKEYS( XK_8, 7) TAGKEYS( XK_9, 8) { MODKEY|ShiftMask, XK_Escape, quit, {0} }, - { MODKEY, XK_F5, xrdb, {.v = NULL } }, { MODKEY, XK_F5, spawn, SHCMD("sh ~/.sh/changewallpaper") }, + { MODKEY|ShiftMask, XK_F5, xrdb, {.v = NULL } },/*I emulate this at the end of changewallpaper*/ /*special keys*/ { 0, XF86XK_TouchpadToggle, spawn, SHCMD("~/.sh/touchpad") }, { 0, XF86XK_MonBrightnessUp, spawn, SHCMD("light -A 10") }, diff --git a/dwm.c b/dwm.c index faedf0c..6814f9e 100644 --- a/dwm.c +++ b/dwm.c @@ -286,7 +286,6 @@ static Display *dpy; static Drw *drw; static Monitor *mons, *selmon; static Window root, wmcheckwin; - /* configuration, allows nested code to access above variables */ #include "config.h" @@ -1051,12 +1050,12 @@ loadxrdb() xrdb = XrmGetStringDatabase(resm); if (xrdb != NULL) { - XRDB_LOAD_COLOR("dwm.normbordercolor", normbordercolor); - XRDB_LOAD_COLOR("dwm.normbgcolor", normbgcolor); - XRDB_LOAD_COLOR("dwm.normfgcolor", normfgcolor); - XRDB_LOAD_COLOR("dwm.selbordercolor", selbordercolor); - XRDB_LOAD_COLOR("dwm.selbgcolor", selbgcolor); - XRDB_LOAD_COLOR("dwm.selfgcolor", selfgcolor); + XRDB_LOAD_COLOR("dwm.foreground", normbordercolor); + XRDB_LOAD_COLOR("dwm.background", normbgcolor); + XRDB_LOAD_COLOR("dwm.foreground", normfgcolor); + XRDB_LOAD_COLOR("dwm.foreground", selbordercolor); + XRDB_LOAD_COLOR("dwm.background", selbgcolor); + XRDB_LOAD_COLOR("dwm.foreground", selfgcolor); } } }