diff options
author | David Shakaryan <omp@gentoo.org> | 2006-10-29 21:01:46 +0000 |
---|---|---|
committer | David Shakaryan <omp@gentoo.org> | 2006-10-29 21:01:46 +0000 |
commit | a6fc9b64826e97b87f6a1eb92f323d64e7cd57a1 (patch) | |
tree | cd6689cd9ba456f1a5f9bd10ef0bb86ccfc16fd7 /x11-wm/blackbox | |
parent | Remove older versions. (diff) | |
download | historical-a6fc9b64826e97b87f6a1eb92f323d64e7cd57a1.tar.gz historical-a6fc9b64826e97b87f6a1eb92f323d64e7cd57a1.tar.bz2 historical-a6fc9b64826e97b87f6a1eb92f323d64e7cd57a1.zip |
Remove older versions.
Package-Manager: portage-2.1.2_rc1-r1
Diffstat (limited to 'x11-wm/blackbox')
-rw-r--r-- | x11-wm/blackbox/Manifest | 57 | ||||
-rw-r--r-- | x11-wm/blackbox/blackbox-0.65.0-r3.ebuild | 37 | ||||
-rw-r--r-- | x11-wm/blackbox/blackbox-0.65.0-r4.ebuild | 38 | ||||
-rw-r--r-- | x11-wm/blackbox/files/blackbox-0.65.0-gcc34.patch | 15 | ||||
-rw-r--r-- | x11-wm/blackbox/files/blackbox-0.65.0-mousewheel_focus-workspace.patch | 378 | ||||
-rw-r--r-- | x11-wm/blackbox/files/blackbox-gcc.patch | 37 | ||||
-rw-r--r-- | x11-wm/blackbox/files/digest-blackbox-0.65.0-r3 | 1 | ||||
-rw-r--r-- | x11-wm/blackbox/files/digest-blackbox-0.65.0-r4 | 1 | ||||
-rw-r--r-- | x11-wm/blackbox/files/disable_rootcommand.patch | 11 |
9 files changed, 24 insertions, 551 deletions
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest index 255bf0933d7b..28f4bff10c08 100644 --- a/x11-wm/blackbox/Manifest +++ b/x11-wm/blackbox/Manifest @@ -1,39 +1,30 @@ -MD5 74dc7abcffcdd279eae7540ffe41deba ChangeLog 6950 -RMD160 170dbd2629bf0f39c053e75d1458fa1642729da9 ChangeLog 6950 -SHA256 88c61fee958d74c7903adfab15fa53905535bd3ee82b22e86bca36bd75e29ef8 ChangeLog 6950 -MD5 5102f22f6b5846e5cbfd3e2310c5e5be blackbox-0.65.0-r3.ebuild 1041 -RMD160 738df7eccf1c798cd43c8aa083a7d82bcfa32683 blackbox-0.65.0-r3.ebuild 1041 -SHA256 9cbf84e8e5471651ced39da319d99a22387b6644ec9f0ccf5c095f030add855a blackbox-0.65.0-r3.ebuild 1041 -MD5 287288130d5926f4a5d4e9b455056e0e blackbox-0.65.0-r4.ebuild 1089 -RMD160 99d5d76a96ba2c4fa06eac730928a5b4ccf13337 blackbox-0.65.0-r4.ebuild 1089 -SHA256 f0a603de8d61e8aeb97c373509bac1bd5ac08b4e24a3f4850defeded0082bfdd blackbox-0.65.0-r4.ebuild 1089 -MD5 d52898ab2d82afb72d68613692c517d6 blackbox-0.70.0.ebuild 1261 -RMD160 f282f22c2534e616494fe8496fe6d95b8eb5cad9 blackbox-0.70.0.ebuild 1261 -SHA256 9b70cee0c816a70d2b638e39b12a44bf84564c89889d89f51c1f8d37e303a812 blackbox-0.70.0.ebuild 1261 -MD5 35f17799af496f27b77f504b08cd9b21 files/blackbox-0.65.0-gcc34.patch 670 -RMD160 1a3d4e4aae9380db895b7c860b306e1b79b26b8b files/blackbox-0.65.0-gcc34.patch 670 -SHA256 c0e392856df6699973d53d6d019ab3decf89d1ff2fb6813a05d77624c4b29c5e files/blackbox-0.65.0-gcc34.patch 670 -MD5 7dc8c76692461cd5acad10bef25ed108 files/blackbox-0.65.0-mousewheel_focus-workspace.patch 12929 -RMD160 12571b64d7a4872a73481752d095981c4d1f84d7 files/blackbox-0.65.0-mousewheel_focus-workspace.patch 12929 -SHA256 08e652c4baed69ff03bcb12ace5d0f8c653b37efe49f08bf9fe8f0a42076382a files/blackbox-0.65.0-mousewheel_focus-workspace.patch 12929 -MD5 d3a006919ef6641fd6e9326d741acb49 files/blackbox-gcc.patch 1115 -RMD160 96efbfaa8298847f577c0f897f694b8d51ace94a files/blackbox-gcc.patch 1115 -SHA256 3586613c0089c668b65d7b635972418f60c4571ac8603f567c6f1341ba1a4f0c files/blackbox-gcc.patch 1115 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX blackbox.desktop 143 RMD160 946479197e095569f74e0398ce5a511f7d8dcb5a SHA1 7df18e18bf5df68d920028a616eaeb36466e30f3 SHA256 ccf8efedd257b097f5f3c9b46354a4f2205fe655b5b66976fb11e47c040fe418 MD5 144d82741971ed0b95a2bbb6c8f11dd5 files/blackbox.desktop 143 RMD160 946479197e095569f74e0398ce5a511f7d8dcb5a files/blackbox.desktop 143 SHA256 ccf8efedd257b097f5f3c9b46354a4f2205fe655b5b66976fb11e47c040fe418 files/blackbox.desktop 143 -MD5 366397f56a481c78e646748c12bda976 files/digest-blackbox-0.65.0-r3 67 -RMD160 4aa33100547501df9cd65ca56340d6cb2adfdfec files/digest-blackbox-0.65.0-r3 67 -SHA256 c46064b88f620c19e8aef991136a692b1f7e0c6611d25aa0acec9cdac3a3aaf2 files/digest-blackbox-0.65.0-r3 67 -MD5 366397f56a481c78e646748c12bda976 files/digest-blackbox-0.65.0-r4 67 -RMD160 4aa33100547501df9cd65ca56340d6cb2adfdfec files/digest-blackbox-0.65.0-r4 67 -SHA256 c46064b88f620c19e8aef991136a692b1f7e0c6611d25aa0acec9cdac3a3aaf2 files/digest-blackbox-0.65.0-r4 67 -MD5 c57a8dbbd253deec063d772021065169 files/digest-blackbox-0.70.0 68 -RMD160 9ec765882e41533fe814592a92cf06c17322d472 files/digest-blackbox-0.70.0 68 -SHA256 0fe051a76a2bfa0bea83f51a09eb515b204501c713fa3cd8421cdbc615a6d0a7 files/digest-blackbox-0.70.0 68 -MD5 099195818052833a934a42dd8f434453 files/disable_rootcommand.patch 395 -RMD160 14d320f8be3251446aafa9077446c86b1f36c72a files/disable_rootcommand.patch 395 -SHA256 dc701cd6b4f856f781c84dcb737f6357d5d46bbc6113f7d20f4c4e68a17d06a0 files/disable_rootcommand.patch 395 +DIST blackbox-0.70.0.tar.bz2 433858 RMD160 e0e2ba5b6090033fbe6930a7507e1fce7aa9b2e5 SHA1 ff0be1957429ee678b4dbc4333a613a437007a43 SHA256 188c1f8ac1439e042583c211dcd3b4e81025dc690c465e3e57f0a43d02e8e8ca +EBUILD blackbox-0.70.0.ebuild 1261 RMD160 f282f22c2534e616494fe8496fe6d95b8eb5cad9 SHA1 0f59c194594fba73601b5a2a47999e331cd54804 SHA256 9b70cee0c816a70d2b638e39b12a44bf84564c89889d89f51c1f8d37e303a812 +MD5 d52898ab2d82afb72d68613692c517d6 blackbox-0.70.0.ebuild 1261 +RMD160 f282f22c2534e616494fe8496fe6d95b8eb5cad9 blackbox-0.70.0.ebuild 1261 +SHA256 9b70cee0c816a70d2b638e39b12a44bf84564c89889d89f51c1f8d37e303a812 blackbox-0.70.0.ebuild 1261 +MISC ChangeLog 7238 RMD160 67524c9c79bfe28d07fc7c30d176d87ffedf618c SHA1 ee4fb86893b1027f47c14b80237b1930740aa154 SHA256 07873056f7c16e6a7e5a9b97dc77baec9573d257dea294b0c965ac4e3e98483c +MD5 b9746f0d3751274190345dfe64b2a8d3 ChangeLog 7238 +RMD160 67524c9c79bfe28d07fc7c30d176d87ffedf618c ChangeLog 7238 +SHA256 07873056f7c16e6a7e5a9b97dc77baec9573d257dea294b0c965ac4e3e98483c ChangeLog 7238 +MISC metadata.xml 409 RMD160 50754d372117d4bc0f47cb8225a6d65332b3e620 SHA1 bc97b3233bccfb0c24b03b6ae00b259296540fb1 SHA256 5e55d79e4503507d195b6cef8b22aacdd0475b4fce1efc18367456d479cdc342 MD5 f08ee46f534b31a6aeb54f5a129e3842 metadata.xml 409 RMD160 50754d372117d4bc0f47cb8225a6d65332b3e620 metadata.xml 409 SHA256 5e55d79e4503507d195b6cef8b22aacdd0475b4fce1efc18367456d479cdc342 metadata.xml 409 +MD5 8d629cbfb647e9ff46ff435b7388aa33 files/digest-blackbox-0.70.0 250 +RMD160 6ff30ff2d951b258af9c70b5e009c229cb2b138f files/digest-blackbox-0.70.0 250 +SHA256 e2df28caa5a1ab063fbb654a8a678a5993fc2b72904df3f2480be6832f98ab5d files/digest-blackbox-0.70.0 250 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFRRa4vSApE0uP4UsRAotbAJ9GRyJD3T0g+HBVFd5AlhZRbulkmACgjUio +glVPpH3cMOTs4utnVkbEZQk= +=vTsI +-----END PGP SIGNATURE----- diff --git a/x11-wm/blackbox/blackbox-0.65.0-r3.ebuild b/x11-wm/blackbox/blackbox-0.65.0-r3.ebuild deleted file mode 100644 index 03d0751388ec..000000000000 --- a/x11-wm/blackbox/blackbox-0.65.0-r3.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.65.0-r3.ebuild,v 1.12 2005/02/06 18:50:49 corsair Exp $ - -IUSE="" - -inherit commonbox eutils - -DESCRIPTION="A small, fast, full-featured window manager for X - with mousewheel patch" -SRC_URI="mirror://sourceforge/blackboxwm/${P}.tar.gz" -HOMEPAGE="http://blackboxwm.sf.net/" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="x86 ppc sparc hppa alpha ia64 ~amd64" -MYCONF="--disable-nls" - -mydoc="AUTHORS LICENSE README ChangeLog* TODO* data/README*" - -src_unpack() { - unpack ${P}.tar.gz - epatch ${FILESDIR}/blackbox-0.65.0-mousewheel_focus-workspace.patch - epatch ${FILESDIR}/blackbox-gcc.patch - cd ${S} - epatch ${FILESDIR}/disable_rootcommand.patch - cd ${S}/data - mv README README.data -} - -pkg_postinst() { - ewarn - ewarn "Please note that NLS support is now *disabled*, as it is" - ewarn "horribly broken." - ewarn "RootCommand is now DISABLED to close a large" - ewarn "security hole." - ewarn -} diff --git a/x11-wm/blackbox/blackbox-0.65.0-r4.ebuild b/x11-wm/blackbox/blackbox-0.65.0-r4.ebuild deleted file mode 100644 index 3d048ee92d0e..000000000000 --- a/x11-wm/blackbox/blackbox-0.65.0-r4.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.65.0-r4.ebuild,v 1.2 2005/02/06 18:50:49 corsair Exp $ - -IUSE="" - -inherit commonbox eutils - -DESCRIPTION="A small, fast, full-featured window manager for X - with mousewheel patch" -SRC_URI="mirror://sourceforge/blackboxwm/${P}.tar.gz" -HOMEPAGE="http://blackboxwm.sf.net/" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86" -MYCONF="--disable-nls" - -mydoc="AUTHORS LICENSE README ChangeLog* TODO* data/README*" - -src_unpack() { - unpack ${P}.tar.gz - epatch ${FILESDIR}/blackbox-0.65.0-mousewheel_focus-workspace.patch - epatch ${FILESDIR}/blackbox-gcc.patch - cd ${S} - epatch ${FILESDIR}/disable_rootcommand.patch - epatch ${FILESDIR}/${P}-gcc34.patch - cd ${S}/data - mv README README.data -} - -pkg_postinst() { - ewarn - ewarn "Please note that NLS support is now *disabled*, as it is" - ewarn "horribly broken." - ewarn "RootCommand is now DISABLED to close a large" - ewarn "security hole." - ewarn -} diff --git a/x11-wm/blackbox/files/blackbox-0.65.0-gcc34.patch b/x11-wm/blackbox/files/blackbox-0.65.0-gcc34.patch deleted file mode 100644 index b885a20df0d0..000000000000 --- a/x11-wm/blackbox/files/blackbox-0.65.0-gcc34.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/Timer.hh.orig 2002-08-23 14:50:54.000000000 -0400 -+++ src/Timer.hh 2004-04-11 01:23:27.000000000 -0400 -@@ -98,9 +98,10 @@ - ~_timer_queue(void) {} - - void release(const _Tp& value) { -- c.erase(std::remove(c.begin(), c.end(), value), c.end()); -+ _Base::c.erase(std::remove(_Base::c.begin(), _Base::c.end(), value), -+ _Base::c.end()); - // after removing the item we need to make the heap again -- std::make_heap(c.begin(), c.end(), comp); -+ std::make_heap(_Base::c.begin(), _Base::c.end(), _Base::comp); - } - bool empty(void) const { return _Base::empty(); } - size_t size(void) const { return _Base::size(); } diff --git a/x11-wm/blackbox/files/blackbox-0.65.0-mousewheel_focus-workspace.patch b/x11-wm/blackbox/files/blackbox-0.65.0-mousewheel_focus-workspace.patch deleted file mode 100644 index 842c60fd6d01..000000000000 --- a/x11-wm/blackbox/files/blackbox-0.65.0-mousewheel_focus-workspace.patch +++ /dev/null @@ -1,378 +0,0 @@ -diff -urN blackbox-0.65.0/nls/C/Configmenu.m blackbox-0.65.0-wheel/nls/C/Configmenu.m ---- blackbox-0.65.0/nls/C/Configmenu.m 2002-07-17 15:50:57.000000000 -0500 -+++ blackbox-0.65.0-wheel/nls/C/Configmenu.m 2002-09-23 17:51:52.000000000 -0500 -@@ -4,6 +4,14 @@ - # Config Options - $ #FocusModel - # Focus Model -+$ #MouseWheel -+# Mouse Wheel -+$ #ChangesFocus -+# Changes Focus -+$ #ChangesWorkspace -+# Changes Workspace -+$ #ReverseScroll -+# Reverse Scroll - $ #WindowPlacement - # Window Placement - $ #ImageDithering -diff -urN blackbox-0.65.0/src/Configmenu.cc blackbox-0.65.0-wheel/src/Configmenu.cc ---- blackbox-0.65.0/src/Configmenu.cc 2002-08-01 14:35:19.000000000 -0500 -+++ blackbox-0.65.0-wheel/src/Configmenu.cc 2002-09-25 00:46:25.000000000 -0500 -@@ -37,10 +37,13 @@ - setInternalMenu(); - - focusmenu = new Focusmenu(this); -+ wheelmenu = new Wheelmenu(this); - placementmenu = new Placementmenu(this); -- -+ - insert(i18n(ConfigmenuSet, ConfigmenuFocusModel, - "Focus Model"), focusmenu); -+ insert(i18n(ConfigmenuSet, ConfigmenuMouseWheel, -+ "Mouse Wheel"), wheelmenu); - insert(i18n(ConfigmenuSet, ConfigmenuWindowPlacement, - "Window Placement"), placementmenu); - insert(i18n(ConfigmenuSet, ConfigmenuImageDithering, -@@ -57,17 +60,18 @@ - "Disable Bindings with Scroll Lock"), 6); - update(); - -- setItemSelected(2, getScreen()->getImageControl()->doDither()); -- setItemSelected(3, getScreen()->doOpaqueMove()); -- setItemSelected(4, getScreen()->doFullMax()); -- setItemSelected(5, getScreen()->doFocusNew()); -- setItemSelected(6, getScreen()->doFocusLast()); -- setItemSelected(7, getScreen()->allowScrollLock()); -+ setItemSelected(3, getScreen()->getImageControl()->doDither()); -+ setItemSelected(4, getScreen()->doOpaqueMove()); -+ setItemSelected(5, getScreen()->doFullMax()); -+ setItemSelected(6, getScreen()->doFocusNew()); -+ setItemSelected(7, getScreen()->doFocusLast()); -+ setItemSelected(8, getScreen()->allowScrollLock()); - } - - - Configmenu::~Configmenu(void) { - delete focusmenu; -+ delete wheelmenu; - delete placementmenu; - } - -@@ -131,6 +135,7 @@ - - void Configmenu::reconfigure(void) { - focusmenu->reconfigure(); -+ wheelmenu->reconfigure(); - placementmenu->reconfigure(); - - Basemenu::reconfigure(); -@@ -194,6 +199,53 @@ - } - - -+Configmenu::Wheelmenu::Wheelmenu(Configmenu *cm) : Basemenu(cm->getScreen()) { -+ setLabel(i18n(ConfigmenuSet, ConfigmenuMouseWheel, "Mouse Wheel")); -+ setInternalMenu(); -+ -+ insert(i18n(ConfigmenuSet, ConfigmenuChangesFocus, "Changes Focus"), 1); -+ insert(i18n(ConfigmenuSet, ConfigmenuChangesWorkspace, "Changes Workspace"), 2); -+ insert(i18n(ConfigmenuSet, ConfigmenuReverseScroll, "Reverse Scroll"), 3); -+ update(); -+ -+ setItemSelected(0, getScreen()->isChangesFocus()); -+ setItemSelected(1, ! getScreen()->isChangesFocus()); -+ setItemSelected(2, getScreen()->isReverseScroll()); -+} -+ -+ -+void Configmenu::Wheelmenu::itemSelected(int button, unsigned int index) { -+ if (button != 1) -+ return; -+ -+ BasemenuItem *item = find(index); -+ -+ if (!item->function()) -+ return; -+ -+ switch (item->function()) { -+ case 1: // mouse wheel changes focus -+ getScreen()->toggleMouseWheel(BScreen::ChangesFocus); -+ break; -+ -+ case 2: // mouse wheel changes workspace -+ getScreen()->toggleMouseWheel(BScreen::ChangesWorkspace); -+ break; -+ -+ case 3: // reverse scroll direction -+ if (getScreen()->isReverseScroll()) -+ getScreen()->toggleScroll(BScreen::Normal); -+ else -+ getScreen()->toggleScroll(BScreen::Reverse); -+ break; -+ } -+ -+ setItemSelected(0, getScreen()->isChangesFocus()); -+ setItemSelected(1, ! getScreen()->isChangesFocus()); -+ setItemSelected(2, getScreen()->isReverseScroll()); -+} -+ -+ - Configmenu::Placementmenu::Placementmenu(Configmenu *cm): - Basemenu(cm->getScreen()) { - setLabel(i18n(ConfigmenuSet, ConfigmenuWindowPlacement, "Window Placement")); -diff -urN blackbox-0.65.0/src/Configmenu.hh blackbox-0.65.0-wheel/src/Configmenu.hh ---- blackbox-0.65.0/src/Configmenu.hh 2002-08-01 14:36:21.000000000 -0500 -+++ blackbox-0.65.0-wheel/src/Configmenu.hh 2002-09-23 03:08:31.000000000 -0500 -@@ -45,6 +45,18 @@ - Focusmenu(Configmenu *cm); - }; - -+ class Wheelmenu : public Basemenu { -+ private: -+ Wheelmenu(const Wheelmenu&); -+ Wheelmenu& operator=(const Wheelmenu&); -+ -+ protected: -+ virtual void itemSelected(int button, unsigned int index); -+ -+ public: -+ Wheelmenu(Configmenu *cm); -+ }; -+ - class Placementmenu : public Basemenu { - private: - Placementmenu(const Placementmenu&); -@@ -59,9 +71,11 @@ - }; - - Focusmenu *focusmenu; -+ Wheelmenu *wheelmenu; - Placementmenu *placementmenu; - - friend class Focusmenu; -+ friend class Wheelmenu; - friend class Placementmenu; - - Configmenu(const Configmenu&); -@@ -75,6 +89,7 @@ - virtual ~Configmenu(void); - - inline Basemenu *getFocusmenu(void) { return focusmenu; } -+ inline Basemenu *getWheelmenu(void) { return wheelmenu; } - inline Basemenu *getPlacementmenu(void) { return placementmenu; } - - void reconfigure(void); -diff -urN blackbox-0.65.0/src/Screen.cc blackbox-0.65.0-wheel/src/Screen.cc ---- blackbox-0.65.0/src/Screen.cc 2002-09-04 12:15:58.000000000 -0500 -+++ blackbox-0.65.0-wheel/src/Screen.cc 2002-09-25 02:49:54.000000000 -0500 -@@ -997,6 +997,7 @@ - *(session_stack + i++) = workspacemenu->getWindowID(); - - *(session_stack + i++) = configmenu->getFocusmenu()->getWindowID(); -+ *(session_stack + i++) = configmenu->getWheelmenu()->getWindowID(); - *(session_stack + i++) = configmenu->getPlacementmenu()->getWindowID(); - *(session_stack + i++) = configmenu->getWindowID(); - -@@ -1120,7 +1121,7 @@ - focused->getScreen()->getScreenNumber() == getScreenNumber() && - current_workspace->getCount() > 1) { - do { -- next = current_workspace->getNextWindowInList(next); -+ next = current_workspace->getPrevWindowInList(next); - } while(next != focused && ! next->setInputFocus()); - - if (next != focused) -@@ -1741,6 +1742,46 @@ - blackbox->checkMenu(); - rootmenu->show(); - } -+ -+ //mouse wheel up -+ } else if (xbutton->button == 4) { -+ if (this->isReverseScroll()) { -+ if (this->isChangesFocus()) -+ this->nextFocus(); -+ else -+ if (getCurrentWorkspaceID() >= getWorkspaceCount() - 1) -+ changeWorkspaceID(0); -+ else -+ changeWorkspaceID(getCurrentWorkspaceID() + 1); -+ } else { -+ if (this->isChangesFocus()) -+ this->prevFocus(); -+ else -+ if (getCurrentWorkspaceID() == 0) -+ changeWorkspaceID(getWorkspaceCount() - 1); -+ else -+ changeWorkspaceID(getCurrentWorkspaceID() - 1); -+ } -+ -+ // mouse wheel down -+ } else if (xbutton->button == 5) { -+ if (this->isReverseScroll()) { -+ if (this->isChangesFocus()) -+ this->prevFocus(); -+ else -+ if (getCurrentWorkspaceID() == 0) -+ changeWorkspaceID(getWorkspaceCount() - 1); -+ else -+ changeWorkspaceID(getCurrentWorkspaceID() - 1); -+ } else { -+ if (this->isChangesFocus()) -+ this->nextFocus(); -+ else -+ if (getCurrentWorkspaceID() >= getWorkspaceCount() - 1) -+ changeWorkspaceID(0); -+ else -+ changeWorkspaceID(getCurrentWorkspaceID() + 1); -+ } - } - } - -@@ -1762,6 +1803,26 @@ - } - - -+void BScreen::toggleMouseWheel(MouseWheel model) { -+ -+ if (model == ChangesFocus) { -+ saveChangesFocus(True); -+ } else { -+ saveChangesFocus(False); -+ } -+} -+ -+ -+void BScreen::toggleScroll(Scroll model) { -+ -+ if (model == Normal) { -+ saveReverseScroll(False); -+ } else { -+ saveReverseScroll(True); -+ } -+} -+ -+ - BTexture BScreen::readDatabaseTexture(const string &rname, - const string &rclass, - const string &default_color) { -diff -urN blackbox-0.65.0/src/Screen.hh blackbox-0.65.0-wheel/src/Screen.hh ---- blackbox-0.65.0/src/Screen.hh 2002-09-04 12:15:26.000000000 -0500 -+++ blackbox-0.65.0-wheel/src/Screen.hh 2002-09-25 00:52:15.000000000 -0500 -@@ -149,7 +149,8 @@ - - bool toolbar_on_top, toolbar_auto_hide, sloppy_focus, auto_raise, - auto_edge_balance, image_dither, ordered_dither, opaque_move, full_max, -- focus_new, focus_last, click_raise, allow_scroll_lock; -+ focus_new, focus_last, click_raise, allow_scroll_lock, changes_focus, -+ reverse_scroll; - BColor border_color; - XrmDatabase stylerc; - -@@ -200,6 +201,8 @@ - WindowShade, WindowIconify, WindowMaximize, WindowClose, WindowRaise, - WindowLower, WindowStick, WindowKill, SetStyle }; - enum FocusModel { SloppyFocus, ClickToFocus }; -+ enum MouseWheel { ChangesFocus, ChangesWorkspace }; -+ enum Scroll { Normal, Reverse }; - - BScreen(Blackbox *bb, unsigned int scrn); - ~BScreen(void); -@@ -210,6 +213,10 @@ - { return resource.toolbar_auto_hide; } - inline bool isSloppyFocus(void) const - { return resource.sloppy_focus; } -+ inline bool isChangesFocus(void) const -+ { return resource.changes_focus; } -+ inline bool isReverseScroll(void) const -+ { return resource.reverse_scroll; } - inline bool isRootColormapInstalled(void) const - { return root_colormap_installed; } - inline bool doAutoRaise(void) const { return resource.auto_raise; } -@@ -284,6 +291,8 @@ - - inline void setRootColormapInstalled(bool r) { root_colormap_installed = r; } - inline void saveSloppyFocus(bool s) { resource.sloppy_focus = s; } -+ inline void saveChangesFocus(bool s) { resource.changes_focus = s; } -+ inline void saveReverseScroll(bool s) { resource.reverse_scroll = s; } - inline void saveAutoRaise(bool a) { resource.auto_raise = a; } - inline void saveClickRaise(bool c) { resource.click_raise = c; } - inline void saveWorkspaces(unsigned int w) { resource.workspaces = w; } -@@ -352,6 +361,8 @@ - void raiseFocus(void) const; - void reconfigure(void); - void toggleFocusModel(FocusModel model); -+ void toggleMouseWheel(MouseWheel model); -+ void toggleScroll(Scroll model); - void rereadMenu(void); - void shutdown(void); - void showPosition(int x, int y); -diff -urN blackbox-0.65.0/src/Window.cc blackbox-0.65.0-wheel/src/Window.cc ---- blackbox-0.65.0/src/Window.cc 2002-09-17 10:23:35.000000000 -0500 -+++ blackbox-0.65.0-wheel/src/Window.cc 2002-09-25 02:54:17.000000000 -0500 -@@ -2663,6 +2663,12 @@ - XRaiseWindow(blackbox->getXDisplay(), - windowmenu->getSendToMenu()->getWindowID()); - } -+ } else if (be->button == 4) { //mouse wheel shade -+ if ((be->window == frame.label || be->window == frame.title) && ! flags.shaded) -+ shade(); -+ } else if (be->button == 5) { //mouse wheel unshade -+ if ((be->window == frame.label || be->window == frame.title) && flags.shaded) -+ shade(); - } - } - -diff -urN blackbox-0.65.0/src/blackbox.cc blackbox-0.65.0-wheel/src/blackbox.cc ---- blackbox-0.65.0/src/blackbox.cc 2002-08-25 05:05:45.000000000 -0500 -+++ blackbox-0.65.0-wheel/src/blackbox.cc 2002-09-24 18:16:57.000000000 -0500 -@@ -1068,6 +1068,20 @@ - fmodel.c_str()); - XrmPutLineResource(&new_blackboxrc, rc_string); - -+ string mwheel; -+ if (screen->isChangesFocus()) { -+ mwheel = "ChangesFocus"; -+ } else { -+ mwheel = "ChangesWorkspace"; -+ } -+ sprintf(rc_string, "session.screen%d.mouseWheel: %s", screen_number, -+ mwheel.c_str()); -+ XrmPutLineResource(&new_blackboxrc, rc_string); -+ -+ sprintf(rc_string, "session.screen%d.reverseScroll: %s", screen_number, -+ ((screen->isReverseScroll()) ? "True" : "False")); -+ XrmPutLineResource(&new_blackboxrc, rc_string); -+ - sprintf(rc_string, "session.screen%d.workspaces: %d", screen_number, - screen->getWorkspaceCount()); - XrmPutLineResource(&new_blackboxrc, rc_string); -@@ -1380,6 +1394,27 @@ - } - } - -+ sprintf(name_lookup, "session.screen%d.mouseWheel", screen_number); -+ sprintf(class_lookup, "Session.Screen%d.MouseWheel", screen_number); -+ screen->saveChangesFocus(True); -+ if (XrmGetResource(database, name_lookup, class_lookup, &value_type, -+ &value)) { -+ string mwheel = value.addr; -+ -+ if (mwheel.find("ChangesWorkspace") != string::npos) { -+ screen->saveChangesFocus(False); -+ } -+ } -+ -+ sprintf(name_lookup, "session.screen%d.reverseScroll", screen_number); -+ sprintf(class_lookup, "Session.Screen%d.ReverseScroll", screen_number); -+ screen->saveReverseScroll(False); -+ if (XrmGetResource(database, name_lookup, class_lookup, &value_type, -+ &value) && -+ ! strncasecmp(value.addr, "true", value.size)) { -+ screen->saveReverseScroll(True); -+ } -+ - sprintf(name_lookup, "session.screen%d.windowPlacement", screen_number); - sprintf(class_lookup, "Session.Screen%d.WindowPlacement", screen_number); - screen->savePlacementPolicy(BScreen::RowSmartPlacement); diff --git a/x11-wm/blackbox/files/blackbox-gcc.patch b/x11-wm/blackbox/files/blackbox-gcc.patch deleted file mode 100644 index b1f56216e220..000000000000 --- a/x11-wm/blackbox/files/blackbox-gcc.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- blackbox-0.65.0/src/Window.cc 2002-09-17 11:23:35.000000000 -0400 -+++ Window.cc 2003-10-09 13:09:22.993741976 -0400 -@@ -55,6 +55,7 @@ - #include "Window.hh" - #include "Windowmenu.hh" - #include "Workspace.hh" -+#include <assert.h> - - - /* -@@ -2050,7 +2051,7 @@ - if (decorations & Decor_Titlebar) { - if (functions & Func_Close) // close button is controlled by function - decorations |= Decor_Close; // not decor type -- } else { -+ } else { - if (flags.shaded) // we can not be shaded if we lack a titlebar - shade(); - } -@@ -2986,7 +2987,7 @@ - // do not leave a shaded window as an icon unless it was an icon - if (flags.shaded && ! flags.iconic) - current_state = NormalState; -- -+ - setState(current_state); - - restoreGravity(client.rect); -@@ -3099,7 +3100,7 @@ - if (decorations & Decor_Titlebar) { - if (functions & Func_Close) // close button is controlled by function - decorations |= Decor_Close; // not decor type -- } else { -+ } else { - if (flags.shaded) // we can not be shaded if we lack a titlebar - shade(); - } diff --git a/x11-wm/blackbox/files/digest-blackbox-0.65.0-r3 b/x11-wm/blackbox/files/digest-blackbox-0.65.0-r3 deleted file mode 100644 index ac23630d0dc1..000000000000 --- a/x11-wm/blackbox/files/digest-blackbox-0.65.0-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 08560fa287c68d65fbe894696d04deaf blackbox-0.65.0.tar.gz 292950 diff --git a/x11-wm/blackbox/files/digest-blackbox-0.65.0-r4 b/x11-wm/blackbox/files/digest-blackbox-0.65.0-r4 deleted file mode 100644 index ac23630d0dc1..000000000000 --- a/x11-wm/blackbox/files/digest-blackbox-0.65.0-r4 +++ /dev/null @@ -1 +0,0 @@ -MD5 08560fa287c68d65fbe894696d04deaf blackbox-0.65.0.tar.gz 292950 diff --git a/x11-wm/blackbox/files/disable_rootcommand.patch b/x11-wm/blackbox/files/disable_rootcommand.patch deleted file mode 100644 index a5131c3f8ee5..000000000000 --- a/x11-wm/blackbox/files/disable_rootcommand.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- blackbox-0.65.0-old/src/Screen.cc 2002-09-04 13:15:58.000000000 -0400 -+++ Screen.cc.new 2003-12-07 19:22:01.465576952 -0500 -@@ -735,7 +735,7 @@ - - if (XrmGetResource(resource.stylerc, "rootCommand", "RootCommand", - &value_type, &value)) { -- bexec(value.addr, displayString()); -+ //bexec(value.addr, displayString()); - } - - XrmDestroyDatabase(resource.stylerc); |