X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/587100873a66e34251041678504a8c1e28410591..2c6087e3d20b506e63d12c9f4e638ecd024e859c:/config.default.h

diff --git a/config.default.h b/config.default.h
index ed4447e..1f0fe8c 100644
--- a/config.default.h
+++ b/config.default.h
@@ -1,8 +1,7 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */
 
 /* appearance */
+#define BARPOS			BarTop /* BarBot, BarOff */
 #define BORDERPX		1
 #define FONT			"-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
 #define NORMBORDERCOLOR		"#dddddd"
@@ -11,31 +10,31 @@
 #define SELBORDERCOLOR		"#ff0000"
 #define SELBGCOLOR		"#006699"
 #define SELFGCOLOR		"#ffffff"
-#define TOPBAR			True		/* False */
 
-/* behavior */
+/* tagging */
 #define TAGS \
 const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
 /* Query class:instance:title for regex matching info with following command:
  * xprop | awk -F '"' '/^WM_CLASS/ { printf("%s:%s:",$4,$2) }; /^WM_NAME/ { printf("%s\n",$2) }' */
 #define RULES \
 static Rule rule[] = { \
-	/* class:instance:title regex	tags regex	isuntiled */ \
+	/* class:instance:title regex	tags regex	isfloating */ \
 	{ "Gimp",			NULL,		True }, \
 	{ "MPlayer",			NULL,		True }, \
 	{ "Acroread",			NULL,		True }, \
 };
 
 /* layout(s) */
+#include "tile.h"
+#include "float.h"
 #define LAYOUTS \
 static Layout layout[] = { \
 	/* symbol		function */ \
 	{ "[]=",		tile }, /* first entry is default */ \
-	{ "><>",		untile }, \
+	{ "><>",		floating }, \
 };
-#define MASTERWIDTH		600		/* master width per thousand */
-#define NMASTER			1		/* clients in master area */
-#define SNAP			20		/* untiled snap pixel */
+#define MASTER			0.6	/* 0.1 .. 0.9 */
+#define SNAP			32	/* snap pixel */
 
 /* key definitions */
 #define MODKEY			Mod1Mask
@@ -43,16 +42,16 @@ static Layout layout[] = { \
 static Key key[] = { \
 	/* modifier			key		function	argument */ \
 	{ MODKEY|ShiftMask,		XK_Return,	spawn,		"exec xterm" }, \
+	{ MODKEY,			XK_p,		spawn, 		"exe=`dmenu_path | dmenu` && exec $exe" }, \
 	{ MODKEY,			XK_space,	setlayout,	NULL }, \
-	{ MODKEY,			XK_d,		incnmaster,	"-1" }, \
-	{ MODKEY,			XK_i,		incnmaster,	"1" }, \
-	{ MODKEY,			XK_g,		incmasterw,	"15" }, \
-	{ MODKEY,			XK_s,		incmasterw,	"-15" }, \
-	{ MODKEY,			XK_Tab,		focusclient,	"1" }, \
-	{ MODKEY|ShiftMask,		XK_Tab,		focusclient,	"-1" }, \
+	{ MODKEY,			XK_b,		togglebar,	NULL }, \
+	{ MODKEY,			XK_j,		focusclient,	"1" }, \
+	{ MODKEY,			XK_k,		focusclient,	"-1" }, \
+	{ MODKEY,			XK_h,		incmaster,	"-0.05" }, \
+	{ MODKEY,			XK_l,		incmaster,	"0.05" }, \
 	{ MODKEY,			XK_m,		togglemax,	NULL }, \
 	{ MODKEY,			XK_Return,	zoom,		NULL }, \
-	{ MODKEY|ShiftMask,		XK_space,	toggletiled,	NULL }, \
+	{ MODKEY|ShiftMask,		XK_space,	togglefloating,	NULL }, \
 	{ MODKEY|ShiftMask,		XK_c,		killclient,	NULL }, \
 	{ MODKEY,			XK_0,		view,		NULL }, \
 	{ MODKEY,			XK_1,		view,		"0" }, \