first commit

Signed-off-by: Olivier Brunel <jjk@jjacky.com>

5 files changed, 242 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..0d13ebf07519
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,29 @@
+pkgbase = rxvt-unicode-better-wheel-scrolling
+	pkgdesc = An unicode enabled rxvt-clone terminal emulator (urxvt) w/ better wheel scrolling (VTE-like) (& no utmp/wtmp support)
+	pkgver = 9.15
+	pkgrel = 1
+	url = http://software.schmorp.de/pkg/rxvt-unicode.html
+	arch = i686
+	arch = x86_64
+	license = GPL
+	depends = gcc-libs
+	depends = libxft
+	depends = gdk-pixbuf2
+	optdepends = perl: lots of utilities
+	provides = rxvt-unicode=9.15
+	conflicts = rxvt-unicode
+	source = http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.15.tar.bz2
+	source = rxvt-unicode.desktop
+	source = clear.patch
+	source = secondaryWheel.patch
+	md5sums = 15595aa326167ac5eb68c28d95432faf
+	md5sums = 3de6c13126a45bc3bc9f6bba077a1311
+	md5sums = 8017fd25f177073c471dac7b9c063431
+	md5sums = ee638fc295bd563b9afd7e243e759c2c
+	sha1sums = e6fdf091860ecb458730dc68b0176f67f207a2f7
+	sha1sums = 962aebc88982dbeb62a7c4a051ff567e015f61a0
+	sha1sums = cfd8c8bfc6d52a03a142cbe07fff1dc2538060dd
+	sha1sums = d42765636661e6f0df64d23c8b7fdd4537675409
+
+pkgname = rxvt-unicode-better-wheel-scrolling
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..0353a38c7da0
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,68 @@
+# Maintainer: jjacky
+# Contributor: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: tobias <tobias@archlinux.org>
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+
+# using clear.patch by rlblaster: https://bbs.archlinux.org/viewtopic.php?id=129302
+
+_pkgname=rxvt-unicode
+pkgname=${_pkgname}-better-wheel-scrolling
+pkgver=9.15
+pkgrel=1
+pkgdesc="An unicode enabled rxvt-clone terminal emulator (urxvt) w/ better wheel scrolling (VTE-like) (& no utmp/wtmp support)"
+arch=('i686' 'x86_64')
+url="http://software.schmorp.de/pkg/rxvt-unicode.html"
+license=('GPL')
+depends=('gcc-libs' 'libxft' 'gdk-pixbuf2')
+optdepends=('perl: lots of utilities') # 'gtk2-perl: to use the urxvt-tabbed')
+provides=('rxvt-unicode=9.15')
+conflicts=('rxvt-unicode')
+source=(http://dist.schmorp.de/rxvt-unicode/${_pkgname}-${pkgver}.tar.bz2 \
+        ${_pkgname}.desktop
+	clear.patch secondaryWheel.patch)
+md5sums=('15595aa326167ac5eb68c28d95432faf'
+         '3de6c13126a45bc3bc9f6bba077a1311'
+         '8017fd25f177073c471dac7b9c063431'
+         'ee638fc295bd563b9afd7e243e759c2c')
+sha1sums=('e6fdf091860ecb458730dc68b0176f67f207a2f7'
+          '962aebc88982dbeb62a7c4a051ff567e015f61a0'
+          'cfd8c8bfc6d52a03a142cbe07fff1dc2538060dd'
+          'd42765636661e6f0df64d23c8b7fdd4537675409')
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  patch -p1 -i ../clear.patch
+  patch -p1 -i ../secondaryWheel.patch
+  ./configure --prefix=/usr \
+    --with-terminfo=/usr/share/terminfo \
+    --enable-256-color \
+    --enable-font-styles \
+    --enable-xim \
+    --enable-keepscrolling \
+    --enable-selectionscrolling \
+    --enable-smart-resize \
+    --enable-pixbuf \
+    --enable-transparency \
+    --disable-utmp \
+    --disable-wtmp \
+    --enable-lastlog \
+    --disable-frills
+  make alldoc
+  make
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  install -d "${pkgdir}/usr/share/terminfo"
+  export TERMINFO="${pkgdir}/usr/share/terminfo"
+  make DESTDIR="${pkgdir}" install
+#  # for utmp/wtmp support
+#  chgrp utmp $pkgdir/usr/bin/urxvt
+#  chmod g+s $pkgdir/usr/bin/urxvt
+# # install the tabbing wrapper ( requires gtk2-perl! )
+#  sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed
+#  install -Dm 755 doc/rxvt-tabbed "${pkgdir}/usr/bin/urxvt-tabbed"
+ # install freedesktop menu
+  install -Dm644 ../${_pkgname}.desktop \
+    "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+}
diff --git a/clear.patch b/clear.patch
new file mode 100644
index 000000000000..0b72b6b99359
--- /dev/null
+++ b/clear.patch
@@ -0,0 +1,21 @@
+diff -r 4399ffb6a87c src/command.C
+--- a/src/command.C	Sat Jan 21 13:57:22 2012 +0100
++++ b/src/command.C	Sat Jan 21 14:03:49 2012 +0100
+@@ -2932,6 +2932,17 @@
+ 
+       case CSI_CUP:		/* 8.3.21: (1,1) CURSOR POSITION */
+       case CSI_HVP:		/* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
++        if (nargs == 1 && current_screen == 0)
++          {
++            // This is usually followed with clear screen so add some extra
++            // lines to avoid deleting the lines already on screen. If we are
++            // already at the top, add an extra screen height of lines.
++            int extra_lines = nrow-1;
++            if (screen.cur.row == 0)
++              extra_lines += nrow;
++            for (int i = 0; i < extra_lines; ++i)
++              scr_add_lines (L"\r\n", 2);
++          }
+         scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
+         break;
+ 
diff --git a/rxvt-unicode.desktop b/rxvt-unicode.desktop
new file mode 100644
index 000000000000..68d613dbd60c
--- /dev/null
+++ b/rxvt-unicode.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=rxvt-unicode
+Comment=An Unicode capable rxvt clone
+Exec=urxvt
+Icon=terminal
+Terminal=false
+Type=Application
+Categories=Application;System;TerminalEmulator;
diff --git a/secondaryWheel.patch b/secondaryWheel.patch
new file mode 100644
index 000000000000..b588b53527fa
--- /dev/null
+++ b/secondaryWheel.patch
@@ -0,0 +1,114 @@
+diff -r 4399ffb6a87c doc/rxvt.1.pod
+--- a/doc/rxvt.1.pod	Sat Jan 21 13:57:22 2012 +0100
++++ b/doc/rxvt.1.pod	Sat Jan 21 14:03:04 2012 +0100
+@@ -456,6 +456,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@@
+@@ -1168,6 +1173,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 4399ffb6a87c src/command.C
+--- a/src/command.C	Sat Jan 21 13:57:22 2012 +0100
++++ b/src/command.C	Sat Jan 21 14:03:04 2012 +0100
+@@ -2197,10 +2197,46 @@
+                 }
+               else
+ # endif
++#ifndef NO_SECONDARY_SCREEN
+                 {
+-                  scr_page (v, i);
+-                  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,
++                                            (v == UP) ? XK_Up : XK_Down);
++                       for (i = 0; i < 3; ++i)
++                         {
++                            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 (v, i);
++                       scrollBar.show (1);
++                    }
++#ifndef NO_SECONDARY_SCREEN
+                 }
++#endif
+             }
+             break;
+ #endif
+diff -r 4399ffb6a87c src/optinc.h
+--- a/src/optinc.h	Sat Jan 21 13:57:22 2012 +0100
++++ b/src/optinc.h	Sat Jan 21 14:03:04 2012 +0100
+@@ -26,6 +26,7 @@
+  def(cursorBlink)
+  def(secondaryScreen)
+  def(secondaryScroll)
++ def(secondaryWheel)
+  def(pastableTabs)
+  def(cursorUnderline)
+ #if ENABLE_FRILLS
+diff -r 4399ffb6a87c src/rsinc.h
+--- a/src/rsinc.h	Sat Jan 21 13:57:22 2012 +0100
++++ b/src/rsinc.h	Sat Jan 21 14:03:04 2012 +0100
+@@ -102,6 +102,7 @@
+ #ifndef NO_SECONDARY_SCREEN
+   def (secondaryScreen)
+   def (secondaryScroll)
++  def (secondaryWheel)
+ #endif
+ #ifdef OFF_FOCUS_FADING
+   def (fade)
+diff -r 4399ffb6a87c src/xdefaults.C
+--- a/src/xdefaults.C	Sat Jan 21 13:57:22 2012 +0100
++++ b/src/xdefaults.C	Sat Jan 21 14:03:04 2012 +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