Commits

Thomas Dahms  committed 4450cd9

use config.def.h to stay up to date with upstream changes

  • Participants
  • Parent commits 08bf398

Comments (0)

Files changed (3)

 # HG changeset patch
-# Parent af91f4e3bfd6fac690f89f37b622673050756dfb
+# Parent 8de5f4d8e0692887a83c82db613016ae879530f1
 
-diff -r af91f4e3bfd6 config.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/config.h	Tue Nov 08 09:08:46 2011 +0100
-@@ -0,0 +1,119 @@
-+/* See LICENSE file for copyright and license details. */
-+
-+/* appearance */
+diff -r 8de5f4d8e069 config.def.h
+--- a/config.def.h	Tue Nov 08 15:24:06 2011 +0100
++++ b/config.def.h	Tue Nov 08 15:25:09 2011 +0100
+@@ -1,21 +1,21 @@
+ /* See LICENSE file for copyright and license details. */
+ 
+ /* appearance */
+-static const char font[]            = "-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*";
+-static const char normbordercolor[] = "#444444";
+-static const char normbgcolor[]     = "#222222";
+-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 char font[]            = "-*-clean-medium-r-*-*-12-*-*-*-*-*-*-*";
 +static const char normbordercolor[] = "#eeeeec";
 +static const char normbgcolor[]     = "#eeeeec";
 +static const char selbgcolor[]      = "#4a7eb5";
 +static const char selfgcolor[]      = "#ffffff";
 +static const unsigned int borderpx  = 3;        /* border pixel of windows */
-+static const unsigned int snap      = 32;       /* snap pixel */
-+static const Bool showbar           = True;     /* False means no bar */
+ 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 */
 +static const Bool topbar            = False;    /* False means bottom bar */
-+
-+/* tagging */
-+#define MAX_TAGLEN 16
+ 
+ /* tagging */
+ #define MAX_TAGLEN 16
+-static char tags[][MAX_TAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 +static char tags[][MAX_TAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9.web" };
-+
-+static const Rule rules[] = {
-+	/* class      instance    title       tags mask     isfloating   monitor */
-+	{ "Gimp",     NULL,       NULL,       0,            True,        -1 },
-+	{ "Firefox",  NULL,       NULL,       1 << 8,       False,       -1 },
-+};
-+
-+/* layout(s) */
+ 
+ static const Rule rules[] = {
+ 	/* class      instance    title       tags mask     isfloating   monitor */
+@@ -24,19 +24,22 @@
+ };
+ 
+ /* 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 float mfact      = 0.70; /* factor of master area size [0.05..0.95] */
 +static const int nmaster      = 2;    /* number of clients in master area */
-+static const Bool resizehints = True; /* True means respect size hints in tiled resizals */
-+
+ static const Bool resizehints = True; /* True means respect size hints in tiled resizals */
+ 
 +#include "ncol.c"
 +
-+static const Layout layouts[] = {
-+	/* symbol     arrange function */
+ static const Layout layouts[] = {
+ 	/* symbol     arrange function */
 +	{ "||=",      ncol },
-+	{ "[]=",      tile },    /* first entry is default */
-+	{ "><>",      NULL },    /* no layout function means floating behavior */
-+	{ "[M]",      monocle },
-+};
-+
-+/* key definitions */
+ 	{ "[]=",      tile },    /* first entry is default */
+ 	{ "><>",      NULL },    /* no layout function means floating behavior */
+ 	{ "[M]",      monocle },
+ };
+ 
+ /* 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} }, \
-+	{ MODKEY|ShiftMask,             KEY,      tag,            {.ui = 1 << TAG} }, \
-+	{ MODKEY|ControlMask|ShiftMask, KEY,      toggletag,      {.ui = 1 << TAG} },
-+
-+/* helper for spawning shell commands in the pre dwm-5.0 fashion */
-+#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
-+
-+/* commands */
-+static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
-+static const char *termcmd[]  = { "uxterm", NULL };
+ #define TAGKEYS(KEY,TAG) \
+ 	{ MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
+ 	{ MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
+@@ -49,11 +52,19 @@
+ /* commands */
+ static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
+ static const char *termcmd[]  = { "uxterm", NULL };
 +static const char *xlockcmd[] = { "xlock" , "-mode", "blank", NULL };
 +static const char *lautercmd[] = { "amixer", "sset", "Master", "2dB+", "unmute", NULL };
 +static const char *leisercmd[] = { "amixer", "sset", "Master", "2dB-", "unmute", NULL };
 +static const char *mutecmd[] = { "amixer", "sset", "Master", "toggle", NULL };
-+
-+static Key keys[] = {
-+	/* modifier                     key        function        argument */
-+	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
-+	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
+ 
+ static Key keys[] = {
+ 	/* modifier                     key        function        argument */
+ 	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
+ 	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
 +	{ MODKEY|ShiftMask,             XK_l,      spawn,          {.v = xlockcmd } },
 +	{ MODKEY|Mod1Mask,              XK_k,      spawn,          {.v = lautercmd } },
 +	{ MODKEY|Mod1Mask,              XK_j,      spawn,          {.v = leisercmd } },
 +	{ MODKEY|Mod1Mask,              XK_m,      spawn,          {.v = mutecmd } },
-+	{ 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_Tab,    view,           {0} },
-+	{ MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
+ 	{ MODKEY,                       XK_b,      togglebar,      {0} },
+ 	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
+ 	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
+@@ -64,9 +75,10 @@
+ 	{ MODKEY,                       XK_Return, 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_t,      setlayout,      {.v = &layouts[1]} },
 +	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[2]} },
 +	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[3]} },
 +	{ MODKEY,                       XK_c,      setlayout,      {.v = &layouts[0]} },
-+	{ 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 } },
-+	{ MODKEY,                       XK_n,      nametag,        {0} },
-+	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|ShiftMask,             XK_q,      quit,           {0} },
-+};
-+
-+/* button definitions */
-+/* click can be ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
-+static Button buttons[] = {
-+	/* click                event mask      button          function        argument */
-+	{ ClkLtSymbol,          0,              Button1,        setlayout,      {0} },
-+	{ ClkLtSymbol,          0,              Button3,        setlayout,      {.v = &layouts[2]} },
-+	{ ClkWinTitle,          0,              Button2,        zoom,           {0} },
-+	{ ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } },
-+	{ ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
-+	{ ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
-+	{ ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },
-+	{ ClkTagBar,            0,              Button1,        view,           {0} },
-+	{ ClkTagBar,            0,              Button3,        toggleview,     {0} },
-+	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
-+	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
-+};
-+
+ 	{ MODKEY,                       XK_space,  setlayout,      {0} },
+ 	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
+ 	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },

File configdefdefault

+# HG changeset patch
+# Parent fcc3e440587d9cfce1a94d237ac0b548a76715c7
+
+diff -r fcc3e440587d Makefile
+--- a/Makefile	Tue Nov 08 09:10:07 2011 +0100
++++ b/Makefile	Tue Nov 08 15:24:06 2011 +0100
+@@ -20,7 +20,7 @@
+ 
+ ${OBJ}: config.h config.mk
+ 
+-config.h:
++config.h: config.def.h
+ 	@echo creating $@ from config.def.h
+ 	@cp config.def.h $@
+ 
 nametag
 ncol
+configdefdefault
 config