Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
added some comments what the TODOs are for 4.8
[dwm.git]
/
config.def.h
diff --git
a/config.def.h
b/config.def.h
index
c87553f
..
d1d884e
100644
(file)
--- a/
config.def.h
+++ b/
config.def.h
@@
-10,37
+10,16
@@
#define SELBGCOLOR "#0066ff"
#define SELFGCOLOR "#ffffff"
#define SELBGCOLOR "#0066ff"
#define SELFGCOLOR "#ffffff"
-#if WORK
-
-/* bar position */
-#define BX 0
-#define BY 0
-#define BW 1280
-
-/* master area */
-#define MX 0
-#define MY bh
-#define MW 1280
-#define MH 800 - bh
-
-/* tile area, might be on a different screen */
-#define TX 1280
-#define TY 0
-#define TW 1680
-#define TH 1050
-
-/* monocle area, might be restricted to a specific screen */
-#define MOX MX
-#define MOY MY
-#define MOW MW
-#define MOH MH
-
-#else
-
/* bar position */
#define BX sx
#define BY sy
/* bar position */
#define BX sx
#define BY sy
-#define BW sw
+#define BW MW
+
+/* window area */
+#define WX 0
+#define WY bh
+#define WW sw
+#define WH sh
/* master area */
#define MX sx
/* master area */
#define MX sx
@@
-50,9
+29,9
@@
/* tile area, might be on a different screen */
#define TX sx + MW
/* tile area, might be on a different screen */
#define TX sx + MW
-#define TY
MY
+#define TY
sy
#define TW sw - MW
#define TW sw - MW
-#define TH
MH
+#define TH
sh
/* monocle area, might be restricted to a specific screen */
#define MOX sx
/* monocle area, might be restricted to a specific screen */
#define MOX sx
@@
-60,8
+39,6
@@
#define MOW sw
#define MOH MH
#define MOW sw
#define MOH MH
-#endif
-
/* tagging */
const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
/* tagging */
const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
@@
-88,8
+65,13
@@
Layout layouts[] = {
#define MODKEY Mod1Mask
Key keys[] = {
/* modifier key function argument */
#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"'" },
{ 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 },
{ MODKEY|ShiftMask, XK_Return, spawn, "exec uxterm" },
{ MODKEY, XK_j, focusnext, NULL },
{ MODKEY, XK_k, focusprev, NULL },