small changes to dwm.1, rearranged order within main event loop

[dwm.git] / config.default.h

diff --git a/config.default.h b/config.default.h
index 1e8cb39..387b24f 100644 (file)
--- a/config.default.h
+++ b/config.default.h
@@ -3,60 +3,56 @@
  * See LICENSE file for license details.
  */
 
-enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };
 #define TAGS \
-char *tags[TLast] = { \
-       [Tfnord] = "fnord", \
-       [Tdev] = "dev", \
-       [Tnet] = "net", \
-       [Twork] = "work", \
-       [Tmisc] = "misc", \
-};
+const char *tags[] = { "0", "1", "2", "3", "4", NULL };
 
 #define DEFMODE                        dotile /* dofloat */
-#define DEFTAG                 Tdev
+#define DEFTAG                 1 /* index */
 #define FONT                   "fixed"
 #define BGCOLOR                        "#666699"
 #define FGCOLOR                        "#eeeeee"
 #define BORDERCOLOR            "#9999CC"
 #define MODKEY                 Mod1Mask
-#define NUMLOCKMASK            Mod2Mask
-#define MASTERW                        52 /* percent */
+#define MASTERW                        60 /* percent */
 
 #define KEYS \
-       const char *term[] = { "xterm", NULL }; \
 static Key key[] = { \
-       /* modifier             key             function        arguments */ \
-       { MODKEY,               XK_0,           view,           { .i = Tfnord } }, \
-       { MODKEY,               XK_1,           view,           { .i = Tdev } }, \
-       { MODKEY,               XK_2,           view,           { .i = Tnet } }, \
-       { MODKEY,               XK_3,           view,           { .i = Twork } }, \
-       { MODKEY,               XK_4,           view,           { .i = Tmisc} }, \
-       { MODKEY,               XK_h,           viewprev,       { 0 } }, \
-       { MODKEY,               XK_j,           focusnext,      { 0 } }, \
-       { MODKEY,               XK_k,           focusprev,      { 0 } }, \
-       { MODKEY,               XK_l,           viewnext,       { 0 } }, \
-       { MODKEY,               XK_m,           togglemax,      { 0 } }, \
-       { MODKEY,               XK_space,       togglemode,     { 0 } }, \
-       { MODKEY,               XK_Return,      zoom,           { 0 } }, \
-       { MODKEY|ControlMask,   XK_0,           appendtag,      { .i = Tfnord } }, \
-       { MODKEY|ControlMask,   XK_1,           appendtag,      { .i = Tdev } }, \
-       { MODKEY|ControlMask,   XK_2,           appendtag,      { .i = Tnet } }, \
-       { MODKEY|ControlMask,   XK_3,           appendtag,      { .i = Twork } }, \
-       { MODKEY|ControlMask,   XK_4,           appendtag,      { .i = Tmisc } }, \
-       { MODKEY|ShiftMask,     XK_0,           replacetag,     { .i = Tfnord } }, \
-       { MODKEY|ShiftMask,     XK_1,           replacetag,     { .i = Tdev } }, \
-       { MODKEY|ShiftMask,     XK_2,           replacetag,     { .i = Tnet } }, \
-       { MODKEY|ShiftMask,     XK_3,           replacetag,     { .i = Twork } }, \
-       { MODKEY|ShiftMask,     XK_4,           replacetag,     { .i = Tmisc } }, \
-       { MODKEY|ShiftMask,     XK_c,           killclient,     { 0 } }, \
-       { MODKEY|ShiftMask,     XK_q,           quit,           { 0 } }, \
-       { MODKEY|ShiftMask,     XK_Return,      spawn,          { .argv = term } }, \
+       /* modifier                     key             function        arguments */ \
+       { MODKEY|ShiftMask,             XK_Return,      spawn,          { .cmd = "exec xterm" } }, \
+       { MODKEY,                       XK_Tab,         focusnext,      { 0 } }, \
+       { MODKEY|ShiftMask,             XK_Tab,         focusprev,      { 0 } }, \
+       { MODKEY,                       XK_Return,      zoom,           { 0 } }, \
+       { MODKEY,                       XK_m,           togglemax,      { 0 } }, \
+       { MODKEY|ShiftMask,             XK_0,           tag,            { .i = 0 } }, \
+       { MODKEY|ShiftMask,             XK_1,           tag,            { .i = 1 } }, \
+       { MODKEY|ShiftMask,             XK_2,           tag,            { .i = 2 } }, \
+       { MODKEY|ShiftMask,             XK_3,           tag,            { .i = 3 } }, \
+       { MODKEY|ShiftMask,             XK_4,           tag,            { .i = 4 } }, \
+       { MODKEY|ControlMask|ShiftMask, XK_0,           toggletag,      { .i = 0 } }, \
+       { MODKEY|ControlMask|ShiftMask, XK_1,           toggletag,      { .i = 1 } }, \
+       { MODKEY|ControlMask|ShiftMask, XK_2,           toggletag,      { .i = 2 } }, \
+       { MODKEY|ControlMask|ShiftMask, XK_3,           toggletag,      { .i = 3 } }, \
+       { MODKEY|ControlMask|ShiftMask, XK_4,           toggletag,      { .i = 4 } }, \
+       { MODKEY|ShiftMask,             XK_c,           killclient,     { 0 } }, \
+       { MODKEY,                       XK_space,       togglemode,     { 0 } }, \
+       { MODKEY,                       XK_0,           view,           { .i = 0 } }, \
+       { MODKEY,                       XK_1,           view,           { .i = 1 } }, \
+       { MODKEY,                       XK_2,           view,           { .i = 2 } }, \
+       { MODKEY,                       XK_3,           view,           { .i = 3 } }, \
+       { MODKEY,                       XK_4,           view,           { .i = 4 } }, \
+       { MODKEY|ControlMask,           XK_0,           toggleview,     { .i = 0 } }, \
+       { MODKEY|ControlMask,           XK_1,           toggleview,     { .i = 1 } }, \
+       { MODKEY|ControlMask,           XK_2,           toggleview,     { .i = 2 } }, \
+       { MODKEY|ControlMask,           XK_3,           toggleview,     { .i = 3 } }, \
+       { MODKEY|ControlMask,           XK_4,           toggleview,     { .i = 4 } }, \
+       { MODKEY|ShiftMask,             XK_q,           quit,           { 0 } }, \
 };
 
+/* Query class:instance for regex matching info with following command:
+ * xprop | awk -F'"' '/^WM_CLASS/ { printf "%s:%s\n", $4, $2 }'*/
 #define RULES \
 static Rule rule[] = { \
-       /* class:instance       tags                            isfloat */ \
-       { "Firefox.*",          { [Tnet] = "net" },             False }, \
-       { "Gimp.*",             { 0 },                          True}, \
+       /* class:instance regex         tags regex      isfloat */ \
+       { "Firefox.*",                  "2",            False }, \
+       { "Gimp.*",                     NULL,           True}, \
 };