renamed setlayout into togglelayout

diff --git a/config.def.h b/config.def.h
index f7bb36a..1c704c3 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -1,92 +1,91 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-#define BORDERPX               1
-#define FONT                   "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*"
-#define NORMBORDERCOLOR                "#cccccc"
-#define NORMBGCOLOR            "#cccccc"
-#define NORMFGCOLOR            "#000000"
-#define SELBORDERCOLOR         "#0066ff"
-#define SELBGCOLOR             "#0066ff"
-#define SELFGCOLOR             "#ffffff"
+#define BORDERPX        1
+#define FONT            "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*"
+#define NORMBORDERCOLOR "#cccccc"
+#define NORMBGCOLOR     "#cccccc"
+#define NORMFGCOLOR     "#000000"
+#define SELBORDERCOLOR  "#0066ff"
+#define SELBGCOLOR      "#0066ff"
+#define SELFGCOLOR      "#ffffff"
 
 /* tagging */
 const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 
 Rule rules[] = {
-       /* class        instance        title           tags ref        isfloating */
-       { "Gimp",       NULL,           NULL,           NULL,           True },
+       /* class      instance    title       tags ref      isfloating */
+       { "Gimp",     NULL,       NULL,       NULL,         True },
 };
 
 /* layout(s) */
-#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 */
+#define MFACT       0.55  /* master factor [0.1 .. 0.9] */
+#define RESIZEHINTS True  /* False - respect size hints in tiled resizals */
+#define SNAP        32    /* snap pixel */
 
 Layout layouts[] = {
-       /* symbol               function        isfloating */
-       { "[]=",                tilev,          False }, /* first entry is default */
-       { "><>",                NULL,           True },
-       { "<M>",                monocle,        True },
+       /* symbol     function    isfloating */
+       { "[]=",      tilev,      False }, /* first entry is default */
+       { "><>",      NULL,       True },
+       { "<M>",      monocle,    True },
 };
 
 /* key definitions */
-#define MODKEY                 Mod1Mask
+#define MODKEY Mod1Mask
 Key keys[] = {
-       /* 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_j,           focusnext,      NULL },
-       { MODKEY|ShiftMask,             XK_j,           focusnext,      "exact" },
-       { MODKEY,                       XK_k,           focusprev,      NULL },
-       { MODKEY|ShiftMask,             XK_k,           focusprev,      "exact" },
-       { MODKEY,                       XK_r,           reapply,        NULL },
-       { MODKEY,                       XK_h,           setmfact,       "-0.05" },
-       { MODKEY,                       XK_l,           setmfact,       "+0.05" },
-       { MODKEY,                       XK_Return,      zoom,           NULL },
-       { MODKEY,                       XK_m,           setlayout,      "<M>" },
-       { MODKEY,                       XK_Tab,         viewprevtag,    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_3,           view,           tags[2] },
-       { MODKEY,                       XK_4,           view,           tags[3] },
-       { MODKEY,                       XK_5,           view,           tags[4] },
-       { MODKEY,                       XK_6,           view,           tags[5] },
-       { MODKEY,                       XK_7,           view,           tags[6] },
-       { MODKEY,                       XK_8,           view,           tags[7] },
-       { MODKEY,                       XK_9,           view,           tags[8] },
-       { MODKEY|ControlMask,           XK_1,           toggleview,     tags[0] },
-       { MODKEY|ControlMask,           XK_2,           toggleview,     tags[1] },
-       { MODKEY|ControlMask,           XK_3,           toggleview,     tags[2] },
-       { MODKEY|ControlMask,           XK_4,           toggleview,     tags[3] },
-       { MODKEY|ControlMask,           XK_5,           toggleview,     tags[4] },
-       { MODKEY|ControlMask,           XK_6,           toggleview,     tags[5] },
-       { MODKEY|ControlMask,           XK_7,           toggleview,     tags[6] },
-       { MODKEY|ControlMask,           XK_8,           toggleview,     tags[7] },
-       { MODKEY|ControlMask,           XK_9,           toggleview,     tags[8] },
-       { MODKEY|ShiftMask,             XK_0,           tag,            NULL },
-       { MODKEY|ShiftMask,             XK_1,           tag,            tags[0] },
-       { MODKEY|ShiftMask,             XK_2,           tag,            tags[1] },
-       { MODKEY|ShiftMask,             XK_3,           tag,            tags[2] },
-       { MODKEY|ShiftMask,             XK_4,           tag,            tags[3] },
-       { MODKEY|ShiftMask,             XK_5,           tag,            tags[4] },
-       { MODKEY|ShiftMask,             XK_6,           tag,            tags[5] },
-       { MODKEY|ShiftMask,             XK_7,           tag,            tags[6] },
-       { MODKEY|ShiftMask,             XK_8,           tag,            tags[7] },
-       { MODKEY|ShiftMask,             XK_9,           tag,            tags[8] },
-       { MODKEY|ControlMask|ShiftMask, XK_1,           toggletag,      tags[0] },
-       { MODKEY|ControlMask|ShiftMask, XK_2,           toggletag,      tags[1] },
-       { MODKEY|ControlMask|ShiftMask, XK_3,           toggletag,      tags[2] },
-       { MODKEY|ControlMask|ShiftMask, XK_4,           toggletag,      tags[3] },
-       { MODKEY|ControlMask|ShiftMask, XK_5,           toggletag,      tags[4] },
-       { MODKEY|ControlMask|ShiftMask, XK_6,           toggletag,      tags[5] },
-       { MODKEY|ControlMask|ShiftMask, XK_7,           toggletag,      tags[6] },
-       { MODKEY|ControlMask|ShiftMask, XK_8,           toggletag,      tags[7] },
-       { MODKEY|ControlMask|ShiftMask, XK_9,           toggletag,      tags[8] },
-       { MODKEY|ShiftMask,             XK_q,           quit,           NULL },
+       /* 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_j,      focusnext,      NULL },
+       { MODKEY|ShiftMask,             XK_j,      focusnext,      "exact" },
+       { MODKEY,                       XK_k,      focusprev,      NULL },
+       { MODKEY|ShiftMask,             XK_k,      focusprev,      "exact" },
+       { MODKEY,                       XK_r,      reapply,        NULL },
+       { MODKEY,                       XK_h,      setmfact,       "-0.05" },
+       { MODKEY,                       XK_l,      setmfact,       "+0.05" },
+       { MODKEY,                       XK_Return, zoom,           NULL },
+       { MODKEY,                       XK_m,      togglelayout,   "<M>" },
+       { MODKEY,                       XK_Tab,    viewprevtag,    NULL },
+       { MODKEY|ShiftMask,             XK_c,      killclient,     NULL },
+       { MODKEY,                       XK_space,  togglelayout,   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_3,      view,           tags[2] },
+       { MODKEY,                       XK_4,      view,           tags[3] },
+       { MODKEY,                       XK_5,      view,           tags[4] },
+       { MODKEY,                       XK_6,      view,           tags[5] },
+       { MODKEY,                       XK_7,      view,           tags[6] },
+       { MODKEY,                       XK_8,      view,           tags[7] },
+       { MODKEY,                       XK_9,      view,           tags[8] },
+       { MODKEY|ControlMask,           XK_1,      toggleview,     tags[0] },
+       { MODKEY|ControlMask,           XK_2,      toggleview,     tags[1] },
+       { MODKEY|ControlMask,           XK_3,      toggleview,     tags[2] },
+       { MODKEY|ControlMask,           XK_4,      toggleview,     tags[3] },
+       { MODKEY|ControlMask,           XK_5,      toggleview,     tags[4] },
+       { MODKEY|ControlMask,           XK_6,      toggleview,     tags[5] },
+       { MODKEY|ControlMask,           XK_7,      toggleview,     tags[6] },
+       { MODKEY|ControlMask,           XK_8,      toggleview,     tags[7] },
+       { MODKEY|ControlMask,           XK_9,      toggleview,     tags[8] },
+       { MODKEY|ShiftMask,             XK_0,      tag,            NULL },
+       { MODKEY|ShiftMask,             XK_1,      tag,            tags[0] },
+       { MODKEY|ShiftMask,             XK_2,      tag,            tags[1] },
+       { MODKEY|ShiftMask,             XK_3,      tag,            tags[2] },
+       { MODKEY|ShiftMask,             XK_4,      tag,            tags[3] },
+       { MODKEY|ShiftMask,             XK_5,      tag,            tags[4] },
+       { MODKEY|ShiftMask,             XK_6,      tag,            tags[5] },
+       { MODKEY|ShiftMask,             XK_7,      tag,            tags[6] },
+       { MODKEY|ShiftMask,             XK_8,      tag,            tags[7] },
+       { MODKEY|ShiftMask,             XK_9,      tag,            tags[8] },
+       { MODKEY|ControlMask|ShiftMask, XK_1,      toggletag,      tags[0] },
+       { MODKEY|ControlMask|ShiftMask, XK_2,      toggletag,      tags[1] },
+       { MODKEY|ControlMask|ShiftMask, XK_3,      toggletag,      tags[2] },
+       { MODKEY|ControlMask|ShiftMask, XK_4,      toggletag,      tags[3] },
+       { MODKEY|ControlMask|ShiftMask, XK_5,      toggletag,      tags[4] },
+       { MODKEY|ControlMask|ShiftMask, XK_6,      toggletag,      tags[5] },
+       { MODKEY|ControlMask|ShiftMask, XK_7,      toggletag,      tags[6] },
+       { MODKEY|ControlMask|ShiftMask, XK_8,      toggletag,      tags[7] },
+       { MODKEY|ControlMask|ShiftMask, XK_9,      toggletag,      tags[8] },
+       { MODKEY|ShiftMask,             XK_q,      quit,           NULL },
 };

diff --git a/dwm.c b/dwm.c
index 02c30d4..88391af 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -165,7 +165,6 @@ void restack(void);
 void run(void);
 void scan(void);
 void setclientstate(Client *c, long state);
-void setlayout(const char *arg);
 void setmfact(const char *arg);
 void setup(void);
 void spawn(const char *arg);
@@ -179,6 +178,7 @@ void tileresize(Client *c, int x, int y, int w, int h);
 void tilev(void);
 void tilevstack(unsigned int n);
 void togglefloating(const char *arg);
+void togglelayout(const char *arg);
 void toggletag(const char *arg);
 void toggleview(const char *arg);
 void unban(Client *c);
@@ -335,7 +335,7 @@ buttonpress(XEvent *e) {
                        }
                }
                if((ev->x < x + blw) && ev->button == Button1) 
-                       setlayout(NULL);
+                       togglelayout(NULL);
        }
        else if((c = getclient(ev->window))) {
                focus(c);
@@ -1375,28 +1375,6 @@ setclientstate(Client *c, long state) {
                        PropModeReplace, (unsigned char *)data, 2);
 }
 
-void
-setlayout(const char *arg) {
-       unsigned int i;
-
-       if(!arg) {
-               if(++lt == &layouts[LENGTH(layouts)])
-                       lt = &layouts[0];
-       }
-       else {
-               for(i = 0; i < LENGTH(layouts); i++)
-                       if(!strcmp(arg, layouts[i].symbol))
-                               break;
-               if(i == LENGTH(layouts))
-                       return;
-               lt = &layouts[i];
-       }
-       if(sel)
-               arrange();
-       else
-               drawbar();
-}
-
 void
 setmfact(const char *arg) {
        double d;
@@ -1635,6 +1613,28 @@ togglefloating(const char *arg) {
        arrange();
 }
 
+void
+togglelayout(const char *arg) {
+       unsigned int i;
+
+       if(!arg) {
+               if(++lt == &layouts[LENGTH(layouts)])
+                       lt = &layouts[0];
+       }
+       else {
+               for(i = 0; i < LENGTH(layouts); i++)
+                       if(!strcmp(arg, layouts[i].symbol))
+                               break;
+               if(i == LENGTH(layouts))
+                       return;
+               lt = &layouts[i];
+       }
+       if(sel)
+               arrange();
+       else
+               drawbar();
+}
+
 void
 toggletag(const char *arg) {
        unsigned int i, j;