implemented restack behavior (floats are on top in tiled mode)

[dwm.git] / config.arg.h

diff --git a/config.arg.h b/config.arg.h
index 3b44fd7..17215fb 100644 (file)
--- a/config.arg.h
+++ b/config.arg.h
@@ -3,72 +3,54 @@
  * See LICENSE file for license details.
  */
 
  * See LICENSE file for license details.
  */
 

-#define ARRANGE                dotile /* dofloat */
-#define FONT                   "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
-#define BGCOLOR                        "#0a2c2d"
-#define FGCOLOR                        "#ddeeee"
-#define BORDERCOLOR            "#176164"
-#define MODKEY                 Mod1Mask
-#define NUMLOCKMASK            Mod2Mask
-#define MASTERW                        52 /* percent */
-
-enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };

 #define TAGS \
 #define TAGS \

-char *tags[TLast] = { \
-       [Tfnord] = "fnord", \
-       [Tdev] = "dev", \
-       [Tnet] = "net", \
-       [Twork] = "work", \
-       [Tmisc] = "misc", \
-};
-#define DEFTAG Tdev
+const char *tags[] = { "work", "net", "fnord", NULL };

 
 

-
-#define CMDS \
-       const char *browse[] = { "firefox", NULL }; \
-       const char *gimp[] = { "gimp", NULL }; \
-       const char *term[] = { \
-               "urxvt", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white", \
-               "-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL \
-       }; \
-       const char *xlock[] = { "xlock", NULL };
+#define DEFMODE                        dotile /* dofloat */
+#define DEFTAG                 0 /* index */
+#define FONT                   "-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"
+#define BGCOLOR                        "#0d121d"
+#define FGCOLOR                        "#eeeeee"
+#define BORDERCOLOR            "#3f484d"
+#define MODKEY                 Mod1Mask
+#define NUMLOCKMASK            Mod2Mask
+#define MASTERW                        60 /* percent */

 
 #define KEYS \
 static Key key[] = { \
 
 #define KEYS \
 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 } }, \
-       { MODKEY|ShiftMask,     XK_g,           spawn,          { .argv = gimp } }, \
-       { MODKEY|ShiftMask,     XK_l,           spawn,          { .argv = xlock } }, \
-       { MODKEY|ShiftMask,     XK_w,           spawn,          { .argv = browse } }, \
+       /* modifier                     key             function        arguments */ \
+       { MODKEY,                       XK_1,           view,           { .i = 0 } }, \
+       { MODKEY,                       XK_2,           view,           { .i = 1 } }, \
+       { MODKEY,                       XK_3,           view,           { .i = 2 } }, \
+       { MODKEY,                       XK_j,           focusnext,      { 0 } }, \
+       { MODKEY,                       XK_k,           focusprev,      { 0 } }, \
+       { MODKEY,                       XK_m,           togglemax,      { 0 } }, \
+       { MODKEY,                       XK_p,           spawn, \
+               { .cmd = "exec `ls -lL /usr/bin /usr/local/bin 2>/dev/null | " \
+                       "awk 'NF>2 && $1 ~ /^[^d].*x/ {print $NF}' | sort | uniq | dmenu`" } }, \
+       { MODKEY,                       XK_space,       togglemode,     { 0 } }, \
+       { MODKEY,                       XK_Return,      zoom,           { 0 } }, \
+       { MODKEY|ControlMask,           XK_1,           toggleview,     { .i = 0 } }, \
+       { MODKEY|ControlMask,           XK_2,           toggleview,     { .i = 1 } }, \
+       { MODKEY|ControlMask,           XK_3,           toggleview,     { .i = 2 } }, \
+       { MODKEY|ShiftMask,             XK_1,           replacetag,     { .i = 0 } }, \
+       { MODKEY|ShiftMask,             XK_2,           replacetag,     { .i = 1 } }, \
+       { MODKEY|ShiftMask,             XK_3,           replacetag,     { .i = 2 } }, \
+       { MODKEY|ShiftMask,             XK_c,           killclient,     { 0 } }, \
+       { MODKEY|ShiftMask,             XK_q,           quit,           { 0 } }, \
+       { MODKEY|ShiftMask,             XK_Return,      spawn, \
+               { .cmd = "exec urxvt +sb -tr -bg black -fg '#eeeeee' -cr '#eeeeee' +sb " \
+                       "-fn '-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*'" } }, \
+       { MODKEY|ControlMask|ShiftMask, XK_1,           appendtag,      { .i = 0 } }, \
+       { MODKEY|ControlMask|ShiftMask, XK_2,           appendtag,      { .i = 1 } }, \
+       { MODKEY|ControlMask|ShiftMask, XK_3,           appendtag,      { .i = 2 } }, \

 };
 
 #define RULES \
 static Rule rule[] = { \
 };
 
 #define RULES \
 static Rule rule[] = { \

-       /* class:instance       tags                            isfloat */ \
-       { "Firefox.*",          { [Tnet] = "net" },             False }, \
-       { "Gimp.*",             { 0 },                          True}, \
+       /* class:instance regex         tags regex      isfloat */ \
+       { "Firefox.*",                  "net",          False }, \
+       { "Gimp.*",                     NULL,           True}, \
+       { "MPlayer.*",                  NULL,           True}, \
+       { "Acroread.*",                 NULL,           True}, \

 };
 };