nagbalae/dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3 from nagbalae/shortcuts

Browse Source 
Fixed compatibility with pywal
This commit is contained in:
Bazsi 2020-06-17 14:25:40 +02:00 committed by GitHub
commit a2a65e7fee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.h
View File

@ -77,6 +77,7 @@ static Key keys[] = {
{ MODKEY, XK_Tab, view, {0} }, { MODKEY, XK_Tab, view, {0} },
{ MODKEY, XK_q, killclient, {0} }, { MODKEY, XK_q, killclient, {0} },
{ MODKEY, XK_w, spawn, SHCMD("$BROWSER")}, { 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_r, spawn, SHCMD("$TERM -e ranger")},
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
{ MODKEY, XK_z, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_z, setlayout, {.v = &layouts[1]} },
@ -101,8 +102,8 @@ static Key keys[] = {
TAGKEYS( XK_8, 7) TAGKEYS( XK_8, 7)
TAGKEYS( XK_9, 8) TAGKEYS( XK_9, 8)
{ MODKEY|ShiftMask, XK_Escape, quit, {0} }, { MODKEY|ShiftMask, XK_Escape, quit, {0} },
{ MODKEY, XK_F5, xrdb, {.v = NULL } },
{ MODKEY, XK_F5, spawn, SHCMD("sh ~/.sh/changewallpaper") }, { 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*/ /*special keys*/
{ 0, XF86XK_TouchpadToggle, spawn, SHCMD("~/.sh/touchpad") }, { 0, XF86XK_TouchpadToggle, spawn, SHCMD("~/.sh/touchpad") },
{ 0, XF86XK_MonBrightnessUp, spawn, SHCMD("light -A 10") }, { 0, XF86XK_MonBrightnessUp, spawn, SHCMD("light -A 10") },

13
dwm.c
View File

@ -286,7 +286,6 @@ static Display *dpy;
static Drw *drw; static Drw *drw;
static Monitor *mons, *selmon; static Monitor *mons, *selmon;
static Window root, wmcheckwin; static Window root, wmcheckwin;
/* configuration, allows nested code to access above variables */ /* configuration, allows nested code to access above variables */
#include "config.h" #include "config.h"
@ -1051,12 +1050,12 @@ loadxrdb()
xrdb = XrmGetStringDatabase(resm); xrdb = XrmGetStringDatabase(resm);
if (xrdb != NULL) { if (xrdb != NULL) {
XRDB_LOAD_COLOR("dwm.normbordercolor", normbordercolor); XRDB_LOAD_COLOR("dwm.foreground", normbordercolor);
XRDB_LOAD_COLOR("dwm.normbgcolor", normbgcolor); XRDB_LOAD_COLOR("dwm.background", normbgcolor);
XRDB_LOAD_COLOR("dwm.normfgcolor", normfgcolor); XRDB_LOAD_COLOR("dwm.foreground", normfgcolor);
XRDB_LOAD_COLOR("dwm.selbordercolor", selbordercolor); XRDB_LOAD_COLOR("dwm.foreground", selbordercolor);
XRDB_LOAD_COLOR("dwm.selbgcolor", selbgcolor); XRDB_LOAD_COLOR("dwm.background", selbgcolor);
XRDB_LOAD_COLOR("dwm.selfgcolor", selfgcolor); XRDB_LOAD_COLOR("dwm.foreground", selfgcolor);
} }
} }
} }