X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=config.def.h;h=c1eedd4c15bc0de64b8b63274d695bd188a3a8a3;hb=95eae7b9d25602cf5fb25ecbc9d92ead8005c1f8;hp=d1d884e8c11bd63f9bf22a3cc59993a06d30d4c6;hpb=3a79b82721a4772e1c92acf5f3be41eaf0dc28d2;p=dwm.git

diff --git a/config.def.h b/config.def.h
index d1d884e..c1eedd4 100644
--- a/config.def.h
+++ b/config.def.h
@@ -10,35 +10,6 @@
 #define SELBGCOLOR		"#0066ff"
 #define SELFGCOLOR		"#ffffff"
 
-/* bar position */
-#define BX sx
-#define BY sy
-#define BW MW
-
-/* window area */
-#define WX 0
-#define WY bh
-#define WW sw
-#define WH sh
-
-/* master area */
-#define MX sx
-#define MY sy + bh
-#define MW ((int)(((float)sw) * 0.6))
-#define MH sh - bh
-
-/* tile area, might be on a different screen */
-#define TX sx + MW
-#define TY sy
-#define TW sw - MW
-#define TH sh
-
-/* monocle area, might be restricted to a specific screen */
-#define MOX sx
-#define MOY MY
-#define MOW sw
-#define MOH MH
-
 /* tagging */
 const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 
@@ -55,23 +26,19 @@ Rule rules[] = {
 #define SNAP			32	/* snap pixel */
 
 Layout layouts[] = {
-	/* symbol		function */
-	{ "[]=",		tile }, /* first entry is default */
-	{ "><>",		floating },
-	{ "[M]",		monocle },
+	/* symbol		function	isfloating */
+	{ "[]=",		tilev,		False }, /* first entry is default */
+	{ "[]|",		tileh,		False },
+	{ "><>",		floating,	True },
+	{ "[M]",		monocle,	True },
 };
 
 /* key definitions */
 #define MODKEY			Mod1Mask
 Key keys[] = {
 	/* modifier			key		function	argument */
-#if ANSELM_OFFICE
-	{ MODKEY,			XK_p,		spawn,
-		"exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"' -x 0 -y 0 -w 1280" },
-#else
 	{ MODKEY,			XK_p,		spawn,
 		"exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },
-#endif
 	{ MODKEY|ShiftMask,		XK_Return,	spawn, "exec uxterm" },
 	{ MODKEY,			XK_j,		focusnext,	NULL },
 	{ MODKEY,			XK_k,		focusprev,	NULL },
@@ -80,7 +47,8 @@ Key keys[] = {
 	{ MODKEY,			XK_Tab,		viewprevtag,	NULL },
 	{ MODKEY,			XK_m,		setlayout,	"[M]" },
 	{ MODKEY,			XK_f,		setlayout,	"><>" },
-	{ MODKEY,			XK_t,		setlayout,	"[]=" },
+	{ MODKEY,			XK_v,		setlayout,	"[]=" },
+	{ MODKEY,			XK_h,		setlayout,	"[]|" },
 	{ MODKEY|ShiftMask,		XK_space,	togglefloating,	NULL },
 	{ MODKEY|ShiftMask,		XK_c,		killclient,	NULL },
 	{ MODKEY,			XK_0,		view,		NULL },