diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-22 09:09:45 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-22 09:09:45 +0100 |
| commit | 3680463fea4793ab39000b102bacf1bb66eceafc (patch) | |
| tree | 7ed09ff631c5955e24bcf6fb1c6eb1a3cc4456fd /community/dwm | |
| parent | cf1b8826accdb5f1a092ed387f66f061920c4953 (diff) | |
| parent | 69d24275e4d5296a5f02e4c4d0fc438a80d159b8 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/qtcreator/PKGBUILD
core/glibc/PKGBUILD
core/openldap/PKGBUILD
extra/libgsf/PKGBUILD
extra/phonon/PKGBUILD
extra/poppler/PKGBUILD
extra/smartmontools/PKGBUILD
extra/vlc/PKGBUILD
extra/xfwm4/PKGBUILD
kde-unstable/calligra/PKGBUILD
kde-unstable/kdelibs/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-krb5/PKGBUILD
multilib/lib32-libcap/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libogg/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libxcursor/PKGBUILD
multilib/lib32-libxext/PKGBUILD
multilib/lib32-libxfixes/PKGBUILD
multilib/lib32-libxi/PKGBUILD
multilib/lib32-libxrandr/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/lib32-llvm/clang-pure64.patch
multilib/lib32-llvm/enable-lto.patch
multilib/lib32-mesa/PKGBUILD
multilib/lib32-pcre/PKGBUILD
multilib/lib32-pixman/PKGBUILD
multilib/lib32-readline/PKGBUILD
multilib/lib32-udev/PKGBUILD
multilib/lib32-v4l-utils/PKGBUILD
Diffstat (limited to 'community/dwm')
| -rw-r--r-- | community/dwm/PKGBUILD | 10 | ||||
| -rw-r--r-- | community/dwm/config.h | 15 |
2 files changed, 14 insertions, 11 deletions
diff --git a/community/dwm/PKGBUILD b/community/dwm/PKGBUILD index 721aa7e91..6fad2aa73 100644 --- a/community/dwm/PKGBUILD +++ b/community/dwm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54496 2011-08-19 09:22:43Z spupykin $ +# $Id: PKGBUILD 60970 2011-12-19 21:33:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Dag Odenhall <dag.odenhall@gmail.com> # Contributor: Grigorios Bouzakis <grbzks@gmail.com> pkgname=dwm -pkgver=5.9 -pkgrel=2 +pkgver=6.0 +pkgrel=1 pkgdesc="A dynamic window manager for X" url="http://dwm.suckless.org" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ install=dwm.install source=(http://dl.suckless.org/dwm/dwm-$pkgver.tar.gz config.h dwm.desktop) -md5sums=('2799f885c05817ca112d521bb247f797' - 'f0ba59bf77a53e3a2fc8596740ee5cb8' +md5sums=('8bb00d4142259beb11e13473b81c0857' + '2453e037f46449774ec8afab49b4f1a2' '939f403a71b6e85261d09fc3412269ee') build() { diff --git a/community/dwm/config.h b/community/dwm/config.h index 91cf4391d..77ff35805 100644 --- a/community/dwm/config.h +++ b/community/dwm/config.h @@ -2,12 +2,12 @@ /* appearance */ static const char font[] = "-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*"; -static const char normbordercolor[] = "#cccccc"; -static const char normbgcolor[] = "#cccccc"; -static const char normfgcolor[] = "#000000"; -static const char selbordercolor[] = "#0066ff"; -static const char selbgcolor[] = "#0066ff"; -static const char selfgcolor[] = "#ffffff"; +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 unsigned int snap = 32; /* snap pixel */ static const Bool showbar = True; /* False means no bar */ @@ -24,6 +24,7 @@ static const Rule rules[] = { /* 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 Layout layouts[] = { @@ -55,6 +56,8 @@ static Key keys[] = { { 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} }, |