From bbf444d7e6042499bc59e85517fcae8d151b66a1 Mon Sep 17 00:00:00 2001 From: Cecil Date: Wed, 23 Feb 2011 15:42:00 -0800 Subject: fluxbox:working version w/ fullscreen patch. --- abs/core/fluxbox/ChangeLog | 10 ++++++ abs/core/fluxbox/PKGBUILD | 45 +++++++++++++------------ abs/core/fluxbox/__changelog | 3 +- abs/core/fluxbox/fluxbox_fullscreen_focus.patch | 15 +++++++++ abs/core/fluxbox/keys | 12 +++++++ 5 files changed, 62 insertions(+), 23 deletions(-) create mode 100644 abs/core/fluxbox/ChangeLog create mode 100644 abs/core/fluxbox/fluxbox_fullscreen_focus.patch diff --git a/abs/core/fluxbox/ChangeLog b/abs/core/fluxbox/ChangeLog new file mode 100644 index 0000000..f2f2e81 --- /dev/null +++ b/abs/core/fluxbox/ChangeLog @@ -0,0 +1,10 @@ +2008-09-19 Eric Belanger + + * fluxbox 1.1.1-1 + * Upstream update + +2008-09-05 Eric Belanger + + * fluxbox 1.1.0.1-1 + * Upstream update + * Added ChangeLog diff --git a/abs/core/fluxbox/PKGBUILD b/abs/core/fluxbox/PKGBUILD index 2f96e1e..cb52bed 100644 --- a/abs/core/fluxbox/PKGBUILD +++ b/abs/core/fluxbox/PKGBUILD @@ -1,35 +1,36 @@ -# $Id: PKGBUILD 110541 2011-02-19 21:51:38Z eric $ -# Maintainer: Eric Bélanger +# $Id: PKGBUILD 12779 2008-09-20 06:42:07Z eric $ +# Maintainer: Eric Belanger +# Contributor: John Proctor pkgname=fluxbox -pkgver=1.3.0 -pkgrel=2 +pkgver=1.1.1 +pkgrel=11 pkgdesc="A lightweight and highly-configurable window manager" arch=('i686' 'x86_64') url="http://www.fluxbox.org" license=('MIT') -depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'sh' 'imlib2' 'fribidi') -makedepends=('pkg-config') -optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities') +depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'bash' 'imlib2') +makedepends=('pkgconfig') options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ - fluxbox.desktop keys) + fluxbox.desktop keys fluxbox_fullscreen_focus.patch) build() { - cd "${srcdir}/${pkgname}-${pkgver}" + patch < fluxbox_fullscreen_focus.patch ${srcdir}/${pkgname}-${pkgver}/src/Window.cc || return 1 + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ - --enable-gnome --enable-xft --enable-xinerama \ - --enable-imlib2 --enable-nls - make + --enable-kde --enable-gnome \ + --enable-xft --enable-xinerama \ + --enable-imlib2 --enable-nls || return 1 + make || return 1 + make DESTDIR=${pkgdir} install || return 1 + # this is a fix to allow fluxbox to shutdown, but this can be changed by the user :-( + sed -i 's|^.*slit\.autoHide.*$|session.screen0.slit.autoHide: True|' ${pkgdir}/usr/share/fluxbox/init || return 1 + install -D -m644 ../fluxbox.desktop ${pkgdir}/etc/X11/sessions/fluxbox.desktop || return 1 + install -D -m644 ../keys ${pkgdir}/usr/share/$pkgname/keys || return 1 + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/COPYING || return 1 } - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 ../fluxbox.desktop "${pkgdir}/usr/share/xsessions/fluxbox.desktop" - install -D -m644 ../keys "${pkgdir}/usr/share/fluxbox/keys" - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} -md5sums=('817ffe734b8ebb1aa4b9c53ed208c23f' +md5sums=('fa9fa8fe9a44f86522de5754f8b285ca' 'eeae9c88a2526ac0bd8afcd9ce97f9ed' - 'bb9f812c559263b4bf1d722628a11ca8') + 'b2c3340710b15fb82603dd5893bfb92f' + 'd4b1195c78ac08ad41a678a424086420') diff --git a/abs/core/fluxbox/__changelog b/abs/core/fluxbox/__changelog index 5d2592e..f3f64c2 100644 --- a/abs/core/fluxbox/__changelog +++ b/abs/core/fluxbox/__changelog @@ -1 +1,2 @@ -2/22/11 - chw - Added keys file +2/22/11 - chw - Added keys file. +2/23/11 - chw - Added fullscreen patch. diff --git a/abs/core/fluxbox/fluxbox_fullscreen_focus.patch b/abs/core/fluxbox/fluxbox_fullscreen_focus.patch new file mode 100644 index 0000000..0e792dd --- /dev/null +++ b/abs/core/fluxbox/fluxbox_fullscreen_focus.patch @@ -0,0 +1,15 @@ +--- /dev/null ++++ b/abs/core-testing/fluxbox/fluxbox_fullscreen_focus.patch +@@ -0,0 +1,12 @@ ++--- src/Window.cc.orig 2010-04-12 16:45:00.750585365 -0500 +++++ src/Window.cc 2010-04-12 16:45:38.719755786 -0500 ++@@ -2042,8 +2042,7 @@ ++ FluxboxWindow *cur = FocusControl::focusedFbWindow(); ++ WinClient *client = FocusControl::focusedWindow(); ++ if (ret && cur && getRootTransientFor(&from) != getRootTransientFor(client)) ++- ret = !(cur->isFullscreen() && getOnHead() == cur->getOnHead()) && ++- !cur->isTyping(); +++ ret = !cur->isTyping(); ++ ++ if (!ret) ++ Fluxbox::instance()->attentionHandler().addAttention(from); diff --git a/abs/core/fluxbox/keys b/abs/core/fluxbox/keys index d0091eb..85b6fd1 100644 --- a/abs/core/fluxbox/keys +++ b/abs/core/fluxbox/keys @@ -1,3 +1,14 @@ +!mouse actions added by fluxbox-update_configs +OnTitlebar Mouse2 :StartTabbing + +!mouse actions added by fluxbox-update_configs +OnTitlebar Double Mouse1 :Shade +OnTitlebar Mouse3 :WindowMenu + +!mouse actions added by fluxbox-update_configs +OnWindow Mod1 Mouse1 :MacroCmd {Raise} {Focus} {StartMoving} +OnWindow Mod1 Mouse3 :MacroCmd {Raise} {Focus} {StartResizing BottomRight} + OnDesktop Mouse1 :HideMenus OnDesktop Mouse2 :WorkspaceMenu OnDesktop Mouse3 :RootMenu @@ -27,3 +38,4 @@ Mod1 3 :ExecCommand sudo sv restart mythbackend Mod1 h :ExecCommand MythVantage -h Mod1 Control u :ExecCommand /usr/LH/bin/unclutter-toggle.sh Mod1 Escape :GotoWindow {1} + -- cgit v0.12