updated secondary-wheel patch for rxvt-unicode-9.19 - bug #490686

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xEB9B4AFA

4 files changed, 146 insertions, 8 deletions

diff --git a/x11-terms/rxvt-unicode/ChangeLog b/x11-terms/rxvt-unicode/ChangeLog
index cbed1a842245..29b1ad027138 100644
--- a/x11-terms/rxvt-unicode/ChangeLog
+++ b/x11-terms/rxvt-unicode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/rxvt-unicode
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.249 2013/11/06 16:11:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/ChangeLog,v 1.250 2013/11/08 15:56:03 wired Exp $
+
+  08 Nov 2013; Alex Alexander <wired@gentoo.org> rxvt-unicode-9.19.ebuild,
+  +files/rxvt-unicode-9.19-secondary-wheel.patch:
+  updated secondary-wheel patch for rxvt-unicode-9.19 - bug #490686
 
 *rxvt-unicode-9.19 (06 Nov 2013)
 
diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index 113a3083f8e8..9783d0a4e825 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -11,16 +11,27 @@ AUX rxvt-unicode-9.14-clear.patch 937 SHA256 c1010b15d74f56671351e8314264d76f638
 AUX rxvt-unicode-9.14-secondary-wheel.patch 4980 SHA256 95965a8c245b5de04af2c1806718f38c3f8d320395991fffeb9a935e9bf37b76 SHA512 db46b50bb68a85c5819e7e8e23e764fee7bd9629c6976d90f11a1f5eaf20b67414cec4a0b48443fbe001f3b7baad5b0aa4630d4b2c2d83734bf7723fbc0095b5 WHIRLPOOL adf7249f677ee418767d2b841fdeb29424027ef72410db4c89445ab17b4999fae63385cded715e82bec44eb8dcd52f7f070adc3d7fea576d135416f1b2c3d564
 AUX rxvt-unicode-9.15-xsubpp.patch 632 SHA256 d65c0c1e403e019c882c6f95ebbe74098168795b6a9d44f4b5df82ff45bef864 SHA512 b02a7bb8642196aede63b6dd9f19b054fb4048132bb99a3bec6c2625c907289c98defb84f52b2721efe738821bbaa6e2d352f9bc6d5f1e511cacc45f70815b65 WHIRLPOOL 2c9fc89cb36d6c0f986210969db8e02930d2de369aecfa87b6112ef9edf4bf124e92a4e0a7d0de886d97e733f6c7fc8e51c2afc92be62894151e4b82f0d11eac
 AUX rxvt-unicode-9.19-fading.patch 347 SHA256 077a760deacea351efc1870f37f84c8918ef235eff9e14a60abd5c27959bf36b SHA512 e34c60279c6c0386d609ee585d4797842f7e286d2f4bc07f9d8e773d2330ce27a141020da1e662ce79910259e28da583ec2cc7b0792590bb88002d3dd62747df WHIRLPOOL f497af99cd6ec6e03adf7d99fcd471e5c7dccb654634db66a1c34901886218d01b3c99d6c0cbb475263be655e2e49f4182516eec39d0dd0f062a0edb2e6618cc
+AUX rxvt-unicode-9.19-secondary-wheel.patch 5009 SHA256 1fcc9ecb433fe4ab7568d2ac66199ad112b2f5d685489b7f5fd8b4a9dbf3827a SHA512 adf2b3e48041fddec1ebd617e5d15226d40bfa55e9fb57af3d70084ef44d1110641f393921932c0613a03fe9cba34cf78f0e022b56c522610fc5cd8e24ec0db9 WHIRLPOOL 3a7d0231f843b3949cbfe274c4d95bc8d0041e9258b2cad04a9ec39155d5ed6ed3957453c1a6980e47d133a94cc2fc504e4bddfdb74e0b9345b9d34390a8c07a
 DIST rxvt-unicode-9.18.tar.bz2 897170 SHA256 87b72a43cac7c9362a984094c661a632ce1a829ad90f149142ab1953854b433f SHA512 8d1abf38c6ad47129fafc22c3996a7e2cd0f0cf4982d441ee30076d64d191637942307efd12cc05dfef6b65136530973be9da89e6769c5967d4e523f33309237 WHIRLPOOL 3d888a207c7f2b90317633b4808666ed05880d50f5800e8101739cb87583db8d981a49ceb40a61b926b07ee5c1d8f238e711e14a98083ef31c6cc641d63041c3
 DIST rxvt-unicode-9.19.tar.bz2 914096 SHA256 d9237cf1973af461ecbeeb708e4d00893294771558e8338b4f33418ed52d3241 SHA512 357f2b9a299b816264e8cece3200338369399e4f760622daec1520d05c75e93d44e2dee3351c8e31765ab8f2218dbb9d239960ae8112e2f75d988785373d7f26 WHIRLPOOL 8f990d8049add1910d318d66b29b8eda09d506edc0641caee41bf5e8466fece2aeab75188d527965a04900bc78b2b1c5c58556e81fe9b339350d2ea35002dd0b
 EBUILD rxvt-unicode-9.18.ebuild 3976 SHA256 9b08c727ae3910cfef097e957b0c58ea07bf32dbf02f430455f7aa20f757fa7e SHA512 cfefd4b8f90bf001cac2f610ba1fecde9ea8382d3ec09d87b2cb3ce80b3dc12fceb402dcb9e170ec80881729bd9fc743cc162f736270b3c1d7b7a87cba073a07 WHIRLPOOL 4faacddf43881300c6634b88f45930bbad997e823e45b10ed1a8a92b8c210a9867361ba38007c5c25ec7bf9a3df7226038c5acf7ece40190ddd5ec6ce10dec7d
-EBUILD rxvt-unicode-9.19.ebuild 4027 SHA256 ed650e969b937925784c189149b63b4cbc0ff628d27417fa8d0f47ad4f3f4f4e SHA512 cfef6eee19e60365490c60dd7e08e77c2b0b941d67a225a05f242d08fb42420bbafa13a9179bbeedddbedc2c8d343744f501c30d4b5853ed241ead983a9a3f87 WHIRLPOOL cfe3a6e8c90ed0bda0b73c6d3c2f112d9ff185f8dda5a867ef5ef3434c973c6d6a72ebf943fc1dab81eeb0995f79dce0cdbfa4d6927e963b74385efc7e80589d
-MISC ChangeLog 36761 SHA256 9e66eafa73dc9c45ff6cf3cc41bacabacc2a651099401e0806b83da63d0283eb SHA512 93a89549a8db19c4e19c666f2f12230dda83e51371df0824d9e59bd3c45ba26eaa6194d257fa702731db5b5bdc92ab054b8caabcd109eab89f66557414e5d737 WHIRLPOOL de0c3dc0715dc4553e49793d3bcc8c6d8e04e5fd6abe014c0a41c6c961cb4f13b418c0fd15fc052930447b0fc56a3977a4c4abf07a25a7eb13b9ae9092fc7735
+EBUILD rxvt-unicode-9.19.ebuild 4029 SHA256 3c45aad80efe734099c5bc22459cca13c1d3dadcac02b57c3254e4ecf72ea385 SHA512 ee06a3519d7792b983e2786a0cb437429e2a88d142c0135afbc36b8b5463577d700878955ae3726bcd4fc9e102e62c366a58cb00d771093bc3c08a6da243fea0 WHIRLPOOL 34fa851be45c81220b17ea7a936c79165c14660cd2064bd245327380f776ae20a7d0e121d46e743f0e298a54ccbdad5bc327913287480eef36fc041137fffda8
+MISC ChangeLog 36957 SHA256 a6c22fc85d39d09cb455b7229c879a26cdc13769fe92f20d14a22d58057dafcc SHA512 5aac7463318db9fdfa83d22f509bc1427402e348dcb02e9011bac77a094d1a0a962c5c0e97731d8f4c0704d7f9c74b019453b3747201f03701cdca8aa75ab224 WHIRLPOOL 48c5cd96d012d256e6a7de86c58972edfb0fb895c43b727c93bc5d57d1ecb41cbbf2ef5314271d51d9be8122ef60b4af921f1f6f64c41cac029367831504bec6
 MISC metadata.xml 1636 SHA256 5e8498232601990ace2e1e4db6ebc972a844fd882de2f20970aec732d56f141b SHA512 f5f3356f0a04fd085820079a89664e0c1d77a7d92672fec8aff1553c23258ff82197a2ada605d3911ef1b3d9db665cfc6c07781fe164a3ba05b1c0c5dd3be52e WHIRLPOOL 2fbb49aaa249402a25b8b5ff98e24d3c359492229aa6d139906bb501b29632978a82cd6a9153ef6e3af07c6c575131e674a925cb83cf775fd9a98d6c0cb6ab7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJ6ajYACgkQVWmRsqeSphOB1QCfQbeq/XCSo3b5nLGuW4JzPbxi
-6fIAn0rELi0hbqQ/t+cWBFBlKhWc0k2T
-=0qyR
+iQIcBAEBCAAGBQJSfQm4AAoJEDZF8K7rm0r6qO4P/iqjqGKMgTOqGFCQpUEz/iQm
+bQAe6s2RRZC3Uqn4J4XPOPK3MymZZn2iOH8v/EVxxvKedHgBabEzBww1N20znivU
+DCHtJbhbJYXTn+ZGIH1snPHr1AzK+IqlJKp4Pep3YHFKJVJtBa6f4WamickcNR4Q
+bL1iKVn5U2mQ9/doX8sEui1VDnaeHrzC5Lrxz71ZetWW63QzfoEHhanovOk2EWzm
+/Eq8BNw+dDcczH4XuKKkiqvrlONzizO2t68fMYrjF2DSORQGDfkAO4R1uIY+NWaT
+eYd+Pi6cXbdTQMo3bCB0n05ckRhitp0PDCW82yQib+BwhsUB5Kfu6QTUGz0liE1y
+rHnDjqPm9qWplAiWRM3Jb/PRpmPG2Dpzl/RHXMis68t1+Behi1hO6NrPbigJiAB+
+IAxzzxD0cyqjzu5xOQGrqt1QAy1/O/N6pmopoeyVS2TCNnhZRvh3UEU63s6HKsKx
+aPOk9r1A97wgikfgWd1Qijf/2itvCRQBV8XTkH5EafoMJWlwXumhntJwFl5oNgPJ
+yMTWFZI0A6//4G0Aj/0uDmaqNqxmB3H9cDYqx47ockGXhtKIdKmROFk2IMDRCFdS
+/FYGi1vCIk+auUxX3n1q8/VZHyTupf3++vf5Urd6j04lbXVJ/JmSwgyw6q9esPU0
+pOwZrGRlvIHmdiqimqqz
+=q74O
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/rxvt-unicode/files/rxvt-unicode-9.19-secondary-wheel.patch b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.19-secondary-wheel.patch
new file mode 100644
index 000000000000..3a4d4a409814
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/rxvt-unicode-9.19-secondary-wheel.patch
@@ -0,0 +1,123 @@
+secondary wheel support:
+when using the mouse wheel, if you’re on secondary screen then no scrolling
+will occur, and instead some (3, to be exact) “fake” keystrokes will be sent to
+the running application.
+
+patch by jacky
+i.am.jack.mail@gmail.com
+http://lists.schmorp.de/pipermail/rxvt-unicode/2011q4/001491.html
+
+diff -r d5f9ea7306c4 -r cca1997c1a85 doc/rxvt.1.pod
+--- a/doc/rxvt.1.pod	Wed Dec 21 22:59:04 2011 +0100
++++ b/doc/rxvt.1.pod	Wed Dec 21 23:01:28 2011 +0100
+@@ -455,6 +455,11 @@
+ Turn on/off secondary screen scroll (default enabled); resource
+ B<secondaryScroll>.
+ 
++=item B<-ssw>|B<+ssw>
++
++Turn on/off secondary screen wheel support (default disabled); resource
++B<secondaryWheel>.
++
+ =item B<-hold>|B<+hold>
+ 
+ Turn on/off hold window after exit support. If enabled, @@RXVT_NAME@@
+@@ -1167,6 +1172,13 @@
+ scrollback buffer and, when secondaryScreen is off, switching
+ to/from the secondary screen will instead scroll the screen up.
+ 
++=item B<secondaryWheel:> I<boolean>
++
++Turn on/off secondary wheel (default disabled). If enabled, when on
++secondary screen, using the mouse wheel will not scroll in the buffer
++but instead send 3 "fake" keystrokes (Up/Down arrow) to the running
++application (allows e.g. natural scrolling in B<man>, B<less>, etc).
++
+ =item B<hold>: I<boolean>
+ 
+ Turn on/off hold window after exit support. If enabled, @@RXVT_NAME@@
+diff -r d5f9ea7306c4 -r cca1997c1a85 src/command.C
+--- a/src/command.C	Wed Dec 21 22:59:04 2011 +0100
++++ b/src/command.C	Wed Dec 21 23:01:28 2011 +0100
+@@ -2197,10 +2197,46 @@
+                 }
+               else
+ # endif
++#ifndef NO_SECONDARY_SCREEN
+                 {
+-                  scr_page (dirn, lines);
+-                  scrollBar.show (1);
++                  /* on SECONDARY screen, we send "fake" UP/DOWN keys instead
++                   * (this allows to scroll within man, less, etc) */
++                  if (option (Opt_secondaryWheel) && current_screen != PRIMARY)
++                    {
++                       XKeyEvent event;
++                       event.display     = ev.display;
++                       event.window      = ev.window;
++                       event.root        = ev.root;
++                       event.subwindow   = ev.subwindow;
++                       event.time        = ev.time;
++                       event.x           = ev.x;
++                       event.y           = ev.y;
++                       event.x_root      = ev.x_root;
++                       event.y_root      = ev.y_root;
++                       event.same_screen = ev.same_screen;
++                       event.state       = 0;
++                       event.keycode     = XKeysymToKeycode(ev.display,
++                                            (dirn == UP) ? XK_Up : XK_Down);
++                       for (lines = 0; lines < 3; ++lines)
++                         {
++                            event.type = KeyPress;
++                            XSendEvent (event.display, event.window, True,
++                                        KeyPressMask, (XEvent *) &event);
++                            event.type = KeyRelease;
++                            XSendEvent (event.display, event.window, True,
++                                        KeyPressMask, (XEvent *) &event);
++                          }
++                    }
++                  /* on PRIMARY screen, we scroll in the buffer */
++                  else
++#endif
++                    {
++                       scr_page (dirn, lines);
++                       scrollBar.show (1);
++                    }
++#ifndef NO_SECONDARY_SCREEN
+                 }
++#endif
+             }
+             break;
+ #endif
+diff -r d5f9ea7306c4 -r cca1997c1a85 src/optinc.h
+--- a/src/optinc.h	Wed Dec 21 22:59:04 2011 +0100
++++ b/src/optinc.h	Wed Dec 21 23:01:28 2011 +0100
+@@ -26,6 +26,7 @@
+  def(cursorBlink)
+  def(secondaryScreen)
+  def(secondaryScroll)
++ def(secondaryWheel)
+  def(pastableTabs)
+  def(cursorUnderline)
+ #if ENABLE_FRILLS
+diff -r d5f9ea7306c4 -r cca1997c1a85 src/rsinc.h
+--- a/src/rsinc.h	Wed Dec 21 22:59:04 2011 +0100
++++ b/src/rsinc.h	Wed Dec 21 23:01:28 2011 +0100
+@@ -102,6 +102,7 @@
+ #ifndef NO_SECONDARY_SCREEN
+   def (secondaryScreen)
+   def (secondaryScroll)
++  def (secondaryWheel)
+ #endif
+ #ifdef OFF_FOCUS_FADING
+   def (fade)
+diff -r d5f9ea7306c4 -r cca1997c1a85 src/xdefaults.C
+--- a/src/xdefaults.C	Wed Dec 21 22:59:04 2011 +0100
++++ b/src/xdefaults.C	Wed Dec 21 23:01:28 2011 +0100
+@@ -261,6 +261,7 @@
+ #ifndef NO_SECONDARY_SCREEN
+               BOOL (Rs_secondaryScreen, "secondaryScreen", "ssc", Opt_secondaryScreen, 0, "enable secondary screen"),
+               BOOL (Rs_secondaryScroll, "secondaryScroll", "ssr", Opt_secondaryScroll, 0, "enable secondary screen scroll"),
++              BOOL (Rs_secondaryWheel, "secondaryWheel", "ssw", Opt_secondaryWheel, 0, "enable secondary screen wheel"),
+ #endif
+ #if ENABLE_PERL
+               RSTRG (Rs_perl_lib, "perl-lib", "string"), //, "colon-separated directories with extension scripts"),TODO
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.19.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.19.ebuild
index f0f4bf31b11c..2393f7d16470 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.19.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.19.ebuild,v 1.1 2013/11/06 16:11:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/rxvt-unicode/rxvt-unicode-9.19.ebuild,v 1.2 2013/11/08 15:56:03 wired Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -62,7 +62,7 @@ src_prepare() {
 		epatch "${FILESDIR}"/${PN}-9.05_no-MOTIF-WM-INFO.patch
 
 		# support for wheel scrolling on secondary screens
-		use secondary-wheel && epatch "${FILESDIR}"/${PN}-9.14-secondary-wheel.patch
+		use secondary-wheel && epatch "${FILESDIR}"/${PN}-9.19-secondary-wheel.patch
 
 		# ctrl-l buffer fix
 		use buffer-on-clear && epatch "${FILESDIR}"/${PN}-9.14-clear.patch