update config.def.h with my settings, docs

diff --git a/README b/README
index 349fca0..39d3889 100644 (file)
--- a/README
+++ b/README
@@ -17,6 +17,11 @@ JasonWoof's modifications include:
 3.     _NET_WM_OPACITY is set. Run xcompmgr or the like, so you can see which
        window has focus. (Non-zero width borders are probably broken in this fork)
 
+4.     Terminals are spawned with environmental variable containing the current
+       workspace number. This can be used to eg have separate shell history per
+       workspace, and/or make terminals stay in their correct workspaces accross
+       dwm restarts.
+
 
 Requirements
 ------------

diff --git a/config.def.h b/config.def.h
index 4e0c71c..af735d8 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -8,39 +8,65 @@ static const char normfgcolor[]     = "#bbbbbb";
 static const char selbordercolor[]  = "#005577";
 static const char selbgcolor[]      = "#005577";
 static const char selfgcolor[]      = "#eeeeee";
-static const unsigned int borderpx  = 1;        /* border pixel of windows */
+static const unsigned int borderpx  = 0;        /* border pixel of windows. leave at 0, use xcompmgr to show focus instead. */
 static const unsigned int snap      = 32;       /* snap pixel */
 static const Bool showbar           = True;     /* False means no bar */
 static const Bool topbar            = True;     /* False means bottom bar */
 
 /* tagging */
-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-static const char *workspace_numbers_str[] = { "0", "1", "2", "3", "4", "5", "6", "7", "8" };
+static const char *tags[] = { "`", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "[", "]" };
+static const char *workspace_numbers_str[] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12" };
 
+#define TBC(tag, wclass) { wclass, NULL, NULL, 1 << tag, False, False, -1 },
+#define TBT(tag, title) { NULL, NULL, title, 1 << tag, False, False, -1 },
+#define SHBC(tag, wclass) { wclass, NULL, NULL, 1 << tag, False, True, -1 },
 static const Rule rules[] = {
        /* xprop(1):
         *      WM_CLASS(STRING) = instance, class
         *      WM_NAME(STRING) = title
         */
-       /* class      instance    title       tags mask     isfloating   monitor */
-       { "Gimp",     NULL,       NULL,       0,            True,        -1 },
-       { "Firefox",  NULL,       NULL,       1 << 8,       False,       -1 },
+       // Tag By Class
+       TBC( 1, "Chromium")
+       TBC( 1, "Firefox")
+       TBC( 1, "Iceweasel")
+       TBC(10, "Pidgin")
+       // Screen Hog (By class) + tag
+       SHBC( 2, "Inkscape")
+       SHBC( 2, "org-openstreetmap-josm-Main") // Josm (both splash and main window)
+       SHBC( 5, "Gimp")
+       // Tag By Title (matches prefix)
+       // These rules are used to keep terminals in the right workspace accross dwm restarts
+       // Put something like this in your .zshrc:
+       //     function preexec { echo -ne "\033]0;w$WORKSPACE_NUMBER: $1\a"; }
+       //     function precmd { echo -ne "\033]0;w$WORKSPACE_NUMBER: $PWD\a"; }
+       TBT( 1, "w1: ")
+       TBT( 2, "w2: ")
+       TBT( 3, "w3: ")
+       TBT( 4, "w4: ")
+       TBT( 5, "w5: ")
+       TBT( 6, "w6: ")
+       TBT( 7, "w7: ")
+       TBT( 8, "w8: ")
+       TBT( 9, "w9: ")
+       TBT(10, "w10: ")
+       TBT(11, "w11: ")
+       TBT(12, "w12: ")
 };
 
 /* layout(s) */
-static const float mfact      = 0.55; /* factor of master area size [0.05..0.95] */
-static const int nmaster      = 1;    /* number of clients in master area */
-static const Bool resizehints = True; /* True means respect size hints in tiled resizals */
+static const float mfact      = 0.595; /* factor of master area size [0.05..0.95] */
+static const int nmaster      = 1;    /* number of clients in master area. This setting probably does nothing */
+static const Bool resizehints = False; /* True means respect size hints in tiled resizals */
 
 static const Layout layouts[] = {
        /* symbol     arrange function */
-       { "[]=",      tile },    /* first entry is default */
-       { "><>",      NULL },    /* no layout function means floating behavior */
-       { "[M]",      monocle },
+       { "   ",      jason_layout },
+       { "Flo",      NULL },    // floating (don't think this gets used ever)
+       { "   ",      monocle }, // symbol is ignored
 };
 
 /* key definitions */
-#define MODKEY Mod1Mask
+#define MODKEY Mod4Mask
 #define TAGKEYS(KEY,TAG) \
        { MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
        { MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
@@ -52,44 +78,49 @@ static const Layout layouts[] = {
 
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
+//static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
+static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
 char WORKSPACE_NUMBER[] = "WORKSPACE_NUMBER=00";
-static const char *termcmd[]  = { "env", (const char *)(&(WORKSPACE_NUMBER[0])), "lilyterm", NULL };
+static const char *termcmd[]  = { "env", (const char *)(&(WORKSPACE_NUMBER[0])), "st", NULL };
 
 static Key keys[] = {
        /* modifier                     key        function        argument */
-       { MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
-       { MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
+       { 0,                            XK_F1,     spawn,          {.v = dmenucmd } },
+       { 0,                            XK_F2,     spawn,          {.v = termcmd } },
        { MODKEY,                       XK_b,      togglebar,      {0} },
-       { MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
-       { MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
-       { MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
-       { MODKEY,                       XK_d,      incnmaster,     {.i = -1 } },
-       { MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
-       { MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
-       { MODKEY,                       XK_Return, zoom,           {0} },
+       { MODKEY,                       XK_n,      focusstack,     {.i = +1 } },
+       { MODKEY,                       XK_h,      focusstack,     {.i = 0 } },
+//     { MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
+//     { MODKEY,                       XK_d,      incnmaster,     {.i = -1 } },
+       { MODKEY|ControlMask,           XK_h,      setmfact,       {.f = -0.05} },
+       { MODKEY|ControlMask,           XK_n,      setmfact,       {.f = +0.05} },
+       { MODKEY|ShiftMask,             XK_h,      zoom,           {0} },
        { MODKEY,                       XK_Tab,    view,           {0} },
-       { MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
-       { MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
-       { MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
-       { MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
-       { MODKEY,                       XK_space,  setlayout,      {0} },
+       { MODKEY,                       XK_w,      killclient,     {0} },
+       { MODKEY|ShiftMask,             XK_f,      setlayout,      {.v = &layouts[0]} },
+       { MODKEY|ShiftMask|ControlMask, XK_f,      setlayout,      {.v = &layouts[1]} },
+       { MODKEY,                       XK_f,      setlayout,      {.v = &layouts[2]} },
+//     { MODKEY,                       XK_space,  setlayout,      {0} },
        { MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
-       { MODKEY,                       XK_0,      view,           {.ui = ~0 } },
-       { MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
-       { MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
-       { MODKEY,                       XK_period, focusmon,       {.i = +1 } },
-       { MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
-       { MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
-       TAGKEYS(                        XK_1,                      0)
-       TAGKEYS(                        XK_2,                      1)
-       TAGKEYS(                        XK_3,                      2)
-       TAGKEYS(                        XK_4,                      3)
-       TAGKEYS(                        XK_5,                      4)
-       TAGKEYS(                        XK_6,                      5)
-       TAGKEYS(                        XK_7,                      6)
-       TAGKEYS(                        XK_8,                      7)
-       TAGKEYS(                        XK_9,                      8)
+//     { MODKEY,                       XK_0,      view,           {.ui = ~0 } },
+//     { MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
+//     { MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
+//     { MODKEY,                       XK_period, focusmon,       {.i = +1 } },
+//     { MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
+//     { MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
+       TAGKEYS(                        XK_grave,                  0)
+       TAGKEYS(                        XK_1,                      1)
+       TAGKEYS(                        XK_2,                      2)
+       TAGKEYS(                        XK_3,                      3)
+       TAGKEYS(                        XK_4,                      4)
+       TAGKEYS(                        XK_5,                      5)
+       TAGKEYS(                        XK_6,                      6)
+       TAGKEYS(                        XK_7,                      7)
+       TAGKEYS(                        XK_8,                      8)
+       TAGKEYS(                        XK_9,                      9)
+       TAGKEYS(                        XK_0,                      10)
+       TAGKEYS(                        XK_bracketleft,            11)
+       TAGKEYS(                        XK_bracketright,           12)
        { MODKEY|ShiftMask,             XK_q,      quit,           {0} },
 };