removed temporary wildcard handling

[dwm.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 2c4d3d0..f7bb36a 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -1,7 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */

-#define BARPOS                 BarTop /* BarBot, BarOff */

 #define BORDERPX               1
 #define FONT                   "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*"
 #define NORMBORDERCOLOR                "#cccccc"
 #define BORDERPX               1
 #define FONT                   "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*"
 #define NORMBORDERCOLOR                "#cccccc"


@@ -15,23 +14,20 @@
 const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 
 Rule rules[] = {
 const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 
 Rule rules[] = {

-       /* class:instance:title substr  tags ref        isfloating */
-       { "Firefox",                    tags[8],        False },
-       { "Gimp",                       NULL,           True },
-       { "MPlayer",                    NULL,           True },
-       { "Acroread",                   NULL,           True },
+       /* class        instance        title           tags ref        isfloating */
+       { "Gimp",       NULL,           NULL,           NULL,           True },

 };
 
 /* layout(s) */
 };
 
 /* layout(s) */

-#define MWFACT                 0.6     /* master width factor [0.1 .. 0.9] */
+#define MFACT                  0.55    /* master width factor [0.1 .. 0.9] */

 #define RESIZEHINTS            True    /* False - respect size hints in tiled resizals */
 #define SNAP                   32      /* snap pixel */
 
 Layout layouts[] = {
 #define RESIZEHINTS            True    /* False - respect size hints in tiled resizals */
 #define SNAP                   32      /* snap pixel */
 
 Layout layouts[] = {

-       /* symbol               function */
-       { "[]=",                tile }, /* first entry is default */
-       { "><>",                floating },
-       { "[M]",                maximise },
+       /* symbol               function        isfloating */
+       { "[]=",                tilev,          False }, /* first entry is default */
+       { "><>",                NULL,           True },
+       { "<M>",                monocle,        True },

 };
 
 /* key definitions */
 };
 
 /* key definitions */


@@ -40,20 +36,20 @@ Key keys[] = {
        /* modifier                     key             function        argument */
        { MODKEY,                       XK_p,           spawn,
                "exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },
        /* modifier                     key             function        argument */
        { MODKEY,                       XK_p,           spawn,
                "exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },

-       { MODKEY|ShiftMask,             XK_Return,      spawn, "exec uxterm" },
-       { MODKEY,                       XK_b,           togglebar,      NULL },
-       { MODKEY,                       XK_t,           setlayout,      "[]=" },
-       { MODKEY,                       XK_f,           setlayout,      "><>" },
-       { MODKEY,                       XK_m    ,       setlayout,      "[M]" },
+       { MODKEY|ShiftMask,             XK_Return,      spawn,          "exec uxterm" },

        { MODKEY,                       XK_j,           focusnext,      NULL },
        { MODKEY,                       XK_j,           focusnext,      NULL },

+       { MODKEY|ShiftMask,             XK_j,           focusnext,      "exact" },

        { MODKEY,                       XK_k,           focusprev,      NULL },
        { MODKEY,                       XK_k,           focusprev,      NULL },

-       { MODKEY,                       XK_h,           setmwfact,      "-0.05" },
-       { MODKEY,                       XK_l,           setmwfact,      "+0.05" },
+       { MODKEY|ShiftMask,             XK_k,           focusprev,      "exact" },

        { MODKEY,                       XK_r,           reapply,        NULL },
        { MODKEY,                       XK_r,           reapply,        NULL },

+       { MODKEY,                       XK_h,           setmfact,       "-0.05" },
+       { MODKEY,                       XK_l,           setmfact,       "+0.05" },

        { MODKEY,                       XK_Return,      zoom,           NULL },
        { MODKEY,                       XK_Return,      zoom,           NULL },

+       { MODKEY,                       XK_m,           setlayout,      "<M>" },

        { MODKEY,                       XK_Tab,         viewprevtag,    NULL },
        { MODKEY,                       XK_Tab,         viewprevtag,    NULL },

-       { MODKEY|ShiftMask,             XK_space,       togglefloating, NULL },

        { MODKEY|ShiftMask,             XK_c,           killclient,     NULL },
        { MODKEY|ShiftMask,             XK_c,           killclient,     NULL },

+       { MODKEY,                       XK_space,       setlayout,      NULL },
+       { MODKEY|ShiftMask,             XK_space,       togglefloating, NULL },

        { MODKEY,                       XK_0,           view,           NULL },
        { MODKEY,                       XK_1,           view,           tags[0] },
        { MODKEY,                       XK_2,           view,           tags[1] },
        { MODKEY,                       XK_0,           view,           NULL },
        { MODKEY,                       XK_1,           view,           tags[0] },
        { MODKEY,                       XK_2,           view,           tags[1] },