From 5e9f5fae291e59dce83ec8f7fe81ecb4fe97b2a7 Mon Sep 17 00:00:00 2001 From: gryf Date: Sun, 15 Jan 2017 21:20:40 +0100 Subject: [PATCH] Patch for Window Maker which enables moving windows to another head --- x11-wm/windowmaker/Manifest | 17 +- .../singleclick-shadeormaxopts-0.9x.patch2 | 222 ------------------ .../windowmaker/files/0.91.0/wlist-0.9x.patch | 92 -------- .../0.92.0/windowmaker-0.92.0-configure.patch | 23 -- .../windowmaker-0.92.0-fullscreen.patch | 15 -- .../0.92.0/windowmaker-0.92.0-gcc41.patch | 131 ----------- .../windowmaker-0.92.0-gif-before-ungif.patch | 26 -- .../0.92.0/windowmaker-0.92.0-math_h.patch | 25 -- .../windowmaker-0.92.0-qtdialogsfix.patch | 84 ------- ...windowmaker-0.95.7-window_head_cycle.patch | 204 ++++++++++++++++ x11-wm/windowmaker/files/wmaker.desktop | 1 - .../files/wmaker_modelock_fix.patch | 68 ------ .../windowmaker-0.92.0-r899.ebuild | 196 ---------------- .../windowmaker/windowmaker-0.95.7-r10.ebuild | 106 +++++++++ 14 files changed, 314 insertions(+), 896 deletions(-) delete mode 100644 x11-wm/windowmaker/files/0.91.0/singleclick-shadeormaxopts-0.9x.patch2 delete mode 100644 x11-wm/windowmaker/files/0.91.0/wlist-0.9x.patch delete mode 100644 x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-configure.patch delete mode 100644 x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-fullscreen.patch delete mode 100644 x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-gcc41.patch delete mode 100644 x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-gif-before-ungif.patch delete mode 100644 x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-math_h.patch delete mode 100644 x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-qtdialogsfix.patch create mode 100644 x11-wm/windowmaker/files/windowmaker-0.95.7-window_head_cycle.patch delete mode 100644 x11-wm/windowmaker/files/wmaker_modelock_fix.patch delete mode 100644 x11-wm/windowmaker/windowmaker-0.92.0-r899.ebuild create mode 100644 x11-wm/windowmaker/windowmaker-0.95.7-r10.ebuild diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest index 2f3646b..c187444 100644 --- a/x11-wm/windowmaker/Manifest +++ b/x11-wm/windowmaker/Manifest @@ -1,15 +1,6 @@ -AUX 0.91.0/singleclick-shadeormaxopts-0.9x.patch2 7788 SHA256 4cdf6629afeaec576864f6738ffa62497e63a429d2db69ea5db01dbde3894f49 SHA512 a13cc4788bad749f172046f36c98ad5e57ea7c93369b91808f1e98ff40899dea474688f16bd7f4095035d6d04f2b112e331630a4f5e1faa3c8a21da2cf3ea605 WHIRLPOOL 1b201f714664e919c2746f6303112e98fdd97a70a9abaceda1385d183acbc054bd200f36164e47f017e4d4ca8cd201e357e85736901dd1ce66b62dbd2d04d123 -AUX 0.91.0/wlist-0.9x.patch 2980 SHA256 5f9ba4d49371e517834f9c8e1718cab943a682c43c573b1e6b6541bbf96b8a5d SHA512 653ef01a40c61a5eb46bdd2eca419d340ff5a338b20b28253204acc3acef80a2c171e0b24034c2ccae9bf79c70fc6478b53db9cfe5b22ad38608b027a3accc15 WHIRLPOOL 5c85f9714a2d9525796854ac3a7bb35418214d071c84f5f1cd7795f70a480d4272b65b3f6c3d7ea560fa2bf2c2138d3456cfacda208ae715000f877f9f0ffa13 -AUX 0.92.0/windowmaker-0.92.0-configure.patch 1003 SHA256 a71a4245be52013bb985b63508727fb19a379fbcbebfa89cdb00c02dbd796089 SHA512 9b5f82e650d7298e1ecd1d988eb441d4a91ea265600fba4012ab8bb3e2be5da7604dc7c0033edfcbf991f16a5ffa88ee71a86294ace7d3100f175d42e59116f1 WHIRLPOOL 09d23b9166a4f79ced7d53657ee81ca8d2be66df6a15bd19b0f60f7a0ee8305eca2d3d89580b7fe8f24c89362afb9f8db23c29412103c4710dbbf37eb53706b1 -AUX 0.92.0/windowmaker-0.92.0-fullscreen.patch 500 SHA256 28dfdcac0c073bc08c06042ccc5ea97f6833c948238085321f80e3a4b3c0683c SHA512 0c5b5e06e44fdeb5d066e00b8c919452f5e95088284693c67eac685712a644a323be2cf121ab6077129f748a1457201c2e35733e1299d948bf886e2608948c77 WHIRLPOOL 161cd677cf789d4b3e01764a39a0327488968d9ac2bf87fc2bde0afbbec17356aec77ef62ec52977531e7d907912e3fb19a6b6712219b75a6c018c831d1044d9 -AUX 0.92.0/windowmaker-0.92.0-gcc41.patch 5212 SHA256 aef2a3b6e3e74fad11e0c3cc338446b40e90af3f3a1b0d15d97c5e5d79449858 SHA512 bbe825634d095c8ed8ad7546340301a52d270b89299075f21642348d950caca2b9c4c7a6ffdce4f3637fd1ed5316855650dfe6e0c33e36ad6cb772ea0e1f9bdd WHIRLPOOL 4fbfa755aba2379169cce9d95b04320cc8785ef0e9c73b5a7f57b5d93e91e13de41380191927438b4388bd0c3b2ef45fe55cb028a468ec59d647b7fa85ef3b4a -AUX 0.92.0/windowmaker-0.92.0-gif-before-ungif.patch 877 SHA256 3b0608d45484f1d47b780baa68cede5bbbff2f28da65019aff0b0386cf0125b4 SHA512 444ccba8c523e58ff73749876ebb204a3002ca3d4a636f39468b108affcc99c7e3a3ef3b7b879a394aab656a9abd14779063b05893c880feedf474b6972d40d0 WHIRLPOOL dc79767f57162c6cadacfdd24e7e9a79b3507ae2d2c0cd2603ac225ff613d4fcb4a6fb46526d8ae02130d88598bc0742cf070e57685310833cd63bd4138faefd -AUX 0.92.0/windowmaker-0.92.0-math_h.patch 584 SHA256 b84fd57c6c1f9ca2b61354487bb09b55d1c9155dfde7b37d49fc115d1d44a28c SHA512 4a576532f7597378c830a5b3c2669ddc972497af56572bcce1975f257da2221427f90de412fe9c6e36b584619800aa71ff21c651aea307c35ca1d395ffa284f1 WHIRLPOOL bb7026e064c0dd43bb56d3c9c6edad99f3a2f0c38fdd4b4a4c7698826540137542baba9482b15ea3fe6f3c2b8f03db8e141f07c568083e27aee86c05eee3a6dd -AUX 0.92.0/windowmaker-0.92.0-qtdialogsfix.patch 2071 SHA256 5f442989d9d0ba352a8c327e4ffaa39e72362eb1719d9b50e5bb90f63c9b096f SHA512 741b2eef3709350ef518db5739c6758749bec23ab8ed1d9bccd642698ee6941bf78769953690b4747304b86cc19337e0b6304708287d64095b1d61ce7ebee033 WHIRLPOOL 0fad5b15ce07116f2b618e1958e3069373f53fb2b42504cd296b813782dbffc92f8e4403cfd732a87ad6b49c42fdd49ef8629c9e39cd9164376c8ede99432a75 -AUX wmaker.desktop 221 SHA256 40359d3c61117f0dbc5eb547e4c369982427e8bc3174c95002d34eb30f9a4a84 SHA512 1c1b24001e47a2af8f18a5f90675d095ba7f929ad9273ca82f61fd13ad35ff22dc9b777eec24fc3fd984790a5d494949d1dd5e0ca39780920017ea7971a3289d WHIRLPOOL 68ea31480ba1796e4243184deff38270963841c2bdb54bc85a606ecad0cdccc6815b11fa67158cbcc527ae3a17488b97a209283289922323ed42ea37a062ac2b -AUX wmaker_modelock_fix.patch 2257 SHA256 28aa382cd266cd7cb4002c3bc07566c809f2a4106fe9a8580be846c6b562d3bc SHA512 1fc1be99f06b2af302700575cacb2c0c41b39a7c48b68e8ef39a7040b912462e31e92b77143c4869e2807c9c2711791321abd44af36f3b33e1aaae572cc227da WHIRLPOOL 0c679b84ad938611a8717f02dc557fa5c878b496259689917c397db5739a65c43e5ce21035c5907bcf8b99c3d6865ce31a1e4f43c1d59a17b69cfee398fcf36e -DIST WindowMaker-0.92.0.tar.gz 2758524 SHA256 9edaa8d9ee6e6beb06f4c391c0aec5cd0e5b5494456cae2cdcfd49656177afc6 SHA512 3db6d7128d49ecd87d46893c63efcdda07f841bdfd5961462c0c9247d4f3937835f637dc7f4fa7169f6999595afca914c611f4249915700a461130c5a3c865d2 WHIRLPOOL 8d9395c79cdb23d4d6011dc5a1383852890f2d02fa0038a80cf81e2135b4a904065b4051fd1be07818136442f5ac792459f5cc81bc75ba090c1728aa4e4ef4cd +AUX windowmaker-0.95.7-window_head_cycle.patch 7731 SHA256 0a4244a80143122aecfac2c475177dd5471019266d70ecf4942fe241fc73f247 SHA512 162cad0bf2a38201f0dec0160cab50cc15db487ef0bf433850a6106944edccea0e5a7f5a1ed0e852518a8156230e39c4c02cc5aba71349b38852dd1510bc7186 WHIRLPOOL d2e433b05ecc8a28d16a9a87ba3ae4e307949f301af220d39e0c4f685109d57e4511a0d08a0b1b4abc56b72a87303e1f7b62e004cb2d58e54c6b99cce4f3976a +AUX wmaker.desktop 206 SHA256 b17a028d32c5b174ce5a64624b26f0830db4fec3bdc0b03c5c0870b936683f43 SHA512 d1dc99aa29047434e1265c8f93ce366b7c026f27eec8a166904fda1ab4144e0d6142807ac09ba6cbcb86480257893e5553046a0ba1a8e1d6315f23dd8468482b WHIRLPOOL d2bd3bbf8f262cccd838a3dd53c0017b500507e8a2a8e2dbaea4fa060084db078f0f6eef0a971cfda6fc4015a65ce4afa61de1a53b9115730014f3497ba77c0d +DIST WindowMaker-0.95.7.tar.gz 3238325 SHA256 842d486c4b212b19d10dbae2c315c6ff20c6e651471eaa45214b3b832d8097a9 SHA512 9c1190503efdc58c11a90d5ba80796979cdc9f2beb69a6d233ffc8d531a54c877c5270841bf6318738069098cd488e5ab77ac19f661ac888e892bf05ac22d93f WHIRLPOOL 090efc24fe47487b5f9ec68e821b0fea789ac4f7badccf639a5910f463613381701c6750db29f98e6777207387850e0c47324ffc8fcc1d1b4fe60ac05c05c25d DIST WindowMaker-extra-0.1.tar.gz 238018 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8 WHIRLPOOL f2c61b318f64a2debb727ae79dfa1bb8101888bc9492633a96ace0e704c731c383e92882c871622987d5971b919359c066638fba05c5dade330fe3bee21bb034 -DIST windowmaker-0.92.0-patchset-3.tar.bz2 220812 SHA256 8d50cb8c7ac9370b6870e9d220968485d8bafddb896aab04b88a93cae306c5a9 -EBUILD windowmaker-0.92.0-r899.ebuild 6853 SHA256 d3985c98a26b71f47bac249ded976c5ced3dca9ac86037941249b924476e9a6f SHA512 9225dcfb331c2148192c76fc9d1fd14e7060fedc59ede84486173a5d34781d4408f09a1c2cba01d206fd1ae6eda75f13827723c9d83d7027496b3be9a19b71f4 WHIRLPOOL 8e1e174ac77918381fce865dac3c7dc3f75185711eec02af07a39eef0262c0652b5b33f25d5a37cb98e8ce23501aed1016044c793b30b7ec97628e3ee307eeef +EBUILD windowmaker-0.95.7-r10.ebuild 3015 SHA256 0e5731d690106b440f89ebbf185d476637a7442675593455e06fb80293aeb2bc SHA512 5f7189a7c958692484dcc3df2fdb91f2f4e0019a7aeeff9e05cceeace6d635f84bfe5474b0209103cc38d4eb50ee9907ca8bd30ee1cc0ae6d002c9bfd1b5d2eb WHIRLPOOL 8835b904f146acc02a2622f71ab0ff69a3f032f8a6ee65d591da6279dc6fa3ab70810188e8141f82e346d453d57b8fa8f9f2b5e50be1b03c02d07a1bb88a8034 EBUILD windowmaker-9999.ebuild 2769 SHA256 344ab852dd0b9f3cceb37688151aec132bd25b5b39b014c835555672e2defd68 SHA512 83ff903c49c464562b7a24ebe06fe368e3c00503d023ac0693c12e81140dee054fa0bb133de4270000e2c35ad10231b24993f6c1be43bee34e44012ab832c7c9 WHIRLPOOL e8673810935dc75dd4d488e13570ed098b237cdb3c75d82688515bde64b77dfce7b66d72a29018408941549a5a9898d18d1ebf2dc5e0eb7c37bf68488abaff03 diff --git a/x11-wm/windowmaker/files/0.91.0/singleclick-shadeormaxopts-0.9x.patch2 b/x11-wm/windowmaker/files/0.91.0/singleclick-shadeormaxopts-0.9x.patch2 deleted file mode 100644 index dd37b92..0000000 --- a/x11-wm/windowmaker/files/0.91.0/singleclick-shadeormaxopts-0.9x.patch2 +++ /dev/null @@ -1,222 +0,0 @@ ---- WindowMaker-0.91.0/WPrefs.app/Expert.c 2005-05-21 17:04:42.000000000 -0700 -+++ /tmp/WindowMaker-0.91.0/WPrefs.app/Expert.c 2005-05-21 16:10:41.000000000 -0700 -@@ -54,9 +54,10 @@ - WMSetButtonSelected(panel->swi[4], GetBoolForKey("DontConfirmKill")); - WMSetButtonSelected(panel->swi[5], GetBoolForKey("DisableBlinking")); - WMSetButtonSelected(panel->swi[6], GetBoolForKey("AntialiasedText")); -+ WMSetButtonSelected(panel->swi[7], GetBoolForKey("DCMaximize")); -+ WMSetButtonSelected(panel->swi[8], GetBoolForKey("SingleClickLaunch")); - } - -- - static void - createPanel(Panel *p) - { -@@ -66,10 +67,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 minimized windows). For use with KDE/GNOME.")); -@@ -81,6 +82,9 @@ - WMSetButtonText(panel->swi[6], _("Smooth font edges (needs restart).")); - - WMSetButtonEnabled(panel->swi[6], True); -+ 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); -@@ -103,6 +107,8 @@ - SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "DontConfirmKill"); - SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DisableBlinking"); - SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "AntialiasedText"); -+ SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "DCMaximize"); -+ SetBoolForKey(WMGetButtonSelected(panel->swi[8]), "SingleClickLaunch"); - } - - ---- WindowMaker-0.91.0/src/WindowMaker.h 2005-05-21 17:04:42.000000000 -0700 -+++ /tmp/WindowMaker-0.91.0/src/WindowMaker.h 2005-05-21 16:10:41.000000000 -0700 -@@ -466,6 +466,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; - ---- WindowMaker-0.91.0/src/appicon.c 2005-05-21 17:04:42.000000000 -0700 -+++ /tmp/WindowMaker-0.91.0/src/appicon.c 2005-05-21 16:10:41.000000000 -0700 -@@ -585,6 +585,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; -@@ -665,6 +666,7 @@ - break; - - case MotionNotify: -+ hasMoved = True; - if (!grabbed) { - if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD - || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { -@@ -802,6 +804,9 @@ - if (wPreferences.auto_arrange_icons) - wArrangeIcons(scr, True); - -+ if (!hasMoved && wPreferences.single_click) -+ iconDblClick(desc, event); -+ - done = 1; - break; - } ---- WindowMaker-0.91.0/src/defaults.c 2005-05-21 17:04:42.000000000 -0700 -+++ /tmp/WindowMaker-0.91.0/src/defaults.c 2005-05-21 16:10:41.000000000 -0700 -@@ -556,6 +556,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 ---- WindowMaker-0.91.0/src/dock.c 2005-05-21 17:04:42.000000000 -0700 -+++ /tmp/WindowMaker-0.91.0/src/dock.c 2005-05-21 16:12:58.000000000 -0700 -@@ -3758,7 +3758,7 @@ - - - --static void -+static Bool - handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event) - { - WScreen *scr = dock->screen_ptr; -@@ -3774,6 +3774,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!!! */ - -@@ -3828,6 +3829,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) { -@@ -3977,7 +3979,7 @@ - #ifdef DEBUG - puts("End icon move"); - #endif -- return; -+ return hasMoved; - } - } - } -@@ -4114,10 +4116,13 @@ - if (getClipButton(event->xbutton.x, event->xbutton.y)!=CLIP_IDLE - && dock->type==WM_CLIP) - handleClipChangeWorkspace(scr, event); -- else -- handleDockMove(dock, aicon, event); -- } else -- handleIconMove(dock, aicon, event); -+ else -+ handleDockMove(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) { ---- WindowMaker-0.91.0/src/icon.c 2005-05-21 17:04:42.000000000 -0700 -+++ /tmp/WindowMaker-0.91.0/src/icon.c 2005-05-21 16:10:41.000000000 -0700 -@@ -891,6 +891,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; -@@ -942,6 +943,7 @@ - break; - - case MotionNotify: -+ hasMoved = True; - if (!grabbed) { - if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD - || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { -@@ -979,6 +981,9 @@ - - if (wPreferences.auto_arrange_icons) - wArrangeIcons(wwin->screen_ptr, True); -+ if (!hasMoved && wPreferences.single_click) -+ miniwindowDblClick(desc, event); -+ - return; - - } ---- WindowMaker-0.91.0/src/window.c 2005-05-21 17:04:42.000000000 -0700 -+++ /tmp/WindowMaker-0.91.0/src/window.c 2005-05-21 16:10:41.000000000 -0700 -@@ -3089,13 +3089,29 @@ - - if (event->xbutton.button==Button1) { - if (event->xbutton.state == 0) { -- if (!WFLAGP(wwin, no_shadeable)) { -+ /* 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); -+ wUnshadeWindow(wwin); - else -- wShadeWindow(wwin); -- } -+ wShadeWindow(wwin); -+ } -+ } - } else { - int dir = 0; - diff --git a/x11-wm/windowmaker/files/0.91.0/wlist-0.9x.patch b/x11-wm/windowmaker/files/0.91.0/wlist-0.9x.patch deleted file mode 100644 index c165cce..0000000 --- a/x11-wm/windowmaker/files/0.91.0/wlist-0.9x.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -ur WindowMaker-0.91.0/WINGs/wlist.c WindowMaker-0.91.0-test/WINGs/wlist.c ---- WindowMaker-0.91.0/WINGs/wlist.c 2004-10-12 14:36:42.000000000 -0400 -+++ WindowMaker-0.91.0-test/WINGs/wlist.c 2005-03-13 13:37:39.914633856 -0500 -@@ -4,6 +4,8 @@ - - #include "WINGsP.h" - -+#include -+ - char *WMListDidScrollNotification = "WMListDidScrollNotification"; - char *WMListSelectionDidChangeNotification = "WMListSelectionDidChangeNotification"; - -@@ -44,6 +46,7 @@ - unsigned int redrawPending:1; - unsigned int buttonPressed:1; - unsigned int buttonWasPressed:1; -+ unsigned int focused:1; - } flags; - } List; - -@@ -141,10 +144,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; -@@ -1044,6 +1047,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) { -@@ -1096,6 +1104,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; -@@ -1202,6 +1214,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); -Only in WindowMaker-0.91.0-test/WINGs: wlist.c.orig diff --git a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-configure.patch b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-configure.patch deleted file mode 100644 index e3b50ac..0000000 --- a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-configure.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- configure.ac.orig 2007-08-27 00:51:31.000000000 +0200 -+++ configure.ac 2007-08-27 00:52:14.000000000 +0200 -@@ -197,7 +197,7 @@ - - AC_CACHE_CHECK(whether gcc supports x86 inline asm, - ac_cv_c_inline_asm, -- [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n":: -+ [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n\t pushal\n\t popal":: - "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x), - "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x));}], - ac_cv_c_inline_asm=yes, -@@ -840,11 +840,6 @@ - else - gnustepdir=$appspath - -- if test "x$GNUSTEP_LOCAL_ROOT" != "x" ; then -- gnustepdir=`echo "$GNUSTEP_LOCAL_ROOT" | sed -e "s|^${prefix}|prefix|"` -- gnustepdir=`echo $gnustepdir | sed -e 's|^prefix|${prefix}|'` -- fi -- - wprefs_base_dir=$gnustepdir/Applications - wprefs_datadir=$wprefs_base_dir/WPrefs.app - wprefs_bindir=$wprefs_base_dir/WPrefs.app diff --git a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-fullscreen.patch b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-fullscreen.patch deleted file mode 100644 index cbb4c0a..0000000 --- a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-fullscreen.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: src/event.c -=================================================================== ---- src/event.c (revision 41) -+++ src/event.c (working copy) -@@ -559,6 +559,10 @@ - wwin->flags.skip_next_animation = 1; - wIconifyWindow(wwin); - } -+ if (wwin->flags.fullscreen) { -+ wwin->flags.fullscreen = 0; -+ wFullscreenWindow(wwin); -+ } - if (wwin->flags.hidden) { - WApplication *wapp = wApplicationOf(wwin->main_window); - diff --git a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-gcc41.patch b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-gcc41.patch deleted file mode 100644 index 4312435..0000000 --- a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-gcc41.patch +++ /dev/null @@ -1,131 +0,0 @@ ---- NEW FILE windowmaker-gcc4-x86_64.patch --- ---- WindowMaker-0.92.0/wrlib/x86_specific.c 2004-10-31 02:44:01.000000000 +0100 -+++ WindowMaker-0.92.0/wrlib/x86_specific.c 2005-08-22 21:07:57.000000000 +0200 -@@ -98,15 +98,23 @@ - int height, - int line_offset) - { -- long long rrggbbaa; -- long long pixel; -+ union { -+ long long rrggbbaa; -+ struct {short int rr, gg, bb, aa;} words; -+ } rrggbbaa; -+ -+ union { -+ long long pixel; -+ struct {short int rr, gg, bb, aa;} words; -+ } pixel; -+ - short *tmp_err; - short *tmp_nerr; - int x; - - asm volatile - ( -- "pushal \n\t" -+ "pushl %%ebx \n\t" - - // pack dr, dg and db into mm6 - "movl %7, %%eax \n\t" -@@ -290,7 +298,7 @@ - - ".Enda: \n\t" // THE END - "emms \n\t" -- "popal \n\t" -+ "popl %%ebx \n\t" - : - : - "m" (image), // %0 -@@ -309,17 +317,18 @@ - "m" (width), // %13 - "m" (height), // %14 - "m" (line_offset), // %15 -- "m" (rrggbbaa), // %16 (access to rr) -- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg) -- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb) -- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa) -- "m" (pixel), // %20 (access to pixel.r) -- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g) -- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b) -- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a) -+ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr) -+ "m" (rrggbbaa.words.gg), // %17 (access to gg) -+ "m" (rrggbbaa.words.bb), // %18 (access to bb) -+ "m" (rrggbbaa.words.aa), // %19 (access to aa) -+ "m" (pixel.pixel), // %20 (access to pixel.r) -+ "m" (pixel.words.gg), // %21 (access to pixel.g) -+ "m" (pixel.words.bb), // %22 (access to pixel.b) -+ "m" (pixel.words.aa), // %23 (access to pixel.a) - "m" (tmp_err), // %24 - "m" (tmp_nerr), // %25 - "m" (x) // %26 -+ : "eax", "ecx", "edx", "esi", "edi" - ); - } - -@@ -342,8 +351,15 @@ - int height, - int line_offset) - { -- long long rrggbbaa; -- long long pixel; -+ union { -+ long long rrggbbaa; -+ struct {short int rr, gg, bb, aa;} words; -+ } rrggbbaa; -+ -+ union { -+ long long pixel; -+ struct {short int rr, gg, bb, aa;} words; -+ } pixel; - - short *tmp_err; - short *tmp_nerr; -@@ -354,7 +370,7 @@ - - asm volatile - ( -- "pushal \n\t" -+ "pushl %%ebx \n\t" - - "movl %13, %%eax \n\t" // eax = width - "movl %%eax, %%ebx \n\t" -@@ -424,7 +440,7 @@ - - ".Endc: \n\t" // THE END - "emms \n\t" -- "popal \n\t" -+ "popl %%ebx \n\t" - : - : - "m" (image), // %0 -@@ -443,19 +459,20 @@ - "m" (width), // %13 - "m" (height), // %14 - "m" (line_offset), // %15 -- "m" (rrggbbaa), // %16 (access to rr) -- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg) -- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb) -- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa) -- "m" (pixel), // %20 (access to pixel.r) -- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g) -- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b) -- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a) -+ "m" (rrggbbaa.rrggbbaa), // %16 (access to rr) -+ "m" (rrggbbaa.words.gg), // %17 (access to gg) -+ "m" (rrggbbaa.words.bb), // %18 (access to bb) -+ "m" (rrggbbaa.words.aa), // %19 (access to aa) -+ "m" (pixel.pixel), // %20 (access to pixel.r) -+ "m" (pixel.words.gg), // %21 (access to pixel.g) -+ "m" (pixel.words.bb), // %22 (access to pixel.b) -+ "m" (pixel.words.aa), // %23 (access to pixel.a) - "m" (tmp_err), // %24 - "m" (tmp_nerr), // %25 - "m" (x), // %26 - "m" (w1), // %27 - "m" (w2) // %28 -+ : "eax", "ecx", "edx", "esi", "edi" - ); - } - diff --git a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-gif-before-ungif.patch b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-gif-before-ungif.patch deleted file mode 100644 index 7efc229..0000000 --- a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-gif-before-ungif.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -705,17 +705,17 @@ - - if test "$gif" = yes; then - my_libname="" -- WM_CHECK_LIB(ungif, DGifOpenFileName, [$XLFLAGS $XLIBS]) -- if test "x$ac_cv_lib_ungif_DGifOpenFileName" = xyes; then -- my_libname=-lungif -+ WM_CHECK_LIB(gif, DGifOpenFileName, [$XLFLAGS $XLIBS]) -+ if test "x$ac_cv_lib_gif_DGifOpenFileName" = xyes; then -+ my_libname=-lgif - fi - dnl - dnl libungif is the same thing as libgif for all practical purposes. - dnl - if test "x$my_libname" = x; then -- WM_CHECK_LIB(gif, DGifOpenFileName, [$XLFLAGS $XLIBS]) -- if test "x$ac_cv_lib_gif_DGifOpenFileName" = xyes; then -- my_libname=-lgif -+ WM_CHECK_LIB(ungif, DGifOpenFileName, [$XLFLAGS $XLIBS]) -+ if test "x$ac_cv_lib_ungif_DGifOpenFileName" = xyes; then -+ my_libname=-lungif - fi - fi - diff --git a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-math_h.patch b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-math_h.patch deleted file mode 100644 index 8c83d4d..0000000 --- a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-math_h.patch +++ /dev/null @@ -1,25 +0,0 @@ - - Add a missing #include . - ---- WindowMaker-0.92.0/configure.ac -+++ WindowMaker-0.92.0/configure.ac -@@ -78,7 +78,8 @@ - [ --with-incs-from pass compiler flags to look for header files], - [inc_search_path="$withval $inc_search_path"]) - -- -+AC_CHECK_LIBM -+AC_SUBST([LIBM]) - - dnl Checks for library functions. - dnl ============================ ---- WindowMaker-0.92.0/src/placement.c -+++ WindowMaker-0.92.0/src/placement.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #include "WindowMaker.h" - #include "wcore.h" diff --git a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-qtdialogsfix.patch b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-qtdialogsfix.patch deleted file mode 100644 index 626630e..0000000 --- a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-qtdialogsfix.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- src/wmspec.c.sav 2004-10-24 21:36:15.000000000 +0200 -+++ src/wmspec.c 2005-01-26 17:13:54.266216856 +0100 -@@ -314,15 +314,15 @@ - void - wNETWMUpdateDesktop(WScreen *scr) - { -- CARD32 *views, sizes[2]; -+ long *views, sizes[2]; - int count, i; - - if (scr->workspace_count==0) - return; - - count = scr->workspace_count * 2; -- views = wmalloc(sizeof(CARD32) * count); -- /*memset(views, 0, sizeof(CARD32) * count);*/ -+ views = wmalloc(sizeof(long) * count); -+ /*memset(views, 0, sizeof(long) * count);*/ - - #ifdef VIRTUAL_DESKTOP - sizes[0] = scr->workspaces[scr->current_workspace]->width; -@@ -362,7 +362,7 @@ - 0, 1, &count); - if (prop) - { -- int desktop= *(CARD32*)prop; -+ int desktop= *(long*)prop; - XFree(prop); - return desktop; - } -@@ -426,7 +426,7 @@ - static void - updateShowDesktop(WScreen * scr, Bool show) - { -- CARD32 foo; -+ long foo; - - foo = (show == True); - XChangeProperty(dpy, scr->root_win, net_showing_desktop, XA_CARDINAL, 32, -@@ -599,7 +599,7 @@ - void - wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea) - { -- CARD32 *area; -+ long *area; - int count, i; - - /* XXX: not Xinerama compatible, -@@ -609,7 +609,7 @@ - return; - - count = scr->workspace_count * 4; -- area = wmalloc(sizeof(CARD32) * count); -+ area = wmalloc(sizeof(long) * count); - for (i=0; iworkspace_count; i++) { - area[4*i + 0] = usableArea.x1; - area[4*i + 1] = usableArea.y1; -@@ -732,7 +732,7 @@ - static void - updateWorkspaceCount(WScreen *scr) /* changeable */ - { -- CARD32 count; -+ long count; - - count = scr->workspace_count; - -@@ -744,7 +744,7 @@ - static void - updateCurrentWorkspace(WScreen *scr) /* changeable */ - { -- CARD32 count; -+ long count; - - count = scr->current_workspace; - -@@ -791,7 +791,7 @@ - static void - updateWorkspaceHint(WWindow *wwin, Bool fake, Bool del) - { -- CARD32 l; -+ long l; - - if (del) { - XDeleteProperty(dpy, wwin->client_win, net_wm_desktop); diff --git a/x11-wm/windowmaker/files/windowmaker-0.95.7-window_head_cycle.patch b/x11-wm/windowmaker/files/windowmaker-0.95.7-window_head_cycle.patch new file mode 100644 index 0000000..61a3e4c --- /dev/null +++ b/x11-wm/windowmaker/files/windowmaker-0.95.7-window_head_cycle.patch @@ -0,0 +1,204 @@ +diff --git a/src/actions.c b/src/actions.c +index 5adfab4..5ac98c6 100644 +--- a/src/actions.c ++++ b/src/actions.c +@@ -354,7 +354,7 @@ void update_saved_geometry(WWindow *wwin) + save_old_geometry(wwin, SAVE_GEOMETRY_X); + } + +-void wMaximizeWindow(WWindow *wwin, int directions) ++void wMaximizeWindow(WWindow *wwin, int directions, int head) + { + unsigned int new_width, new_height, half_scr_width, half_scr_height; + int new_x = 0; +@@ -388,20 +388,7 @@ void wMaximizeWindow(WWindow *wwin, int directions) + totalArea.y2 = scr->scr_height; + totalArea.x1 = 0; + totalArea.y1 = 0; +- usableArea = totalArea; +- +- if (!(directions & MAX_IGNORE_XINERAMA)) { +- WScreen *scr = wwin->screen_ptr; +- int head; +- +- if (directions & MAX_KEYBOARD) +- head = wGetHeadForWindow(wwin); +- else +- head = wGetHeadForPointerLocation(scr); +- +- usableArea = wGetUsableAreaForHead(scr, head, &totalArea, True); +- } +- ++ usableArea = wGetUsableAreaForHead(scr, head, &totalArea, True); + + /* Only save directions, not kbd or xinerama hints */ + directions &= (MAX_HORIZONTAL | MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS); +@@ -497,20 +484,51 @@ void handleMaximize(WWindow *wwin, int directions) + int requested = directions & (MAX_HORIZONTAL | MAX_VERTICAL | MAX_LEFTHALF | MAX_RIGHTHALF | MAX_TOPHALF | MAX_BOTTOMHALF | MAX_MAXIMUS); + int effective = requested ^ current; + int flags = directions & ~requested; ++ int head = wGetHeadForWindow(wwin); ++ WMPoint p; + + if (!effective) { + /* allow wMaximizeWindow to restore the Maximusized size */ + if ((wwin->flags.old_maximized & MAX_MAXIMUS) && + !(requested & MAX_MAXIMUS)) +- wMaximizeWindow(wwin, MAX_MAXIMUS | flags); +- else +- wUnmaximizeWindow(wwin); ++ wMaximizeWindow(wwin, MAX_MAXIMUS | flags, head); ++ else { ++ if (requested & MAX_LEFTHALF && current & MAX_LEFTHALF) { ++ p.x = wwin->frame_x - 100; ++ p.y = 0; ++ ++ if (p.x > 0) { ++ head = wGetHeadForPoint(wwin->screen_ptr, p); ++ if (head != wGetHeadForWindow(wwin)) { ++ effective |= MAX_RIGHTHALF; ++ effective |= MAX_VERTICAL; ++ effective &= ~(MAX_HORIZONTAL | MAX_LEFTHALF); ++ wMaximizeWindow(wwin, effective | flags, head); ++ } ++ } ++ } ++ else if (requested & MAX_RIGHTHALF && current & MAX_RIGHTHALF) { ++ p.x = wwin->frame_x + wwin->frame->core->width + 100; ++ p.y = 0; ++ head = wGetHeadForPoint(wwin->screen_ptr, p); ++ if (head != wGetHeadForWindow(wwin)) { ++ effective |= MAX_LEFTHALF; ++ effective |= MAX_VERTICAL; ++ effective &= ~(MAX_HORIZONTAL | MAX_RIGHTHALF); ++ wMaximizeWindow(wwin, effective | flags, head); ++ } ++ } ++ } + /* these alone mean vertical|horizontal toggle */ + } else if ((effective == MAX_LEFTHALF) || + (effective == MAX_RIGHTHALF) || + (effective == MAX_TOPHALF) || + (effective == MAX_BOTTOMHALF)) + wUnmaximizeWindow(wwin); ++ else if (requested & MAX_LEFTHALF && current & MAX_RIGHTHALF) ++ wMaximizeWindow(wwin, (MAX_HORIZONTAL|MAX_VERTICAL), head); ++ else if (requested & MAX_RIGHTHALF && current & MAX_LEFTHALF) ++ wMaximizeWindow(wwin, (MAX_HORIZONTAL|MAX_VERTICAL), head); + else { + if ((requested == (MAX_HORIZONTAL | MAX_VERTICAL)) || + (requested == MAX_MAXIMUS)) +@@ -552,7 +570,7 @@ void handleMaximize(WWindow *wwin, int directions) + effective &= ~(MAX_TOPHALF | MAX_BOTTOMHALF); + effective &= ~MAX_MAXIMUS; + } +- wMaximizeWindow(wwin, effective | flags); ++ wMaximizeWindow(wwin, effective | flags, head); + } + } + +diff --git a/src/actions.h b/src/actions.h +index 8390e49..a15cf48 100644 +--- a/src/actions.h ++++ b/src/actions.h +@@ -57,7 +57,7 @@ void wSelectWindows(WScreen *scr, XEvent *ev); + void wSelectWindow(WWindow *wwin, Bool flag); + void wUnselectWindows(WScreen *scr); + +-void wMaximizeWindow(WWindow *wwin, int directions); ++void wMaximizeWindow(WWindow *wwin, int directions, int head); + void wUnmaximizeWindow(WWindow *wwin); + void handleMaximize(WWindow *wwin, int directions); + +diff --git a/src/event.c b/src/event.c +index e7ee074..54c191f 100644 +--- a/src/event.c ++++ b/src/event.c +@@ -632,7 +632,8 @@ static void handleMapRequest(XEvent * ev) + if (wwin) { + wClientSetState(wwin, NormalState, None); + if (wwin->flags.maximized) { +- wMaximizeWindow(wwin, wwin->flags.maximized); ++ wMaximizeWindow(wwin, wwin->flags.maximized, ++ wGetHeadForWindow(wwin)); + } + if (wwin->flags.shaded) { + wwin->flags.shaded = 0; +diff --git a/src/window.c b/src/window.c +index 532670c..8945a54 100644 +--- a/src/window.c ++++ b/src/window.c +@@ -2855,7 +2855,7 @@ static void titlebarDblClick(WCoreWindow *sender, void *data, XEvent *event) + int ndir = dir ^ wwin->flags.maximized; + + if (ndir != 0) +- wMaximizeWindow(wwin, ndir); ++ wMaximizeWindow(wwin, ndir, wGetHeadForWindow(wwin)); + else + wUnmaximizeWindow(wwin); + } +diff --git a/src/winmenu.c b/src/winmenu.c +index c7da09d..fc63fc6 100644 +--- a/src/winmenu.c ++++ b/src/winmenu.c +@@ -169,7 +169,7 @@ static void execWindowOptionCommand(WMenu * menu, WMenuEntry * entry) + static void execMaximizeCommand(WMenu * menu, WMenuEntry * entry) + { + WWindow *wwin = (WWindow *) entry->clientdata; +- ++ + /* Parameter not used, but tell the compiler that it is ok */ + (void) menu; + +@@ -277,7 +277,8 @@ static void execMenuCommand(WMenu * menu, WMenuEntry * entry) + if (wwin->flags.maximized) + wUnmaximizeWindow(wwin); + else +- wMaximizeWindow(wwin, MAX_VERTICAL | MAX_HORIZONTAL); ++ wMaximizeWindow(wwin, MAX_VERTICAL | MAX_HORIZONTAL, ++ wGetHeadForWindow(wwin)); + break; + + case MC_SHADE: +diff --git a/src/wmspec.c b/src/wmspec.c +index 9b56f96..96ba984 100644 +--- a/src/wmspec.c ++++ b/src/wmspec.c +@@ -1120,9 +1120,11 @@ static void doStateAtom(WWindow *wwin, Atom state, int set, Bool init) + wwin->flags.maximized |= (set ? MAX_VERTICAL : 0); + } else { + if (set) +- wMaximizeWindow(wwin, wwin->flags.maximized | MAX_VERTICAL); ++ wMaximizeWindow(wwin, wwin->flags.maximized | MAX_VERTICAL, ++ wGetHeadForWindow(wwin)); + else +- wMaximizeWindow(wwin, wwin->flags.maximized & ~MAX_VERTICAL); ++ wMaximizeWindow(wwin, wwin->flags.maximized & ~MAX_VERTICAL, ++ wGetHeadForWindow(wwin)); + } + } else if (state == net_wm_state_maximized_horz) { + if (set == _NET_WM_STATE_TOGGLE) +@@ -1132,9 +1134,11 @@ static void doStateAtom(WWindow *wwin, Atom state, int set, Bool init) + wwin->flags.maximized |= (set ? MAX_HORIZONTAL : 0); + } else { + if (set) +- wMaximizeWindow(wwin, wwin->flags.maximized | MAX_HORIZONTAL); ++ wMaximizeWindow(wwin, wwin->flags.maximized | MAX_HORIZONTAL, ++ wGetHeadForWindow(wwin)); + else +- wMaximizeWindow(wwin, wwin->flags.maximized & ~MAX_HORIZONTAL); ++ wMaximizeWindow(wwin, wwin->flags.maximized & ~MAX_HORIZONTAL, ++ wGetHeadForWindow(wwin)); + } + } else if (state == net_wm_state_hidden) { + if (set == _NET_WM_STATE_TOGGLE) +@@ -1623,7 +1627,8 @@ Bool wNETWMProcessClientMessage(XClientMessageEvent *event) + wwin->flags.maximized = maximized; + wUnmaximizeWindow(wwin); + } else { +- wMaximizeWindow(wwin, wwin->flags.maximized); ++ wMaximizeWindow(wwin, wwin->flags.maximized, ++ wGetHeadForWindow(wwin)); + } + } + updateStateHint(wwin, False, False); diff --git a/x11-wm/windowmaker/files/wmaker.desktop b/x11-wm/windowmaker/files/wmaker.desktop index 1bda476..fd24a0b 100644 --- a/x11-wm/windowmaker/files/wmaker.desktop +++ b/x11-wm/windowmaker/files/wmaker.desktop @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 # The names/descriptions should really be better Name=GNUStep WindowMaker Comment=Use this session to run WindowMaker as your desktop environment diff --git a/x11-wm/windowmaker/files/wmaker_modelock_fix.patch b/x11-wm/windowmaker/files/wmaker_modelock_fix.patch deleted file mode 100644 index 250c610..0000000 --- a/x11-wm/windowmaker/files/wmaker_modelock_fix.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -ur WindowMaker-0.92.0_orig/src/window.c WindowMaker-0.92.0/src/window.c ---- WindowMaker-0.92.0_orig/src/window.c 2005-07-01 02:56:11.000000000 +0200 -+++ WindowMaker-0.92.0/src/window.c 2010-07-17 12:07:44.000000000 +0200 -@@ -1301,7 +1301,9 @@ - if (WFLAGP(wwin, no_miniaturize_button)) - foo |= WFF_LEFT_BUTTON; - #ifdef XKB_BUTTON_HINT -- if (WFLAGP(wwin, no_language_button) || WFLAGP(wwin, no_focusable)) -+ if (wPreferences.modelock -+ && (WFLAGP(wwin, no_language_button) -+ || WFLAGP(wwin, no_focusable))) - foo |= WFF_LANGUAGE_BUTTON; - #endif - if (foo!=0) -@@ -1613,7 +1615,8 @@ - foo = WFF_RIGHT_BUTTON|WFF_BORDER; - foo |= WFF_TITLEBAR; - #ifdef XKB_BUTTON_HINT -- foo |= WFF_LANGUAGE_BUTTON; -+ if (wPreferences.modelock) -+ foo |= WFF_LANGUAGE_BUTTON; - #endif - - wwin->frame = wFrameWindowCreate(scr, WMFloatingLevel, -@@ -2435,7 +2438,8 @@ - } - - #ifdef XKB_BUTTON_HINT -- if (!WFLAGP(wwin, no_language_button)) { -+ if (wPreferences.modelock -+ && !WFLAGP(wwin, no_language_button)) { - if (fwin->languagebutton_image && - !fwin->languagebutton_image->shared) { - wPixmapDestroy(fwin->languagebutton_image); -@@ -2518,7 +2522,8 @@ - flags = WFF_LEFT_BUTTON|WFF_RIGHT_BUTTON; - - #ifdef XKB_BUTTON_HINT -- flags |= WFF_LANGUAGE_BUTTON; -+ if (wPreferences.modelock) -+ flags |= WFF_LANGUAGE_BUTTON; - #endif - - if (HAS_TITLEBAR(wwin)) -@@ -2546,10 +2551,10 @@ - flags |= WFF_LEFT_BUTTON; - - #ifdef XKB_BUTTON_HINT -- if (!WFLAGP(wwin, no_language_button) -- && wwin->frame->flags.hide_language_button) { -+ if (wPreferences.modelock -+ && !WFLAGP(wwin, no_language_button) -+ && wwin->frame->flags.hide_language_button) - flags |= WFF_LANGUAGE_BUTTON; -- } - #endif - - if (!WFLAGP(wwin, no_close_button) -@@ -2567,7 +2572,8 @@ - flags |= WFF_LEFT_BUTTON; - - #ifdef XKB_BUTTON_HINT -- if (WFLAGP(wwin, no_language_button) -+ if (wPreferences.modelock -+ && WFLAGP(wwin, no_language_button) - && !wwin->frame->flags.hide_language_button) - flags |= WFF_LANGUAGE_BUTTON; - #endif diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r899.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r899.ebuild deleted file mode 100644 index 3e5e13f..0000000 --- a/x11-wm/windowmaker/windowmaker-0.92.0-r899.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r8.ebuild,v 1.11 2010/07/14 01:05:24 jer Exp $ - -EAPI=1 - -inherit autotools eutils gnustep-base flag-o-matic - -PATCHVER=3 -S=${WORKDIR}/${P/windowm/WindowM} - -DESCRIPTION="The fast and light GNUstep window manager" -SRC_URI="ftp://ftp.windowmaker.info/pub/source/release/${P/windowm/WindowM}.tar.gz - http://www.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz - mirror://gentoo/${P}-patchset-${PATCHVER}.tar.bz2" -HOMEPAGE="http://www.windowmaker.info/" - -IUSE="gif gnustep jpeg nls png tiff modelock +vdesktop xinerama" -DEPEND="x11-libs/libXv - >=x11-libs/libXft-2.1.0 - x11-libs/libXt - media-libs/fontconfig - gif? ( >=media-libs/giflib-4.1.0-r3 ) - png? ( >=media-libs/libpng-1.2.1 ) - jpeg? ( >=media-libs/jpeg-6b:0 ) - tiff? ( >=media-libs/tiff-3.6.1-r2 ) - gnustep? ( >=gnustep-base/gnustep-make-2.0 ) - xinerama? ( x11-libs/libXinerama )" -RDEPEND="${DEPEND} - nls? ( >=sys-devel/gettext-0.10.39 )" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -src_unpack() { - is-flag -fstack-protector && filter-flags -fstack-protector \ - && ewarn "CFLAG -fstack-protector has been disabled, as it is known to cause bugs with WindowMaker (bug #78051)" && ebeep 2 - replace-flags "-Os" "-O2" - replace-flags "-O3" "-O2" - - unpack ${A} - epatch "${FILESDIR}"/wmaker_modelock_fix.patch - cd "${S}" - local psd="${WORKDIR}"/${P}-patchset-${PATCHVER} - - epatch "${psd}"/WindowMaker-0.92.0-cvs20060123.patch - epatch "${psd}"/WindowMaker-0.92.0-cvs-gcc41.patch - epatch "${psd}"/wlist-0.9x.patch - epatch "${psd}"/${P}-gif-before-ungif.patch - epatch "${psd}"/${P}-math_h.patch - epatch "${psd}"/${P}-gettext.patch - epatch "${psd}"/${P}-libpng14.patch - - # Patches from upstream HG - epatch "${psd}"/${P}-composite-non-24bit-depth.patch - epatch "${psd}"/${P}-mouse-window-focus.patch - epatch "${psd}"/${P}-maximise-borderless-too-small.patch - epatch "${psd}"/${P}-xinerama-switchpanel-corruption.patch - epatch "${psd}"/${P}-dialog-history.patch - epatch "${psd}"/${P}-single-click-dockapp-start.patch - epatch "${psd}"/${P}-no-pop-empty-array.patch - epatch "${psd}"/${P}-empty-command-fatal-error.patch - epatch "${psd}"/${P}-findfile-overflow.patch - epatch "${psd}"/${P}-pointer-integer-warn-fix.patch - epatch "${psd}"/${P}-workspace-change-crash.patch - epatch "${psd}"/${P}-app-icon-fix.patch - epatch "${psd}"/${P}-xchangeproperty-64bits-fix.patch - - # Patches from altlinux - epatch "${psd}"/WindowMaker-0.91.0-alt-session.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-restartscrpt.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-menutrans.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-titlebar.patch - epatch "${psd}"/${P}-no-clip-title.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-mmx.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-focus.patch - - # New features (cool!) - epatch "${psd}"/${P}-doubleclick-maximise.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-dockhotkeys.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-vlaad-trance.patch - epatch "${psd}"/WindowMaker-0.91.0-alt-vlaad-newbuttons.patch - epatch "${psd}"/WindowMaker-0.91.0-hmepas-minimizeall.patch - epatch "${psd}"/WindowMaker-0.91.0-hmepas-swmenu_rclick.patch - epatch "${psd}"/WindowMaker-0.91.0-sga-moving-add.patch - epatch "${psd}"/WindowMaker-0.91.0-peter-newappicon.patch - epatch "${psd}"/WindowMaker-0.91.0-peter-mouse-placement.patch - epatch "${psd}"/WindowMaker-0.91.0-peter-appicon-bouncer2.patch - epatch "${psd}"/WindowMaker-0.91.0-sga-swpanel-customization.patch - epatch "${psd}"/WindowMaker-0.92.0-alt-newpo.patch - - [[ ${CHOST} == *-interix* ]] && epatch "${psd}"/${P}-interix3.patch - epatch "${psd}"/${P}-darwin-setlocale.patch - epatch "${psd}"/${P}-nls.patch - #use nls && sed -i -e 's/#NLSENABLE //' configure.ac - #touch ABOUT-NLS config.rpath - - # Add UK localisation - cp "${psd}"/WindowMaker-uk.po po/uk.po - cp "${psd}"/WPrefs-uk.po WPrefs.app/po/uk.po - - # Add newbuttons resources - cp "${psd}"/WindowMaker-newbuttons.nextstyle.tiff \ - WPrefs.app/tiff/nextstyle.tiff - cp "${psd}"/WindowMaker-newbuttons.oldstyle.tiff \ - WPrefs.app/tiff/oldstyle.tiff - cp "${psd}"/WindowMaker-newbuttons.nextstyle.xpm \ - WPrefs.app/xpm/nextstyle.xpm - - # Fix some paths - if use gnustep; then - egnustep_env - fi - for file in "${S}"/WindowMaker/*menu*; do - if [ -r "$file" ]; then - if use gnustep ; then - sed -i "s:/usr/local/GNUstep/Applications:${GNUSTEP_SYSTEM_APPS}:g" "$file" - else - sed -i "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" - fi - - sed -i 's:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;' "$file" - sed -i 's:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;' "$file" - fi; - done; - - eautoreconf || die "eautoreconf failed" -} - -src_compile() { - local myconf - - # image format types - # xpm is provided by X itself - myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)" - - # non required X capabilities - myconf="${myconf} $(use_enable modelock) $(use_enable xinerama)" - - if use gnustep ; then - egnustep_env - # Gentoo installs everything in System, make sure configure honors that - export GNUSTEP_LOCAL_ROOT=${GNUSTEP_SYSTEM_ROOT} - myconf="${myconf} --with-gnustepdir=${GNUSTEP_SYSTEM_ROOT}" - fi - - if use nls; then - [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - else - myconf="${myconf} --disable-locale" - fi - - # enable new features, need to be done via defines - append-flags -DBOUNCE_APP -DNEWAPPICON - use vdesktop && append-flags -DVIRTUAL_DESKTOP - - # default settings with $myconf appended - econf \ - --sysconfdir="${EPREFIX}"/etc/X11 \ - --with-x \ - --enable-usermenu \ - --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \ - --with-nlsdir="${EPREFIX}"/usr/share/locale \ - ${myconf} || die - - emake || die "windowmaker: make has failed" - - # WindowMaker Extra Package (themes and icons) - cd ../WindowMaker-extra-0.1 - econf || die "windowmaker-extra: configure has failed" - emake || die "windowmaker-extra: make has failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "windowmaker: install has failed." - - dodoc AUTHORS BUGFORM BUGS ChangeLog COPYING* INSTALL* FAQ* \ - MIRRORS README* NEWS TODO - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - emake DESTDIR="${D}" install || die "windowmaker-extra: install failed" - - newdoc README README.extra - - # create wmaker session shell script - echo "#!/usr/bin/env bash" > wmaker - echo "${EPREFIX}/usr/bin/wmaker" >> wmaker - exeinto /etc/X11/Sessions/ - doexe wmaker - - insinto /etc/X11/dm/Sessions - doins "${FILESDIR}"/wmaker.desktop - make_desktop_entry /usr/bin/wmaker -} diff --git a/x11-wm/windowmaker/windowmaker-0.95.7-r10.ebuild b/x11-wm/windowmaker/windowmaker-0.95.7-r10.ebuild new file mode 100644 index 0000000..5bef284 --- /dev/null +++ b/x11-wm/windowmaker/windowmaker-0.95.7-r10.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils + +DESCRIPTION="The fast and light GNUstep window manager" +HOMEPAGE="http://www.windowmaker.org/" +SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz + http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz" + +SLOT="0" +LICENSE="GPL-2" +IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr" +KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + +DEPEND="media-libs/fontconfig + >=x11-libs/libXft-2.1.0 + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXt + x11-libs/libXv + gif? ( >=media-libs/giflib-4.1.0-r3 ) + imagemagick? ( media-gfx/imagemagick ) + jpeg? ( virtual/jpeg:0= ) + png? ( media-libs/libpng:0= ) + tiff? ( media-libs/tiff:0 ) + webp? ( media-libs/libwebp ) + xinerama? ( x11-libs/libXinerama ) + xrandr? ( x11-libs/libXrandr )" +RDEPEND="${DEPEND} + nls? ( >=sys-devel/gettext-0.10.39 )" + +S=${WORKDIR}/${P/windowm/WindowM} + +src_prepare() { + # Fix some paths + for file in WindowMaker/*menu* util/wmgenmenu.c; do + if [[ -r $file ]] ; then + sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die + sed -i -e "s:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die + sed -i -e "s:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;" "$file" || die + fi; + done; + epatch "${FILESDIR}/windowmaker-0.95.7-window_head_cycle.patch" +} + +src_configure() { + local myconf + + # image format types + myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)" + + # non required X capabilities + myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)" + + if use nls; then + [[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)" + else + myconf="${myconf} --disable-locale" + fi + + # default settings with $myconf appended + econf \ + --sysconfdir="${EPREFIX}"/etc/X11 \ + --with-x \ + --enable-usermenu \ + --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \ + --localedir="${EPREFIX}"/usr/share/locale \ + ${myconf} + + cd ../WindowMaker-extra-0.1 + econf +} + +src_compile() { + emake + + # WindowMaker Extra Package (themes and icons) + cd ../WindowMaker-extra-0.1 + emake +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \ + README* NEWS TODO + + # WindowMaker Extra + cd ../WindowMaker-extra-0.1 + emake DESTDIR="${D}" install + + newdoc README README.extra + + # create wmaker session shell script + echo "#!/usr/bin/env bash" > wmaker + echo "${EPREFIX}/usr/bin/wmaker" >> wmaker + exeinto /etc/X11/Sessions/ + doexe wmaker + + insinto /usr/share/xsessions + doins "${FILESDIR}"/wmaker.desktop + make_desktop_entry /usr/bin/wmaker +}