~hmbrg/dwm

41955683f2de7f3b53fd8e8eb803d9957d084c65 — Frank Homburg 6 months ago 6291742
minor tweaks
2 files changed, 26 insertions(+), 38 deletions(-)

M config.h
M config.mk
M config.h => config.h +24 -23
@@ 208,8 208,9 @@ static const Layout layouts[] = {
	{ MODKEY|ControlMask|ShiftMask, KEY,      toggletag,      {.ui = 1 << TAG} },

#define STACKKEYS(MOD,ACTION) \
	{ MOD, XK_w,     ACTION##stack, {.i = 0 } }, \
	{ MOD, XK_e,     ACTION##stack, {.i = 1 } }, \
	{ MOD,	XK_j,	ACTION##stack,	{.i = INC(+1) } }, \
	{ MOD,	XK_k,	ACTION##stack,	{.i = INC(-1) } }, \
	{ MOD,  XK_v,   ACTION##stack,  {.i = 0 } }, \


/* helper for spawning shell commands in the pre dwm-5.0 fashion */


@@ 231,27 232,27 @@ static const char *termcmd[]  = { "st", NULL };
/*
 * Xresources preferences to load at startup
 */
ResourcePref resources[] = {
		{ "color0",		STRING,	&normbordercolor },
		{ "color8",		STRING,	&selbordercolor },
		{ "color0",		STRING,	&normbgcolor },
		{ "color4",		STRING,	&normfgcolor },
		{ "color0",		STRING,	&selfgcolor },
		{ "color4",		STRING,	&selbgcolor },
		{ "borderpx",		INTEGER, &borderpx },
		{ "snap",		INTEGER, &snap },
		{ "showbar",		INTEGER, &showbar },
		{ "topbar",		INTEGER, &topbar },
		{ "nmaster",		INTEGER, &nmaster },
		{ "resizehints",	INTEGER, &resizehints },
		{ "mfact",		FLOAT,	&mfact },
		{ "gappih",		INTEGER, &gappih },
		{ "gappiv",		INTEGER, &gappiv },
		{ "gappoh",		INTEGER, &gappoh },
		{ "gappov",		INTEGER, &gappov },
		{ "swallowfloating",	INTEGER, &swallowfloating },
		{ "smartgaps",		INTEGER, &smartgaps },
};
/* ResourcePref resources[] = {
* 		{ "color0",		STRING,	&normbordercolor },
* 		{ "color8",		STRING,	&selbordercolor },
* 		{ "color0",		STRING,	&normbgcolor },
* 		{ "color4",		STRING,	&normfgcolor },
* 		{ "color0",		STRING,	&selfgcolor },
* 		{ "color4",		STRING,	&selbgcolor },
* 		{ "borderpx",		INTEGER, &borderpx },
* 		{ "snap",		INTEGER, &snap },
* 		{ "showbar",		INTEGER, &showbar },
* 		{ "topbar",		INTEGER, &topbar },
* 		{ "nmaster",		INTEGER, &nmaster },
* 		{ "resizehints",	INTEGER, &resizehints },
* 		{ "mfact",		FLOAT,	&mfact },
* 		{ "gappih",		INTEGER, &gappih },
* 		{ "gappiv",		INTEGER, &gappiv },
* 		{ "gappoh",		INTEGER, &gappoh },
* 		{ "gappov",		INTEGER, &gappov },
* 		{ "swallowfloating",	INTEGER, &swallowfloating },
* 		{ "smartgaps",		INTEGER, &smartgaps },
}; */

static Key keys[] = {
	/* modifier                     key            function                argument */

M config.mk => config.mk +2 -15
@@ 10,10 10,6 @@ MANPREFIX = ${PREFIX}/share/man
X11INC = /usr/X11R6/include
X11LIB = /usr/X11R6/lib

# FreeBSD (uncomment)
#X11INC = /usr/local/include
#X11LIB = /usr/local/lib

# Xinerama, comment if you don't want it
XINERAMALIBS  = -lXinerama
XINERAMAFLAGS = -DXINERAMA


@@ 21,12 17,6 @@ XINERAMAFLAGS = -DXINERAMA
# freetype
FREETYPELIBS = -lfontconfig -lXft
FREETYPEINC = /usr/include/freetype2
# FreeBSD (uncomment)
#FREETYPEINC = /usr/local/include/freetype2
# OpenBSD (uncomment)
#FREETYPEINC = ${X11INC}/freetype2
# OpenBSD - Uncomment this for the swallow patch / SWALLOW_PATCH
#KVMLIB = -lkvm

# Uncomment this for the alpha patch and the winicon patch (BAR_ALPHA_PATCH, BAR_WINICON_PATCH)
#XRENDER = -lXrender


@@ 42,11 32,8 @@ FREETYPEINC = /usr/include/freetype2
#YAJLLIBS = -lyajl
#YAJLINC = -I/usr/include/yajl

# Uncomment this for the rounded corners patch / ROUNDED_CORNERS_PATCH
#XEXTLIB = -lXext

# Uncomment this for the swallow patch / SWALLOW_PATCH
#XCBLIBS = -lX11-xcb -lxcb -lxcb-res
XCBLIBS = -lX11-xcb -lxcb -lxcb-res

# This is needed for the winicon patch / BAR_WINICON_PATCH
#IMLIB2LIBS = -lImlib2


@@ 61,7 48,7 @@ CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\
CFLAGS   = -std=c99 -pedantic -Wall -Wno-unused-function -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
LDFLAGS  = ${LIBS}

# Solaris

#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
#LDFLAGS = ${LIBS}