From 886e59944dc2c737a26511739ae1acf47be43bd5 Mon Sep 17 00:00:00 2001 From: Sascha Paunovic Date: Thu, 28 Dec 2017 13:33:51 +0100 Subject: [PATCH] various configuration --- config.def.h | 3 +++ config.h | 33 +++++++++++---------------------- config.mk | 6 +++--- dwm.c | 1 - 4 files changed, 17 insertions(+), 26 deletions(-) diff --git a/config.def.h b/config.def.h index 4448d46..1f90ebe 100644 --- a/config.def.h +++ b/config.def.h @@ -36,11 +36,14 @@ 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 int resizehints = 1; /* 1 means respect size hints in tiled resizals */ +#include "fibonacci.c" static const Layout layouts[] = { /* symbol arrange function */ { "[]=", tile }, /* first entry is default */ { "><>", NULL }, /* no layout function means floating behavior */ { "[M]", monocle }, + { "[@]", spiral }, + { "[\\]", dwindle }, }; /* key definitions */ diff --git a/config.h b/config.h index b9dd800..f0fcdf6 100644 --- a/config.h +++ b/config.h @@ -5,27 +5,22 @@ static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 1; /* 0 means no bar */ -static const int topbar = 1; /* 0 means bottom bar */ +static const int topbar = 0; /* 0 means bottom bar */ static const char normbgcolor[] = "#222222"; static const char normfgcolor[] = "#bbbbbb"; -static const char selbordercolor[] = "#0c0b13"; -static const char selbgcolor[] = "#0c0b13"; +static const char selbordercolor[] = "#386e5f"; +static const char selbgcolor[] = "#386e5f"; static const char selfgcolor[] = "#eeeeee"; static unsigned int baralpha = 0xa0; static unsigned int borderalpha = OPAQUE; static const char normbordercolor[] = "#444444"; -static const char *fonts[] = { "Dina:size=10" }; -static const char dmenufont[] = "Dina:size=10"; +static const char *fonts[] = { "Noto Sans Mono:size=10" }; +static const char dmenufont[] = "Noto Sans Mono:size=10"; static const char col_gray1[] = "#222222"; static const char col_gray2[] = "#444444"; static const char col_gray3[] = "#bbbbbb"; static const char col_gray4[] = "#eeeeee"; -static const char col_cyan[] = "#0c0b13"; -//static const char *colors[][3] = { -// /* fg bg border */ -// [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, -// [SchemeSel] = { col_gray4, col_cyan, col_cyan }, -//}; +static const char col_cyan[] = "#386e5f"; static const unsigned int gappx = 6; /* gap pixel between windows */ /* tagging */ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; @@ -47,8 +42,8 @@ static const Layout layouts[] = { { "[]=", tile }, /* first entry is default */ { "><>", NULL }, /* no layout function means floating behavior */ { "[M]", monocle }, - { "[\\]", dwindle }, - { "[/]", spiral }, + { "[\\]", dwindle }, + { "[/]", spiral }, }; /* key definitions */ @@ -69,27 +64,21 @@ static const char *passmenucmd[] = {"passmenu", "-m", dmenumon, "-fn", dmenufont static const char *term[] = {"st", NULL }; static const char *brow[] = {"firefox", NULL }; static const char *play[] = {"mpc", "play", NULL }; -static const char *vold[] = {"amixer", "-q", "set", "Master", "5%-", "unmute", NULL}; -static const char *volu[] = {"amixer", "-q", "set", "Master", "5%+", "unmute", NULL}; -static const char *mute[] = {"amixer", "-q", "set", "Master", "toggle", NULL}; static const char *stop[] = {"mpc", "stop", NULL}; static const char *next[] = {"mpc", "next", NULL}; static const char *prev[] = {"mpc", "prev", NULL}; static const char *togg[] = {"mpc", "toggle", NULL}; static const char *lock[] = {"slock", NULL}; -static const char *lokk[] = {"slock", "&&", "zzz", NULL}; +static const char *lokk[] = {"lokk", NULL}; static Key keys[] = { - /* modifier key function argument */ + /* modifier key function argument */ { MODKEY, XK_p, spawn, {.v = dmenucmd } }, { MODKEY|ShiftMask, XK_p, spawn, {.v = passmenucmd } }, { MODKEY|ShiftMask, XK_b, spawn, {.v = brow } }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = term } }, { MODKEY|ShiftMask, XK_x, spawn, {.v = lock } }, { MODKEY|ShiftMask, XK_y, spawn, {.v = lokk } }, - { 0, XF86XK_AudioLowerVolume, spawn, {.v = vold } }, - { 0, XF86XK_AudioRaiseVolume, spawn, {.v = volu } }, - { 0, XF86XK_AudioMute, spawn, {.v = mute } }, { 0, XF86XK_AudioNext, spawn, {.v = next } }, { 0, XF86XK_AudioPrev, spawn, {.v = prev } }, { 0, XF86XK_AudioStop, spawn, {.v = stop } }, @@ -129,7 +118,7 @@ static Key keys[] = { { MODKEY|ShiftMask, XK_q, quit, {0} }, }; -/* button definitions */ +/* mouse button definitions */ /* click can be ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ static Button buttons[] = { /* click event mask button function argument */ diff --git a/config.mk b/config.mk index 02eadee..97190d6 100644 --- a/config.mk +++ b/config.mk @@ -16,9 +16,9 @@ XINERAMAFLAGS = -DXINERAMA # freetype FREETYPELIBS = -lfontconfig -lXft -FREETYPEINC = /usr/include/freetype2 +#FREETYPEINC = /usr/include/freetype2 # OpenBSD (uncomment) -#FREETYPEINC = ${X11INC}/freetype2 +FREETYPEINC = ${X11INC}/freetype2 # includes and libs INCS = -I${X11INC} -I${FREETYPEINC} @@ -27,7 +27,7 @@ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXrender # flags CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} -CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -O2 ${INCS} ${CPPFLAGS} +CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} LDFLAGS = -s ${LIBS} # Solaris diff --git a/dwm.c b/dwm.c index 0103508..a491276 100644 --- a/dwm.c +++ b/dwm.c @@ -43,7 +43,6 @@ #include "drw.h" #include "util.h" - /* macros */ #define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) #define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)) -- 2.11.4.GIT