From: Michael Sterrett Date: Tue, 20 Mar 2007 04:10:31 +0000 (+0000) Subject: remove old crufty version X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=987734fcbb17ab0aecf78f09d6e8d29e37fc32e6;p=gentoo.git remove old crufty version Package-Manager: portage-2.1.2.2 --- diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog index 516ce9d9596b..106ec1db858b 100644 --- a/x11-wm/windowmaker/ChangeLog +++ b/x11-wm/windowmaker/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-wm/windowmaker # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.77 2007/02/21 22:43:38 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.78 2007/03/20 04:10:31 mr_bones_ Exp $ + + 20 Mar 2007; Michael Sterrett + -files/0.80.2/wlist.patch, + -files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch, + -files/0.80.2/gtk2flickerfix.patch, -files/0.80.2/wmfpo.patch, + -files/0.80.2/trance.patch.WM-0.80.2.diff, + -files/0.80.2/xinerama.patch.bz2, -windowmaker-0.80.2-r4.ebuild: + remove old crufty version 21 Feb 2007; Markus Ullmann ChangeLog: Redigest for Manifest2 diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest index e71679a0746d..6eaad41f4ba0 100644 --- a/x11-wm/windowmaker/Manifest +++ b/x11-wm/windowmaker/Manifest @@ -1,30 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX 0.80.2/gtk2flickerfix.patch 1969 RMD160 a21c185c4d05ba166588e94ad064c87cb7de63eb SHA1 12fbaf19d5a483729300399669e8012028903eb3 SHA256 50c6f7cb9691fd129364154f58f7f0eb4b9e9c80d48eb809fc8d1dd83ace08fe -MD5 c8eb68627dc7b53b10143626018ff597 files/0.80.2/gtk2flickerfix.patch 1969 -RMD160 a21c185c4d05ba166588e94ad064c87cb7de63eb files/0.80.2/gtk2flickerfix.patch 1969 -SHA256 50c6f7cb9691fd129364154f58f7f0eb4b9e9c80d48eb809fc8d1dd83ace08fe files/0.80.2/gtk2flickerfix.patch 1969 -AUX 0.80.2/trance.patch.WM-0.80.2.diff 9738 RMD160 7d8e47b0e533582430520b0dfaf0d007bad24cbb SHA1 5ad7e67db005d6076fef48ef56d8dfc829473593 SHA256 2959144bdd67a0a5fe838bbf59f68090f03e706f364919e5a841ea627672238b -MD5 a42a33a349ca84fb6e2cc5fdbd627b99 files/0.80.2/trance.patch.WM-0.80.2.diff 9738 -RMD160 7d8e47b0e533582430520b0dfaf0d007bad24cbb files/0.80.2/trance.patch.WM-0.80.2.diff 9738 -SHA256 2959144bdd67a0a5fe838bbf59f68090f03e706f364919e5a841ea627672238b files/0.80.2/trance.patch.WM-0.80.2.diff 9738 -AUX 0.80.2/windowmaker-0.80.2-r1-gentoo.patch 4331 RMD160 f336db370a026583f8e081301bb65d6e2b5f9db4 SHA1 b82fef46c47c91aaba89050f25db12f9f42dc5e2 SHA256 f7f278216747494d240e5b8fbf0e32502f99f079dafeaf8beb6db11d7e5365cc -MD5 9a5c9f1b2b44a678526f0fd71b2cf51d files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch 4331 -RMD160 f336db370a026583f8e081301bb65d6e2b5f9db4 files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch 4331 -SHA256 f7f278216747494d240e5b8fbf0e32502f99f079dafeaf8beb6db11d7e5365cc files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch 4331 -AUX 0.80.2/wlist.patch 2776 RMD160 815f5fc8d7a7716fa0806f332bd528bb87daa202 SHA1 cd985a4a8969088121a7aed197bf9500975335c6 SHA256 abe9e7f537b8aff5736e918a839e61ec039c65ebe68a4f2be9c664d07edfff67 -MD5 a062e261bd5aaca39bc17be01f07f1b6 files/0.80.2/wlist.patch 2776 -RMD160 815f5fc8d7a7716fa0806f332bd528bb87daa202 files/0.80.2/wlist.patch 2776 -SHA256 abe9e7f537b8aff5736e918a839e61ec039c65ebe68a4f2be9c664d07edfff67 files/0.80.2/wlist.patch 2776 -AUX 0.80.2/wmfpo.patch 7696 RMD160 0c07dc0f3069c1bc70425c9a83d0bb2c254fb45e SHA1 14e16c2d3cbd72a294956949375ae969067493e0 SHA256 63f26a8cd7f1ce9273a12215dd1af1a9da397438e95edfaf48e988ca337c3d4f -MD5 37aefa1e6f793583e8fa7890231d1721 files/0.80.2/wmfpo.patch 7696 -RMD160 0c07dc0f3069c1bc70425c9a83d0bb2c254fb45e files/0.80.2/wmfpo.patch 7696 -SHA256 63f26a8cd7f1ce9273a12215dd1af1a9da397438e95edfaf48e988ca337c3d4f files/0.80.2/wmfpo.patch 7696 -AUX 0.80.2/xinerama.patch.bz2 5908 RMD160 4b4de1389ca1b4a282a4f94a8eafca8dd01ac995 SHA1 3de95043598aa96568a039ceb4c9007cf736b108 SHA256 f2a0d7a852aa1ebd2003624e7f678d8ff4f431ba1644906635ffd38e7fa73c5b -MD5 e451189d91551534b18988709274b73b files/0.80.2/xinerama.patch.bz2 5908 -RMD160 4b4de1389ca1b4a282a4f94a8eafca8dd01ac995 files/0.80.2/xinerama.patch.bz2 5908 -SHA256 f2a0d7a852aa1ebd2003624e7f678d8ff4f431ba1644906635ffd38e7fa73c5b files/0.80.2/xinerama.patch.bz2 5908 AUX 0.91.0/64bit+endian-fixes-0.9x.patch 4831 RMD160 3faeee2ee8c812808bd88a95cdce395ca84843e9 SHA1 a599063bc73a7cb5bdadeba7c112fff1271746ce SHA256 f39eff1216a2207f72ebd95785759627e7cf8fc723bafce987633b85dec616c0 MD5 c53a14e14931247288ba66cb017a9f42 files/0.91.0/64bit+endian-fixes-0.9x.patch 4831 RMD160 3faeee2ee8c812808bd88a95cdce395ca84843e9 files/0.91.0/64bit+endian-fixes-0.9x.patch 4831 @@ -61,14 +34,9 @@ AUX wmaker.desktop 221 RMD160 501ba6451f7e756cc3d07682d728bcd6fe55366d SHA1 acd9 MD5 f70c1e1b121cfc32dbd802678f3b111f files/wmaker.desktop 221 RMD160 501ba6451f7e756cc3d07682d728bcd6fe55366d files/wmaker.desktop 221 SHA256 40359d3c61117f0dbc5eb547e4c369982427e8bc3174c95002d34eb30f9a4a84 files/wmaker.desktop 221 -DIST WindowMaker-0.80.2.tar.gz 2532831 RMD160 3a7ec7c98c07a8b8b103d9f1d21d766849cee714 SHA1 8d5d46477b60f3592d1216ba741c5e18bfdb7dce SHA256 932eb1fa3b97110b42a48e9f2ae148120c30e7c00d34c7b1d87c4b11d6cb0615 DIST WindowMaker-0.91.0.tar.gz 2742380 RMD160 f593893d9aeba85fec42216f5f86a8c7c79db53e SHA1 ecec6b434e60bfdbf2f4771b761adcdbd4e73f65 SHA256 464d91995f9b3f00ca266a06e785c06bb834dfae795fdff804922cf44a838d30 DIST WindowMaker-0.92.0.tar.gz 2758524 RMD160 b8bebed6a34696625ae0ae7c0ebcfdfc0ba09cdd SHA1 6f545356acde7e9bf4c11345ac1359b451a9d1bc SHA256 9edaa8d9ee6e6beb06f4c391c0aec5cd0e5b5494456cae2cdcfd49656177afc6 DIST WindowMaker-extra-0.1.tar.gz 238018 RMD160 94334c2c12d20a8fd0cd2a70e54cd3689f043038 SHA1 80f34cb3af705ec0f79d727b82cef28ee50fc4e7 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 -EBUILD windowmaker-0.80.2-r4.ebuild 4113 RMD160 0a7369813efeb0d3a804b8b1e53c10d870f15fd9 SHA1 1b95303fdf27e0525ac9faa673770c2e9aca50bd SHA256 26765581d5f7e8dc25db657ed710b176b3cc84c37207c23f613de70ddc1a31e2 -MD5 ec3fc74af8e22173e100c23a76daa7ec windowmaker-0.80.2-r4.ebuild 4113 -RMD160 0a7369813efeb0d3a804b8b1e53c10d870f15fd9 windowmaker-0.80.2-r4.ebuild 4113 -SHA256 26765581d5f7e8dc25db657ed710b176b3cc84c37207c23f613de70ddc1a31e2 windowmaker-0.80.2-r4.ebuild 4113 EBUILD windowmaker-0.91.0-r1.ebuild 5925 RMD160 8464dba57c22206e8cbbcf23c2573b8ddefdbb80 SHA1 ed9a9830b01cfb956572f2dcb0b6d31ec686f013 SHA256 444ff4e787318caa3574f73d56ea57d6863ddfbc7c78b222907d48de17166eeb MD5 902604a4e2db5efb352031f4dfa80711 windowmaker-0.91.0-r1.ebuild 5925 RMD160 8464dba57c22206e8cbbcf23c2573b8ddefdbb80 windowmaker-0.91.0-r1.ebuild 5925 @@ -77,27 +45,17 @@ EBUILD windowmaker-0.92.0-r3.ebuild 5195 RMD160 497922ac1acd48bc37bb2b993b035d90 MD5 b955e5d3449380af8f8818233727761c windowmaker-0.92.0-r3.ebuild 5195 RMD160 497922ac1acd48bc37bb2b993b035d90e5c35145 windowmaker-0.92.0-r3.ebuild 5195 SHA256 0c7af0c7fa9a80371adbdd59a0b4e5d0341cdac5e387ed612e5fba0e80b52068 windowmaker-0.92.0-r3.ebuild 5195 -MISC ChangeLog 17761 RMD160 50acce48f83a5c6fa2b646e571b9af0f514a5369 SHA1 5407e018c88605ba7b137984f095448d97487d9c SHA256 6e6c6a164e11805819de1425885d302a1576fcbea5e0259709c2b996d0ded4d6 -MD5 80d1dca0bbbf6c70f2547aba47006724 ChangeLog 17761 -RMD160 50acce48f83a5c6fa2b646e571b9af0f514a5369 ChangeLog 17761 -SHA256 6e6c6a164e11805819de1425885d302a1576fcbea5e0259709c2b996d0ded4d6 ChangeLog 17761 +MISC ChangeLog 18107 RMD160 75f0e18b596a5aeff5e55e82136279fb552bdc25 SHA1 f18274c0975b36ee1e3db3155fe8abc244530452 SHA256 aa441b03741df382778e5747fd2a7973319bb40d94a043ec9987be3f1044c102 +MD5 7e3958a890ac55e177c6db29776776e9 ChangeLog 18107 +RMD160 75f0e18b596a5aeff5e55e82136279fb552bdc25 ChangeLog 18107 +SHA256 aa441b03741df382778e5747fd2a7973319bb40d94a043ec9987be3f1044c102 ChangeLog 18107 MISC metadata.xml 160 RMD160 ddb4d678bca64884df87cfab19e00ed9b1ff68a7 SHA1 b3d2981594e6dc70e8f74882cb08b541e1031987 SHA256 264f651f5dc3c8c2d37605e94abe49e6b29b7aed9131e82b473f27e12d67ebe7 MD5 72c8d22e50caaf5dd42b1823f5874206 metadata.xml 160 RMD160 ddb4d678bca64884df87cfab19e00ed9b1ff68a7 metadata.xml 160 SHA256 264f651f5dc3c8c2d37605e94abe49e6b29b7aed9131e82b473f27e12d67ebe7 metadata.xml 160 -MD5 fee13e4b386429991f8ef727df05c45f files/digest-windowmaker-0.80.2-r4 524 -RMD160 0b6d0cfdaf42837e1909dd1fd638333068990d21 files/digest-windowmaker-0.80.2-r4 524 -SHA256 0729dc6ea8316ad028bca3ca25248ecbcb6e08f4e846c78d10bcf049e4dd9931 files/digest-windowmaker-0.80.2-r4 524 MD5 4812886ba29c87e556083a1c2be8f729 files/digest-windowmaker-0.91.0-r1 524 RMD160 835325d78b6c8682a521abf9c15d9f4c48103a78 files/digest-windowmaker-0.91.0-r1 524 SHA256 5dd231b7bb071e4104ec7943616e0e05c457b6dda0b16bbb63bf7beb84d1125b files/digest-windowmaker-0.91.0-r1 524 MD5 c65600a9a881a199e1f0b5d85ac91a40 files/digest-windowmaker-0.92.0-r3 524 RMD160 7ecd7073fbe68cedeb28ab5df95b8df4491e4f37 files/digest-windowmaker-0.92.0-r3 524 SHA256 f1929cf5dfc688631773e6f18c3e9b0856863825579b372b7a25593125216a30 files/digest-windowmaker-0.92.0-r3 524 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFF3Mqzz974XjDVpbkRAlf8AJoDfFkNlvrj9nfnqPmsGAtoP97F+gCgqL5O -6UN2VaKLdMnxAfZ1FVtwd8U= -=INSl ------END PGP SIGNATURE----- diff --git a/x11-wm/windowmaker/files/0.80.2/gtk2flickerfix.patch b/x11-wm/windowmaker/files/0.80.2/gtk2flickerfix.patch deleted file mode 100644 index 188c6e3a031d..000000000000 --- a/x11-wm/windowmaker/files/0.80.2/gtk2flickerfix.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -urN WindowMaker-0.80.2/src/actions.c WindowMaker-0.80.2-modified/src/actions.c ---- WindowMaker-0.80.2/src/actions.c 2002-07-02 01:30:25.000000000 +0100 -+++ WindowMaker-0.80.2-modified/src/actions.c 2004-01-08 20:52:01.384657458 +0000 -@@ -144,14 +144,21 @@ - old_scr=scr; - old_focused=old_scr->focused_window; - -+ /* -+ * Safeguard: make sure the timestamp is monotonically increasing -+ * (very unlikely that this will be needed, still a safeguard) -+ */ -+ if (timestamp <= LastFocusChange) -+ timestamp = LastFocusChange + 1; -+ - LastFocusChange = timestamp; - - /* - * This is a hack, because XSetInputFocus() should have a proper - * timestamp instead of CurrentTime but it seems that some times - * clients will not receive focus properly that way. -- if (ignoreTimestamp) - */ -+ if (ignoreTimestamp) - timestamp = CurrentTime; - - if (old_focused) -diff -urN WindowMaker-0.80.2/src/event.c WindowMaker-0.80.2-modified/src/event.c ---- WindowMaker-0.80.2/src/event.c 2002-01-08 13:45:13.000000000 +0000 -+++ WindowMaker-0.80.2-modified/src/event.c 2004-01-08 20:52:35.321986539 +0000 -@@ -402,7 +402,6 @@ - static void - saveTimestamp(XEvent *event) - { -- LastTimestamp = CurrentTime; - - switch (event->type) { - case ButtonRelease: -diff -urN WindowMaker-0.80.2/src/workspace.c WindowMaker-0.80.2-modified/src/workspace.c ---- WindowMaker-0.80.2/src/workspace.c 2002-01-08 13:45:33.000000000 +0000 -+++ WindowMaker-0.80.2-modified/src/workspace.c 2004-01-08 20:55:00.691545736 +0000 -@@ -574,11 +574,13 @@ - &foo, &foo, &foo, &foo, &mask)) { - tmp = wWindowFor(win); - } -- if (!tmp && wPreferences.focus_mode == WKF_SLOPPY) { -- wSetFocusTo(scr, foc); -- } else { -- wSetFocusTo(scr, tmp); -- } -+ if (!tmp) { -+ if (wPreferences.focus_mode == WKF_SLOPPY) { -+ wSetFocusTo(scr, foc); -+ } else { -+ wSetFocusTo(scr, tmp); -+ } -+ } - } - } - diff --git a/x11-wm/windowmaker/files/0.80.2/trance.patch.WM-0.80.2.diff b/x11-wm/windowmaker/files/0.80.2/trance.patch.WM-0.80.2.diff deleted file mode 100644 index c5ef62f76cee..000000000000 --- a/x11-wm/windowmaker/files/0.80.2/trance.patch.WM-0.80.2.diff +++ /dev/null @@ -1,334 +0,0 @@ ---- WindowMaker-0.80.2/WPrefs.app/Appearance.c Tue Jan 8 08:44:38 2002 -+++ WindowMaker-0.80.2-trance/WPrefs.app/Appearance.c Tue Feb 4 20:45:34 2003 -@@ -82,6 +82,11 @@ - WMFrame *taliF; - WMButton *taliB[3]; - -+ WMFrame *tranceF; -+ WMButton *tranceB; -+ WMSlider *tranceSl; -+ WMLabel *tranceL; -+ - /* root bg */ - WMFrame *bgF; - -@@ -1683,6 +1688,23 @@ - } - } - -+static void -+tranceCallback(WMWidget *self, void *data) -+{ -+ _Panel *panel = (_Panel*)data; -+ char buffer[5]; -+ int i; -+ -+ i = WMGetSliderValue(panel->tranceSl); -+ i = 10*(10-i); -+ -+ if (i == 0) { -+ WMSetLabelText(panel->tranceL, "OFF"); -+ } else { -+ sprintf(buffer, "%i%%", i); -+ WMSetLabelText(panel->tranceL, buffer); -+ } -+} - - static void - createPanel(Panel *p) -@@ -1974,7 +1996,7 @@ - - - panel->taliF = WMCreateFrame(panel->optF); -- WMResizeWidget(panel->taliF, 110, 80); -+ WMResizeWidget(panel->taliF, 105, 80); - WMMoveWidget(panel->taliF, 15, 100); - WMSetFrameTitle(panel->taliF, _("Title Alignment")); - -@@ -1992,7 +2014,7 @@ - WMSetButtonText(panel->taliB[i], _("Right")); - break; - } -- WMResizeWidget(panel->taliB[i], 90, 18); -+ WMResizeWidget(panel->taliB[i], 85, 18); - WMMoveWidget(panel->taliB[i], 10, 15 + 20*i); - } - WMGroupButtons(panel->taliB[0], panel->taliB[1]); -@@ -2000,6 +2022,38 @@ - - WMMapSubwidgets(panel->taliF); - -+ -+ -+ panel->tranceF = WMCreateFrame(panel->optF); -+ WMResizeWidget(panel->tranceF, 105,80); -+ WMMoveWidget(panel->tranceF, 125, 100); -+ WMSetFrameTitle(panel->tranceF,_("Transparency")); -+ -+ WMSetBalloonTextForView(_(" i love windowmaker\n" -+ " get some fresh sand-wich-es\n" -+ " heh\n" -+ " transparency\n" -+ " moo\n" -+ " :P\n"), WMWidgetView(panel->tranceF)); -+ -+ panel->tranceB = WMCreateSwitchButton(panel->tranceF); -+ WMSetButtonText(panel->tranceB, _("Menu")); -+ WMResizeWidget(panel->tranceB,85,18); -+ WMMoveWidget(panel->tranceB, 10, 15); -+ -+ panel->tranceSl = WMCreateSlider(panel->tranceF); -+ WMResizeWidget(panel->tranceSl, 70, 18); -+ WMMoveWidget(panel->tranceSl, 17, 15 + 20*2); -+ WMSetSliderMinValue(panel->tranceSl, 0); -+ WMSetSliderMaxValue(panel->tranceSl, 10); -+ WMSetSliderAction(panel->tranceSl, tranceCallback, panel); -+ -+ panel->tranceL = WMCreateLabel(panel->tranceF); -+ WMResizeWidget(panel->tranceL, 27, 18); -+ WMMoveWidget(panel->tranceL, 40, 35); -+ -+ WMMapSubwidgets(panel->tranceF); -+ - WMMapSubwidgets(panel->optF); - - /**/ -@@ -2058,6 +2112,7 @@ - static void - showData(_Panel *panel) - { -+ int x; - int i; - char *str; - -@@ -2103,6 +2158,13 @@ - - WMSetButtonSelected(panel->mstyB[panel->menuStyle], True); - WMSetButtonSelected(panel->taliB[panel->titleAlignment], True); -+ -+ -+ WMSetButtonSelected(panel->tranceB, GetBoolForKey("MenuTrance")); -+ -+ x = GetIntegerForKey("TranceAmount"); -+ WMSetSliderValue(panel->tranceSl, x); -+ tranceCallback(NULL, panel); - } - - -@@ -2154,6 +2216,9 @@ - SetStringForKey("center", "TitleJustify"); - break; - } -+ -+ SetBoolForKey(WMGetButtonSelected(panel->tranceB), "MenuTrance"); -+ SetIntegerForKey(WMGetSliderValue(panel->tranceSl), "TranceAmount"); - } - - ---- WindowMaker-0.80.2/src/WindowMaker.h Thu Feb 21 06:28:48 2002 -+++ WindowMaker-0.80.2-trance/src/WindowMaker.h Tue Feb 4 19:13:20 2003 -@@ -337,6 +337,8 @@ - char opaque_move; /* update window position during */ - /* move */ - -+ char menu_trance; /* whether menu should be translucent */ -+ int trance_amount; /* percentage of translucency */ - char wrap_menus; /* wrap menus at edge of screen */ - char scrollable_menus; /* let them be scrolled */ - char align_menus; /* align menu with their parents */ ---- WindowMaker-0.80.2/src/defaults.c Tue Jan 8 08:45:07 2002 -+++ WindowMaker-0.80.2-trance/src/defaults.c Tue Feb 4 19:13:07 2003 -@@ -494,6 +494,12 @@ - {"UseSaveUnders", "NO", NULL, - &wPreferences.use_saveunders, getBool, NULL - }, -+ {"MenuTrance", "NO", NULL, -+ &wPreferences.menu_trance, getBool, NULL -+ }, -+ {"TranceAmount", "30", NULL, -+ &wPreferences.trance_amount, getInt, NULL -+ }, - {"OpaqueMove", "NO", NULL, - &wPreferences.opaque_move, getBool, NULL - }, ---- WindowMaker-0.80.2/src/menu.c Thu Feb 21 06:28:48 2002 -+++ WindowMaker-0.80.2-trance/src/menu.c Tue Feb 4 18:50:02 2003 -@@ -85,6 +85,7 @@ - static void menuCloseClick(WCoreWindow *sender, void *data, XEvent *event); - - static void updateTexture(WMenu *menu); -+static void clipDimensionsToScreen(WMenu *menu, int *x, int *y, int *width, int *height); - - #ifndef LITE - static int saveMenuRecurs(WMPropList *menus, WScreen *scr, WMenu *menu); -@@ -480,16 +481,129 @@ - menu->menu->width-1, i*menu->entry_height, - &light); - } -- } -- if (!RConvertImage(scr->rcontext, img, &pix)) { -- wwarning(_("error rendering image:%s"), RMessageForError(RErrorCode)); -- } -+ } -+ if (!RConvertImage(scr->rcontext, img, &pix)) { -+ wwarning(_("error rendering image:%s"), RMessageForError(RErrorCode)); -+ } - RReleaseImage(img); - - return pix; - } - - -+ static void -+clipDimensionsToScreen(WMenu *menu, int *x, int *y, int *width, int *height) -+{ -+ int sw, sh; -+ int fx, fy; -+ -+ sw = menu->menu->screen_ptr->scr_width; -+ sh = menu->menu->screen_ptr->scr_height; -+ -+ fx = *x + *width; -+ fy = *y + *height; -+ -+ /* CLAMP everything */ -+ if (*x > sw) { *x = sw; } else if (*x < 0) { *x = 0; } -+ if (*y > sh) { *y = sh; } else if (*y < 0) { *y = 0; } -+ if (fx > sw) { fx = sw; } else if (fx < 0) { fx = 0; } -+ if (fy > sh) { fy = sh; } else if (fy < 0) { fy = 0; } -+ -+ /* Make sure that height and width are positive */ -+ if (fx < *x) { *width = 0; } else { *width = fx - *x; } -+ if (fy < *y) { *height = 0; } else { *height = fy - *y; } -+} -+ -+static Pixmap -+tranceMenu(WMenu *menu) -+{ -+ WScreen *scr = menu->menu->screen_ptr; -+ -+ XImage *back, *front; -+ RImage *trance, *menu_image, *msnormal; -+ Pixmap original, result; -+ -+ int mw, mh, dx, dy; /* these correspond to the menu proper */ -+ int gx, gy, gw, gh; /* these correspond to what we grab from the root window */ -+ int tamount; -+ unsigned long red_mask, green_mask, blue_mask; -+ -+ unsigned int w, h, bar; -+ int foo; -+ Window baz; -+ -+ mw = gw = menu->menu->width; -+ mh = gh = menu->menu->height; -+ dx = gx = menu->frame_x + 1; -+ dy = gy = menu->frame_y + menu->frame->top_width + 1; -+ -+ tamount = wPreferences.trance_amount; -+ clipDimensionsToScreen(menu, &gx, &gy, &gw, &gh); -+ back = XGetImage(dpy, scr->root_win, gx, gy, gw, gh, -+ AllPlanes, ZPixmap); -+ if (!back) { -+ wwarning(_("error capturing \"back\" image"),RMessageForError(RErrorCode)); -+ return None; -+ } else { -+ red_mask = back->red_mask; -+ green_mask = back->green_mask; -+ blue_mask = back->blue_mask; -+ -+ trance = RCreateImageFromXImage(scr->rcontext, back, NULL); -+ XDestroyImage(back); -+ if (!trance) { -+ wwarning(_("error rendering \"trance\" image"), -+ RMessageForError(RErrorCode)); -+ return None; -+ } else { -+ /************************************************************/ -+ original = renderTexture(menu); -+ -+ XGetGeometry(dpy, original, &baz, &foo, -+ &foo, &w, &h, &bar, &bar); -+ front = XGetImage(dpy, original, 0, 0, w, h, -+ AllPlanes, ZPixmap); -+ if (!front) { -+ wwarning(_("error capturing \"front\" image"), -+ RMessageForError(RErrorCode)); -+ return None; -+ } -+ front->red_mask = red_mask; -+ front->green_mask = green_mask; -+ front->blue_mask = blue_mask; -+ -+ menu_image=RCreateImageFromXImage(scr->rcontext,front,NULL); -+ -+ XDestroyImage(front); -+ /************************************************************/ -+ if (original) { -+ FREE_PIXMAP(original); -+ } -+ if (!menu_image) { -+ wwarning(_("error rendering \"menu_image\""), -+ RMessageForError(RErrorCode)); -+ return None; -+ } else { -+ if (wPreferences.menu_style == MS_NORMAL) { -+ msnormal = RMakeTiledImage(menu_image, mw, mh); -+ RCombineAreaWithOpaqueness(trance, msnormal,0,0,gw,gh, -+ gx - dx,gy - dy,256*tamount/10); -+ RReleaseImage(menu_image); -+ RReleaseImage(msnormal); -+ } else { -+ RCombineAreaWithOpaqueness(trance, menu_image,0,0,gw,gh, -+ gx - dx,gy - dy,256*tamount/10); -+ RReleaseImage(menu_image); -+ } -+ RConvertImage(scr->rcontext, trance, -+ &result); -+ } -+ RReleaseImage(trance); -+ } -+ } -+ return result; -+} -+ - static void - updateTexture(WMenu *menu) - { -@@ -500,7 +614,11 @@ - if (!menu->flags.brother) { - FREE_PIXMAP(menu->menu_texture_data); - -- menu->menu_texture_data = renderTexture(menu); -+ if (wPreferences.menu_trance) { -+ menu->menu_texture_data = tranceMenu(menu); -+ } else { -+ menu->menu_texture_data = renderTexture(menu); -+ } - - XSetWindowBackgroundPixmap(dpy, menu->menu->window, - menu->menu_texture_data); -@@ -1154,6 +1272,11 @@ - XMoveWindow(dpy, menu->frame->core->window, x, y); - menu->frame_x = x; - menu->frame_y = y; -+ /* FIXME: needs an if */ -+ if (wPreferences.menu_trance) { -+ updateTexture(menu); -+ } -+ /* */ - XMapWindow(dpy, menu->frame->core->window); - wRaiseFrame(menu->frame->core); - menu->flags.mapped = 1; -@@ -1178,6 +1301,11 @@ - menu->frame_y = menu->frame->screen_ptr->app_menu_y; - XMoveWindow(dpy, menu->frame->core->window, menu->frame_x, menu->frame_y); - } -+ /* FIXME: needs an if */ -+ if (wPreferences.menu_trance) { -+ updateTexture(menu); -+ } -+ /* */ - XMapWindow(dpy, menu->frame->core->window); - wRaiseFrame(menu->frame->core); - menu->flags.mapped = 1; diff --git a/x11-wm/windowmaker/files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch b/x11-wm/windowmaker/files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch deleted file mode 100644 index 75c081e86f49..000000000000 --- a/x11-wm/windowmaker/files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff -urN WindowMaker-0.80.1/WPrefs.app/po/zh_TW.Big5.po WindowMaker-0.80.1-modified/WPrefs.app/po/zh_TW.Big5.po ---- WindowMaker-0.80.1/WPrefs.app/po/zh_TW.Big5.po Tue Jan 8 07:44:42 2002 -+++ WindowMaker-0.80.1-modified/WPrefs.app/po/zh_TW.Big5.po Tue Aug 6 21:40:32 2002 -@@ -1887,11 +1887,11 @@ - - #: ../../WPrefs.app/WindowHandling.c:366 - msgid "...do not cover icons" --msgstr "...¤£­nÂл\\¹Ï¥Ü" -+msgstr "...¤£­nÂл\¹Ï¥Ü" - - #: ../../WPrefs.app/WindowHandling.c:372 - msgid "...do not cover dock" --msgstr "...¤£­nÂл\\°±¾a°Ï" -+msgstr "...¤£­nÂл\°±¾a°Ï" - - #: ../../WPrefs.app/WindowHandling.c:381 - msgid "Edge Resistance" -@@ -2063,3 +2063,4 @@ - #: ../../WPrefs.app/main.c:161 - msgid "could not initialize application" - msgstr "µLªk±Ò©lÀ³¥Îµ{¦¡" -+ -diff -urN WindowMaker-0.80.1/WindowMaker/plmenu WindowMaker-0.80.1-modified/WindowMaker/plmenu ---- WindowMaker-0.80.1/WindowMaker/plmenu Mon Jul 1 19:30:25 2002 -+++ WindowMaker-0.80.1-modified/WindowMaker/plmenu Tue Aug 6 21:41:19 2002 -@@ -95,7 +95,7 @@ - ), - ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), - ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), -- ("Preferences Utility", EXEC, "/usr/local/GNUstep/Apps/WPrefs.app/WPrefs") -+ ("Preferences Utility", EXEC, "/usr/lib/GNUstep/Apps/WPrefs.app/WPrefs") - ), - ("Exit", - ("Restart", RESTART), -diff -urN WindowMaker-0.80.1/po/zh_TW.Big5.po WindowMaker-0.80.1-modified/po/zh_TW.Big5.po ---- WindowMaker-0.80.1/po/zh_TW.Big5.po Tue Jan 8 07:45:06 2002 -+++ WindowMaker-0.80.1-modified/po/zh_TW.Big5.po Tue Aug 6 21:40:32 2002 -@@ -519,8 +519,8 @@ - "is docked in the same positions on the other workspaces and the Clip is not " - "full in some workspace." - msgstr "" --"¬Y¨Ç¹Ï¥ÜµLªk³]¦¨µL©Ò¤£¦b¡C½Ð½T»{¦b¨ä¥L¤u§@°Ï¦P¤@­Ó¦ì¸m¤W¨S¦³¨ä¥L¹Ï¥Ü°±¾a¥B¦b¬" --"Y¨Ç¤u§@°Ïªº°j¯¾°w¥¼º¡¡C" -+"¬Y¨Ç¹Ï¥ÜµLªk³]¦¨µL©Ò¤£¦b¡C " -+"½Ð½T»{¦b¨ä¥L¤u§@°Ï¦P¤@­Ó¦ì¸m¤W¨S¦³¨ä¥L¹Ï¥Ü°±¾a¥B¦b¬Y¨Ç¤u§@°Ïªº°j¯¾°w¥¼º¡¡C" - - #: ../src/dock.c:529 - msgid "" -@@ -528,8 +528,8 @@ - "docked in the same position on the other workspaces and the Clip is not full " - "in some workspace." - msgstr "" --"¹Ï¥ÜµLªk³]¦¨µL©Ò¤£¦b¡C½Ð½T»{¦b¨ä¥L¤u§@°Ï¦P¤@­Ó¦ì¸m¤W¨S¦³¨ä¥L¹Ï¥Ü°±¾a¥B¦b¬Y¨Ç¤" --"u§@°Ïªº°j¯¾°w¥¼º¡¡C" -+"¹Ï¥ÜµLªk³]¦¨µL©Ò¤£¦b¡C " -+"½Ð½T»{¦b¨ä¥L¤u§@°Ï¦P¤@­Ó¦ì¸m¤W¨S¦³¨ä¥L¹Ï¥Ü°±¾a¥B¦b¬Y¨Ç¤u§@°Ïªº°j¯¾°w¥¼º¡¡C" - - #: ../src/dock.c:556 - msgid "Workspace Clip" -@@ -1142,13 +1142,13 @@ - msgid "" - "There are more than one WORKSPACE_MENU commands in the applications menu. " - "Only one is allowed." --msgstr "À³¥Îµ{¦¡¿ï³æ¤¤¦³¶W¹L¤@­Ó WORKSPACE_MENU ©R¥O¡C¥u¤¹³\\¤@­Ó¡C" -+msgstr "À³¥Îµ{¦¡¿ï³æ¤¤¦³¶W¹L¤@­Ó WORKSPACE_MENU ©R¥O¡C¥u¤¹³\¤@­Ó¡C" - - #: ../src/rootmenu.c:834 - msgid "" - "There are more than one WINDOWS_MENU commands in the applications menu. Only " - "one is allowed." --msgstr "À³¥Îµ{¦¡¿ï³æ¤¤¦³¶W¹L¤@­Ó WINDOWS_MENU ©R¥O¡C¥u¤¹³\\¤@­Ó¡C" -+msgstr "À³¥Îµ{¦¡¿ï³æ¤¤¦³¶W¹L¤@­Ó WINDOWS_MENU ©R¥O¡C¥u¤¹³\¤@­Ó¡C" - - #: ../src/rootmenu.c:839 - msgid "Window List" -@@ -1502,11 +1502,11 @@ - #: ../src/winspector.c:1121 - #, c-format - msgid "Inspecting %s.%s" --msgstr "À˾\\ %s.%s" -+msgstr "À˾\ %s.%s" - - #: ../src/winspector.c:1147 - msgid "Click in the window you wish to inspect." --msgstr "¦b§A·QÀ˾\\ªºµøµ¡ÂI¤@¤U" -+msgstr "¦b§A·QÀ˾\ªºµøµ¡ÂI¤@¤U" - - #: ../src/winspector.c:1186 - msgid "" -@@ -1620,7 +1620,7 @@ - msgid "" - "Keep the window over other windows, not allowing\n" - "them to cover it." --msgstr "Åýµøµ¡«O«ù¦b¨ä¥Lµøµ¡¤§¤W¡A¤£³\\¥¦­ÌÂл\\¥¦¡C" -+msgstr "Åýµøµ¡«O«ù¦b¨ä¥Lµøµ¡¤§¤W¡A¤£³\¥¦­ÌÂл\¥¦¡C" - - #: ../src/winspector.c:1370 - msgid "Keep at bottom (sunken)" -@@ -1682,7 +1682,7 @@ - "of your shortcut configuration." - msgstr "" - "·í¦¹µøµ¡±o¨ìµJÂI®É¤£­n±q Window Maker µ²¦XÁä½L±¶®|¡C\n" --"³o¤¹³\\µøµ¡±o¨ì©Ò¦³Áä½L²Õ¦X¤£²z·|§Aªº±¶®|³]©w¡C" -+"³o¤¹³\µøµ¡±o¨ì©Ò¦³Áä½L²Õ¦X¤£²z·|§Aªº±¶®|³]©w¡C" - - #: ../src/winspector.c:1436 - msgid "Do not bind mouse clicks" -@@ -1720,7 +1720,7 @@ - msgid "" - "Do not allow the window to move itself completely\n" - "outside the screen. For bug compatibility.\n" --msgstr "¤£¤¹³\\µøµ¡§¹¥þ²¾¥X¿Ã¹õ¡C¥Î©ó¿ù»~¬Û®e©Ê¡C\n" -+msgstr "¤£¤¹³\µøµ¡§¹¥þ²¾¥X¿Ã¹õ¡C¥Î©ó¿ù»~¬Û®e©Ê¡C\n" - - #: ../src/winspector.c:1460 - msgid "Ignore 'Hide Others'" -@@ -1848,3 +1848,4 @@ - #: ../src/workspace.c:936 - msgid "Destroy Last" - msgstr "§R°£³Ì«áªº¤u§@°Ï" -+ diff --git a/x11-wm/windowmaker/files/0.80.2/wlist.patch b/x11-wm/windowmaker/files/0.80.2/wlist.patch deleted file mode 100644 index 4e24e6f0d211..000000000000 --- a/x11-wm/windowmaker/files/0.80.2/wlist.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- wlist.c.orig Sat Apr 20 20:17:16 2002 -+++ wlist.c Sun Apr 21 14:12:06 2002 -@@ -4,6 +4,8 @@ - - #include "WINGsP.h" - -+#include -+ - char *WMListDidScrollNotification = "WMListDidScrollNotification"; - char *WMListSelectionDidChangeNotification = "WMListSelectionDidChangeNotification"; - -@@ -42,6 +44,7 @@ - unsigned int redrawPending:1; - unsigned int buttonPressed:1; - unsigned int buttonWasPressed:1; -+ unsigned int focused:1; - } flags; - } List; - -@@ -115,10 +118,10 @@ - lPtr->view->delegate = &_ListViewDelegate; - - WMCreateEventHandler(lPtr->view, ExposureMask|StructureNotifyMask -- |ClientMessageMask, handleEvents, lPtr); -+ |FocusChangeMask|ClientMessageMask, handleEvents, lPtr); - - WMCreateEventHandler(lPtr->view, ButtonPressMask|ButtonReleaseMask -- |EnterWindowMask|LeaveWindowMask|ButtonMotionMask, -+ |EnterWindowMask|LeaveWindowMask|ButtonMotionMask|KeyPressMask, - handleActionEvents, lPtr); - - lPtr->itemHeight = WMFontHeight(scrPtr->normalFont) + 1; -@@ -1011,6 +1014,11 @@ - int topItem = lPtr->topItem; - static int lastClicked = -1, prevItem = -1; - -+ /* for arrow keys handling */ -+ char buffer[64]; -+ KeySym ksym; -+ int count, row; -+ - CHECK_CLASS(data, WC_List); - - switch (event->type) { -@@ -1063,6 +1071,10 @@ - case ButtonPress: - if (event->xbutton.x <= WMWidgetWidth(lPtr->vScroller)) - break; -+ /* need focus for keyboard events */ -+ if (!lPtr->flags.focused); -+ WMSetFocusToWidget(lPtr); -+ - if (event->xbutton.button == WINGsConfiguration.mouseWheelDown || - event->xbutton.button == WINGsConfiguration.mouseWheelUp) { - int amount = 0; -@@ -1169,6 +1181,34 @@ - prevItem = tmp; - } - break; -+ case KeyPress: -+ /* handle arrow keys, space and return */ -+ count = XLookupString(&event->xkey, buffer, 63, &ksym, NULL); -+ buffer[count] = '\0'; -+ switch(ksym) { -+ case XK_Up: -+ row = WMGetListSelectedItemRow(lPtr); -+ WMSelectListItem(lPtr, row - 1); -+ if (row <= topItem) -+ scrollByAmount(lPtr, -1); -+ break; -+ case XK_Down: -+ row = WMGetListSelectedItemRow(lPtr); -+ WMSelectListItem(lPtr, row + 1); -+ if (row - topItem >= lPtr->fullFitLines) -+ scrollByAmount(lPtr, 1); -+ break; -+ case XK_space: -+ if (lPtr->action) -+ (*lPtr->action)(lPtr, lPtr->clientData); -+ break; -+ case XK_Return: -+ if (lPtr->doubleAction) -+ (*lPtr->doubleAction)(lPtr, lPtr->clientData); -+ break; -+ } -+ break; -+ - } - if (lPtr->topItem != topItem) - WMPostNotificationName(WMListDidScrollNotification, lPtr, NULL); diff --git a/x11-wm/windowmaker/files/0.80.2/wmfpo.patch b/x11-wm/windowmaker/files/0.80.2/wmfpo.patch deleted file mode 100644 index 662e4949ee18..000000000000 --- a/x11-wm/windowmaker/files/0.80.2/wmfpo.patch +++ /dev/null @@ -1,233 +0,0 @@ -diff -ur WindowMaker-0.80.0/WPrefs.app/Expert.c WindowMaker-0.80.0fpo1/WPrefs.app/Expert.c ---- WindowMaker-0.80.0/WPrefs.app/Expert.c Mon May 21 18:11:17 2001 -+++ WindowMaker-0.80.0fpo1/WPrefs.app/Expert.c Sat Jan 5 03:08:10 2002 -@@ -33,7 +33,7 @@ - - WMWidget *parent; - -- WMButton *swi[8]; -+ WMButton *swi[10]; - - } _Panel; - -@@ -54,6 +54,8 @@ - WMSetButtonSelected(panel->swi[4], GetBoolForKey("WindozeCycling")); - WMSetButtonSelected(panel->swi[5], GetBoolForKey("DontConfirmKill")); - WMSetButtonSelected(panel->swi[6], GetBoolForKey("DisableBlinking")); -+ WMSetButtonSelected(panel->swi[7], GetBoolForKey("DCMaximize")); -+ WMSetButtonSelected(panel->swi[8], GetBoolForKey("SingleClickLaunch")); - } - - -@@ -66,10 +68,10 @@ - panel->box = WMCreateBox(panel->parent); - WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2); - -- for (i=0; i<7; i++) { -+ for (i=0; i<9; i++) { - panel->swi[i] = WMCreateSwitchButton(panel->box); - WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25); -- WMMoveWidget(panel->swi[i], 20, 20+i*25); -+ WMMoveWidget(panel->swi[i], 20, 20+i*23); - } - - WMSetButtonText(panel->swi[0], _("Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME.")); -@@ -79,6 +81,8 @@ - WMSetButtonText(panel->swi[4], _("Use Windoze style cycling.")); - WMSetButtonText(panel->swi[5], _("Disable confirmation panel for the Kill command.")); - WMSetButtonText(panel->swi[6], _("Disable selection animation for selected icons.")); -+ WMSetButtonText(panel->swi[7], _("Double click on title bar maximize")); -+ WMSetButtonText(panel->swi[8], _("Launch applications and restore windows with a single click")); - - WMRealizeWidget(panel->box); - WMMapSubwidgets(panel->box); -@@ -101,6 +105,8 @@ - SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "WindozeCycling"); - SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DontConfirmKill"); - SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "DisableBlinking"); -+ SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "DCMaximize"); -+ SetBoolForKey(WMGetButtonSelected(panel->swi[8]), "SingleClickLaunch"); - } - - -diff -ur WindowMaker-0.80.0/src/WindowMaker.h WindowMaker-0.80.0fpo1/src/WindowMaker.h ---- WindowMaker-0.80.0/src/WindowMaker.h Fri Dec 21 21:38:08 2001 -+++ WindowMaker-0.80.0fpo1/src/WindowMaker.h Sat Jan 5 14:12:14 2002 -@@ -463,6 +463,12 @@ - /* shading animation */ - signed char shade_speed; - -+ /* double click on title bar maximize */ -+ char dc_maximize; -+ -+ /* single click to lauch applications */ -+ char single_click; -+ - int edge_resistance; - char attract; - -diff -ur WindowMaker-0.80.0/src/appicon.c WindowMaker-0.80.0fpo1/src/appicon.c ---- WindowMaker-0.80.0/src/appicon.c Tue Dec 18 03:43:48 2001 -+++ WindowMaker-0.80.0fpo1/src/appicon.c Sat Jan 5 14:12:14 2002 -@@ -596,6 +596,7 @@ - int shad_x = 0, shad_y = 0, docking=0, dockable, collapsed = 0; - int ix, iy; - int clickButton = event->xbutton.button; -+ Bool hasMoved = False; - Pixmap ghost = None; - Window wins[2]; - Bool movingSingle = False; -@@ -676,6 +677,7 @@ - break; - - case MotionNotify: -+ hasMoved = True; - if (!grabbed) { - if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD - || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { -@@ -812,6 +814,8 @@ - - if (wPreferences.auto_arrange_icons) - wArrangeIcons(scr, True); -+ if (!hasMoved && wPreferences.single_click) -+ iconDblClick(desc, event); - - done = 1; - break; -diff -ur WindowMaker-0.80.0/src/defaults.c WindowMaker-0.80.0fpo1/src/defaults.c ---- WindowMaker-0.80.0/src/defaults.c Fri Dec 21 21:38:08 2001 -+++ WindowMaker-0.80.0fpo1/src/defaults.c Sat Jan 5 14:12:14 2002 -@@ -548,6 +548,12 @@ - {"DisableBlinking", "NO", NULL, - &wPreferences.dont_blink, getBool, NULL - }, -+ {"DCMaximize", "NO", NULL, -+ &wPreferences.dc_maximize, getBool, NULL -+ }, -+ {"SingleClickLaunch", "NO", NULL, -+ &wPreferences.single_click, getBool, NULL -+ }, - /* style options */ - {"MenuStyle", "normal", seMenuStyles, - &wPreferences.menu_style, getEnum, setMenuStyle -diff -ur WindowMaker-0.80.0/src/dock.c WindowMaker-0.80.0fpo1/src/dock.c ---- WindowMaker-0.80.0/src/dock.c Fri Dec 21 21:38:08 2001 -+++ WindowMaker-0.80.0fpo1/src/dock.c Sat Jan 5 14:12:14 2002 -@@ -3772,7 +3772,7 @@ - - - --static void -+static Bool - handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event) - { - WScreen *scr = dock->screen_ptr; -@@ -3788,6 +3788,7 @@ - int tmp; - Pixmap ghost = None; - Bool docked; -+ Bool hasMoved = False; - int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */ - int omnipresent = aicon->omnipresent; /* this must be cached!!! */ - -@@ -3842,6 +3843,7 @@ - break; - - case MotionNotify: -+ hasMoved = True; - if (!grabbed) { - if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD - || abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) { -@@ -3991,7 +3993,7 @@ - #ifdef DEBUG - puts("End icon move"); - #endif -- return; -+ return hasMoved; - } - } - } -@@ -4130,8 +4132,11 @@ - handleClipChangeWorkspace(scr, event); - else - handleDockMove(dock, aicon, event); -- } else -- handleIconMove(dock, aicon, event); -+ } else { -+ Bool hasMoved = handleIconMove(dock, aicon, event); -+ if (!hasMoved && wPreferences.single_click) -+ iconDblClick(desc, event); -+ } - - } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP && - aicon==scr->clip_icon) { -diff -ur WindowMaker-0.80.0/src/icon.c WindowMaker-0.80.0fpo1/src/icon.c ---- WindowMaker-0.80.0/src/icon.c Tue Jul 24 06:51:05 2001 -+++ WindowMaker-0.80.0fpo1/src/icon.c Sat Jan 5 14:16:16 2002 -@@ -877,6 +877,7 @@ - int dx=event->xbutton.x, dy=event->xbutton.y; - int grabbed=0; - int clickButton=event->xbutton.button; -+ Bool hasMoved = False; - - if (WCHECK_STATE(WSTATE_MODAL)) - return; -@@ -928,6 +929,7 @@ - break; - - case MotionNotify: -+ hasMoved = True; - if (!grabbed) { - if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD - || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { -@@ -965,6 +967,9 @@ - - if (wPreferences.auto_arrange_icons) - wArrangeIcons(wwin->screen_ptr, True); -+ if (!hasMoved && wPreferences.single_click) -+ miniwindowDblClick(desc, event); -+ - return; - - } -diff -ur WindowMaker-0.80.0/src/window.c WindowMaker-0.80.0fpo1/src/window.c ---- WindowMaker-0.80.0/src/window.c Fri Dec 21 21:38:08 2001 -+++ WindowMaker-0.80.0fpo1/src/window.c Sat Jan 5 14:18:07 2002 -@@ -2984,14 +2984,29 @@ - - if (event->xbutton.button==Button1) { - if (event->xbutton.state == 0) { -- if (!WFLAGP(wwin, no_shadeable)) { -- /* shade window */ -- if (wwin->flags.shaded) -- wUnshadeWindow(wwin); -- else -- wShadeWindow(wwin); -- } -- } else { -+ /* check preferences, maximize or shade */ -+ if (wPreferences.dc_maximize) { -+ if (!WFLAGP(wwin, no_resizable)) { -+ /* maximize window */ -+ if (wwin->flags.maximized != 0) { -+ wUnmaximizeWindow(wwin); -+ wwin->flags.maximized = 0; -+ } -+ else { -+ wMaximizeWindow(wwin, MAX_VERTICAL|MAX_HORIZONTAL); -+ wwin->flags.maximized = MAX_VERTICAL|MAX_HORIZONTAL; -+ } -+ } -+ } else { -+ if (!WFLAGP(wwin, no_shadeable)) { -+ /* shade window */ -+ if (wwin->flags.shaded) -+ wUnshadeWindow(wwin); -+ else -+ wShadeWindow(wwin); -+ } -+ } -+ } else { - int dir = 0; - - if (event->xbutton.state & ControlMask) diff --git a/x11-wm/windowmaker/files/0.80.2/xinerama.patch.bz2 b/x11-wm/windowmaker/files/0.80.2/xinerama.patch.bz2 deleted file mode 100644 index 61d7417af13b..000000000000 Binary files a/x11-wm/windowmaker/files/0.80.2/xinerama.patch.bz2 and /dev/null differ diff --git a/x11-wm/windowmaker/files/digest-windowmaker-0.80.2-r4 b/x11-wm/windowmaker/files/digest-windowmaker-0.80.2-r4 deleted file mode 100644 index 100afbc4cd1a..000000000000 --- a/x11-wm/windowmaker/files/digest-windowmaker-0.80.2-r4 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 e4b71ee2b35a4e16b371ab9595e7335f WindowMaker-0.80.2.tar.gz 2532831 -RMD160 3a7ec7c98c07a8b8b103d9f1d21d766849cee714 WindowMaker-0.80.2.tar.gz 2532831 -SHA256 932eb1fa3b97110b42a48e9f2ae148120c30e7c00d34c7b1d87c4b11d6cb0615 WindowMaker-0.80.2.tar.gz 2532831 -MD5 07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz 238018 -RMD160 94334c2c12d20a8fd0cd2a70e54cd3689f043038 WindowMaker-extra-0.1.tar.gz 238018 -SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 WindowMaker-extra-0.1.tar.gz 238018 diff --git a/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild b/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild deleted file mode 100644 index 7d10fc2a6b20..000000000000 --- a/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild,v 1.17 2006/08/20 15:08:06 metalgod Exp $ - -inherit eutils flag-o-matic -filter-mfpmath "sse" "387" - -IUSE="alsa esd gif gnome jpeg kde nls oss png xinerama" - -MY_P=${P/windowm/WindowM} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="The fast and light GNUstep window manager" -SRC_URI="ftp://ftp.windowmaker.info/pub/source/release/${MY_P}.tar.gz - ftp://ftp.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz" -HOMEPAGE="http://www.windowmaker.info/" - -DEPEND="|| ( ( x11-libs/libXt - x11-libs/libXft ) - virtual/x11 ) - media-libs/hermes - >=media-libs/tiff-3.5.5 - gif? ( >=media-libs/giflib-4.1.0-r3 ) - png? ( >=media-libs/libpng-1.2.1 ) - jpeg? ( >=media-libs/jpeg-6b-r2 )" - -RDEPEND="${DEPEND} - nls? ( >=sys-devel/gettext-0.10.39 )" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~x86 ppc ~sparc ~alpha ~mips amd64 ppc64" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${PV}/${PN}-0.80.2-r1-gentoo.patch - - # scroll with the arrow keys - cd ${S}/WINGs - epatch ${FILESDIR}/${PV}/wlist.patch - - # transparency/translucency - cd ${S} - epatch ${FILESDIR}/${PV}/trance.patch.WM-0.80.2.diff - - # Add some BETTER xinerama support - use xinerama && epatch ${FILESDIR}/${PV}/xinerama.patch.bz2 - - # Fix GTK2 window flickering bug - epatch ${FILESDIR}/${PV}/gtk2flickerfix.patch - - # Add options to WPrefs for single-click launching of windows - # and maximize vs. shading when double-click on titlebars - # http://orbita.starmedia.com/~neofpo/home.html - epatch ${FILESDIR}/${PV}/wmfpo.patch -} - -src_compile() { - - local myconf - - use gnome \ - && myconf="${myconf} --enable-gnome" \ - || myconf="${myconf} --disable-gnome" - - use kde \ - && myconf="${myconf} --enable-kde" \ - && export KDEDIR=/usr/kde/2 \ - || myconf="${myconf} --disable-kde" - - if [ "$WITH_MODELOCK" ] ; then - myconf="${myconf} --enable-modelock" - else - myconf="${myconf} --disable-modelock" - fi - - use nls \ - && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" \ - || myconf="${myconf} --disable-nls --disable-locale" - - use gif \ - || myconf="${myconf} --disable-gif" - - use jpeg \ - || myconf="${myconf} --disable-jpeg" - - use png \ - || myconf="${myconf} --disable-png" - - - use esd || use alsa || use oss \ - && myconf="${myconf} --enable-sound" \ - || myconf="${myconf} --disable-sound" - - econf \ - --sysconfdir=/etc/X11 \ - --with-x \ - --enable-newstyle \ - --enable-superfluous \ - --enable-usermenu \ - --with-appspath=/usr/lib/GNUstep/Apps \ - --with-pixmapdir=/usr/share/pixmaps \ - ${myconf} || die - - cd ${S}/po - cp Makefile Makefile.orig - sed 's:zh_TW.*::' \ - Makefile.orig > Makefile - - cd ${S}/WPrefs.app/po - cp Makefile Makefile.orig - sed 's:zh_TW.*::' \ - Makefile.orig > Makefile - - cd ${S} - for file in ${S}/WindowMaker/*menu*; do - if [ -r $file ]; then - sed -e 's/\/usr\/local\/GNUstep/\/usr\/lib\/GNUstep/g; - s/\/usr\/local\/share\/WindowMaker/\/usr\/share\/WindowMaker/g;' < $file > $file.tmp; - mv $file.tmp $file; - fi; - done; - - cd ${S} - #0.80.1-r2 did not work with make -j4 (drobbins, 15 Jul 2002) - #with future Portage, this should become "emake -j1" - emake -j1 || die - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - econf || die - - emake -j1 || die -} - -src_install() { - - einstall \ - sysconfdir=${D}/etc/X11 \ - wprefsdir=${D}/usr/lib/GNUstep/Apps/WPrefs.app \ - wpdatadir=${D}/usr/lib/GNUstep/Apps/WPrefs.app \ - wpexecbindir=${D}/usr/lib/GNUstep/Apps/WPrefs.app || die - - cp -f WindowMaker/plmenu ${D}/etc/X11/WindowMaker/WMRootMenu - - dodoc AUTHORS BUGFORM BUGS ChangeLog COPYING* INSTALL* FAQ* \ - MIRRORS README* NEWS TODO - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - einstall || die - - newdoc README README.extra - - echo "#!/bin/bash" > wmaker - echo "/usr/bin/wmaker" >> wmaker - - exeinto /etc/X11/Sessions/ - doexe wmaker -} - -pkg_postinst() { - einfo "/usr/share/GNUstep/ has moved to /usr/lib/GNUstep/" - einfo "this means the WPrefs app has moved. If you have" - einfo "entries for this in your menus, please correct them" -}