Config update

2 files changed, 32 insertions, 28 deletions

diff --git a/config.def.h b/config.def.h
index 002385f..1ec348d 100644
--- a/config.def.h
+++ b/config.def.h
@@ -68,8 +68,8 @@ static const int lockfullscreen = 1;    /* 1 will force focus on the fullscreen
 
 static const Layout layouts[] = {
 	/* symbol     arrange function */
-	{ "[]=",      tile },    /* first entry is default */
-	{ "[M]",      monocle },
+	{ "[M]",      monocle },    /* first entry is default */
+	{ "[]=",      tile },
 };
 
 /* key definitions */
@@ -85,18 +85,20 @@ static const Layout layouts[] = {
 
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[]  = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_white, "-sb", col_gray2, "-sf", col_white, NULL };
-static const char *termcmd[]   = { "st", NULL };
-static const char *prtsccmd[]  = { "prtsc" };
-static const char *prtscfcmd[] = { "prtscf" };
-static const char *prtscdcmd[] = { "prtscd" };
+static const char *dmenucmd[]     = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_white, "-sb", col_gray2, "-sf", col_white, NULL };
+static const char *termcmd[]      = { "st", NULL };
+static const char *prtscCopyCmd[] = { "screenshot-copy" };
+static const char *prtscDumpCmd[] = { "screenshot-dump" };
+static const char *prtscDualCmd[] = { "screenshot-dual" };
+static const char *recordAllCmd[] = { "dmenu-record", "X11+Audio+Mic" };
 
 #include "movestack.c"
 static const Key keys[] = {
 	/* modifier                     key        function        argument */
 	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd}    },
 	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd}     },
-	{ MODKEY,                       XK_f,      spawn,          {.v = prtscdcmd}   },
+	{ MODKEY,                       XK_s,      spawn,          {.v = prtscDualCmd}},
+	{ MODKEY,                       XK_r,      spawn,          {.v = recordAllCmd}},
 	{ MODKEY,                       XK_b,      togglebar,      {0}                },
 	{ MODKEY,                       XK_j,      focusstack,     {.i = +1}          },
 	{ MODKEY,                       XK_k,      focusstack,     {.i = -1}          },
@@ -107,8 +109,8 @@ static const Key keys[] = {
 	{ MODKEY,                       XK_Return, zoom,           {0}                },
     { MODKEY,                       XK_Tab,    view,           {0}                },
 	{ MODKEY|ShiftMask,             XK_c,      killclient,     {0}                },
-	{ MODKEY,                       XK_n,      setlayout,      {.v = &layouts[0]} },
-	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[1]} },
+	{ MODKEY,                       XK_n,      setlayout,      {.v = &layouts[1]} },
+	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[0]} },
 	{ MODKEY,                       XK_space,  setlayout,      {0}                },
 	{ MODKEY,                       XK_0,      view,           {.ui = ~0}         },
 	{ MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0}         },
@@ -136,10 +138,10 @@ static const Key keys[] = {
 /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
 static const Button buttons[] = {
 	/* click                event mask        button          function        argument */
-	{ ClkRootWin,           0,                Button2,        spawn,          {.v = prtsccmd}    },
-	{ ClkClientWin,         0,                Button2,        spawn,          {.v = prtsccmd}    },
-	{ ClkRootWin,           MODKEY|ShiftMask, Button2,        spawn,          {.v = prtscfcmd}   },
-	{ ClkClientWin,         MODKEY|ShiftMask, Button2,        spawn,          {.v = prtscfcmd}   },
+	{ ClkRootWin,           0,                Button2,        spawn,          {.v = prtscCopyCmd}},
+	{ ClkClientWin,         0,                Button2,        spawn,          {.v = prtscCopyCmd}},
+	{ ClkRootWin,           MODKEY|ShiftMask, Button2,        spawn,          {.v = prtscDumpCmd}},
+	{ ClkClientWin,         MODKEY|ShiftMask, Button2,        spawn,          {.v = prtscDumpCmd}},
 	{ ClkLtSymbol,          0,                Button1,        setlayout,      {0}                },
 	{ ClkLtSymbol,          0,                Button3,        setlayout,      {.v = &layouts[2]} },
 	{ ClkWinTitle,          0,                Button2,        zoom,           {0}                },
diff --git a/config.h b/config.h
index 002385f..1ec348d 100644
--- a/config.h
+++ b/config.h
@@ -68,8 +68,8 @@ static const int lockfullscreen = 1;    /* 1 will force focus on the fullscreen
 
 static const Layout layouts[] = {
 	/* symbol     arrange function */
-	{ "[]=",      tile },    /* first entry is default */
-	{ "[M]",      monocle },
+	{ "[M]",      monocle },    /* first entry is default */
+	{ "[]=",      tile },
 };
 
 /* key definitions */
@@ -85,18 +85,20 @@ static const Layout layouts[] = {
 
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[]  = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_white, "-sb", col_gray2, "-sf", col_white, NULL };
-static const char *termcmd[]   = { "st", NULL };
-static const char *prtsccmd[]  = { "prtsc" };
-static const char *prtscfcmd[] = { "prtscf" };
-static const char *prtscdcmd[] = { "prtscd" };
+static const char *dmenucmd[]     = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_white, "-sb", col_gray2, "-sf", col_white, NULL };
+static const char *termcmd[]      = { "st", NULL };
+static const char *prtscCopyCmd[] = { "screenshot-copy" };
+static const char *prtscDumpCmd[] = { "screenshot-dump" };
+static const char *prtscDualCmd[] = { "screenshot-dual" };
+static const char *recordAllCmd[] = { "dmenu-record", "X11+Audio+Mic" };
 
 #include "movestack.c"
 static const Key keys[] = {
 	/* modifier                     key        function        argument */
 	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd}    },
 	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd}     },
-	{ MODKEY,                       XK_f,      spawn,          {.v = prtscdcmd}   },
+	{ MODKEY,                       XK_s,      spawn,          {.v = prtscDualCmd}},
+	{ MODKEY,                       XK_r,      spawn,          {.v = recordAllCmd}},
 	{ MODKEY,                       XK_b,      togglebar,      {0}                },
 	{ MODKEY,                       XK_j,      focusstack,     {.i = +1}          },
 	{ MODKEY,                       XK_k,      focusstack,     {.i = -1}          },
@@ -107,8 +109,8 @@ static const Key keys[] = {
 	{ MODKEY,                       XK_Return, zoom,           {0}                },
     { MODKEY,                       XK_Tab,    view,           {0}                },
 	{ MODKEY|ShiftMask,             XK_c,      killclient,     {0}                },
-	{ MODKEY,                       XK_n,      setlayout,      {.v = &layouts[0]} },
-	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[1]} },
+	{ MODKEY,                       XK_n,      setlayout,      {.v = &layouts[1]} },
+	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[0]} },
 	{ MODKEY,                       XK_space,  setlayout,      {0}                },
 	{ MODKEY,                       XK_0,      view,           {.ui = ~0}         },
 	{ MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0}         },
@@ -136,10 +138,10 @@ static const Key keys[] = {
 /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
 static const Button buttons[] = {
 	/* click                event mask        button          function        argument */
-	{ ClkRootWin,           0,                Button2,        spawn,          {.v = prtsccmd}    },
-	{ ClkClientWin,         0,                Button2,        spawn,          {.v = prtsccmd}    },
-	{ ClkRootWin,           MODKEY|ShiftMask, Button2,        spawn,          {.v = prtscfcmd}   },
-	{ ClkClientWin,         MODKEY|ShiftMask, Button2,        spawn,          {.v = prtscfcmd}   },
+	{ ClkRootWin,           0,                Button2,        spawn,          {.v = prtscCopyCmd}},
+	{ ClkClientWin,         0,                Button2,        spawn,          {.v = prtscCopyCmd}},
+	{ ClkRootWin,           MODKEY|ShiftMask, Button2,        spawn,          {.v = prtscDumpCmd}},
+	{ ClkClientWin,         MODKEY|ShiftMask, Button2,        spawn,          {.v = prtscDumpCmd}},
 	{ ClkLtSymbol,          0,                Button1,        setlayout,      {0}                },
 	{ ClkLtSymbol,          0,                Button3,        setlayout,      {.v = &layouts[2]} },
 	{ ClkWinTitle,          0,                Button2,        zoom,           {0}                },