rxvt-unicode-better-wheel-scrolling: update to urxvt 9.17

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

5 files changed, 26 insertions, 99 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 417a695e92e1..10a8683c791f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 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.16
-	pkgrel = 2
+	pkgver = 9.17
+	pkgrel = 1
 	url = http://software.schmorp.de/pkg/rxvt-unicode.html
 	arch = i686
 	arch = x86_64
@@ -12,21 +12,18 @@ pkgbase = rxvt-unicode-better-wheel-scrolling
 	optdepends = perl: lots of utilities
 	provides = rxvt-unicode=9.15
 	conflicts = rxvt-unicode
-	source = http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.16.tar.bz2
+	source = http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.17.tar.bz2
 	source = rxvt-unicode.desktop
-	source = 01-fix-screen-sel.patch
 	source = clear.patch
 	source = secondaryWheel.patch
-	md5sums = 2e2942e8367624affebc0568e3671b66
+	md5sums = 1270432bdc7ce17dbb07d41a607081e0
 	md5sums = 4723fc20ed200c86caf8c8680a1be26b
-	md5sums = 628dbe743155ddad49c8a1cac3b1bd7f
-	md5sums = cd307bca4920050db4d6d2fe8058e905
-	md5sums = 5cbfc7e25f807d461d577383f9f7a97c
-	sha1sums = 1b721969d6a6ed0f84529a29cfff0a05aee015ab
+	md5sums = 5714991c5b1bf5f7d7769961e391a0db
+	md5sums = a6011928fe8734591544f70083b995c7
+	sha1sums = 2ffee9c8ea1b5d40d99a29d5626a4558e28fff23
 	sha1sums = d4eea2dd1834b596c715ec9ea239e70788f49a8f
-	sha1sums = c722c56dc9d2dd88a420fae19bcd6b1604876929
-	sha1sums = 8a166a8e50f9b7400582e2d665986f46c8297a87
-	sha1sums = 908c2ea08592c46e7071012d7e9a09595310ca38
+	sha1sums = 089e0263722412dd82008ae3e2b3eb335fc8116e
+	sha1sums = 7b2de8c206babc4a8baea1f8c3a4219dcfa03750
 
 pkgname = rxvt-unicode-better-wheel-scrolling
 
diff --git a/01-fix-screen-sel.patch b/01-fix-screen-sel.patch
deleted file mode 100644
index 46627f16060f..000000000000
--- a/01-fix-screen-sel.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- a/src/rxvt.h	2012-11-30 07:52:10.000000000 +0100
-+++ b/src/rxvt.h	2013-01-19 18:14:07.477653413 +0100
-@@ -1488,6 +1488,7 @@
-   void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
-   void scr_kill_char (line_t &l, int col) const NOTHROW;
-   int scr_scroll_text (int row1, int row2, int count) NOTHROW;
-+  void copy_line (line_t &dst, line_t &src);
-   void scr_reset ();
-   void scr_release () NOTHROW;
-   void scr_clear (bool really = false) NOTHROW;
---- a/src/screen.C	2012-11-30 08:13:38.000000000 +0100
-+++ b/src/screen.C	2013-01-19 18:17:13.431014964 +0100
-@@ -190,6 +190,16 @@
-   row_buf   = swap_buf  + nrow;
- }
-
-+void
-+rxvt_term::copy_line (line_t &dst, line_t &src)
-+{
-+  scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
-+  dst.l = min (src.l, ncol);
-+  memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
-+  memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
-+  dst.f = src.f;
-+}
-+
- void ecb_cold
- rxvt_term::scr_reset ()
- {
-@@ -232,8 +242,6 @@
-   line_t *prev_swap_buf  = swap_buf;
-   line_t *prev_row_buf   = row_buf;
-
--  int common_col = min (prev_ncol, ncol);
--
-   scr_alloc ();
-
-   if (!prev_row_buf)
-@@ -277,13 +285,8 @@
-
-       for (int row = min (nrow, prev_nrow); row--; )
-         {
--          scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
--          scr_blank_screen_mem (swap_buf  [row], DEFAULT_RSTYLE);
--
--          memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
--          memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
--          memcpy (swap_buf  [row].t, prev_swap_buf  [row].t, sizeof (text_t) * common_col);
--          memcpy (swap_buf  [row].r, prev_swap_buf  [row].r, sizeof (rend_t) * common_col);
-+          copy_line (drawn_buf [row], prev_drawn_buf [row]);
-+          copy_line (swap_buf [row], prev_swap_buf [row]);
-         }
-
-       int p    = MOD (term_start + prev_nrow, prev_total_rows);  // previous row
-@@ -388,10 +391,7 @@
-               line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
-               line_t &dst = row_buf [row];
-
--              scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
--
--              memcpy (dst.t, src.t, sizeof (text_t) * common_col);
--              memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
-+              copy_line (dst, src);
-             }
-
-           for (int row = prev_nrow; row < nrow; row++)
diff --git a/PKGBUILD b/PKGBUILD
index dca832d05817..7586b48c8858 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 
 _pkgname=rxvt-unicode
 pkgname=${_pkgname}-better-wheel-scrolling
-pkgver=9.16
-pkgrel=2
+pkgver=9.17
+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"
@@ -19,24 +19,20 @@ provides=('rxvt-unicode=9.15')
 conflicts=('rxvt-unicode')
 source=(http://dist.schmorp.de/rxvt-unicode/${_pkgname}-${pkgver}.tar.bz2 \
         ${_pkgname}.desktop
-        01-fix-screen-sel.patch
         clear.patch secondaryWheel.patch)
-md5sums=('2e2942e8367624affebc0568e3671b66'
+md5sums=('1270432bdc7ce17dbb07d41a607081e0'
          '4723fc20ed200c86caf8c8680a1be26b'
-         '628dbe743155ddad49c8a1cac3b1bd7f'
-         'cd307bca4920050db4d6d2fe8058e905'
-         '5cbfc7e25f807d461d577383f9f7a97c')
-sha1sums=('1b721969d6a6ed0f84529a29cfff0a05aee015ab'
+         '5714991c5b1bf5f7d7769961e391a0db'
+         'a6011928fe8734591544f70083b995c7')
+sha1sums=('2ffee9c8ea1b5d40d99a29d5626a4558e28fff23'
           'd4eea2dd1834b596c715ec9ea239e70788f49a8f'
-          'c722c56dc9d2dd88a420fae19bcd6b1604876929'
-          '8a166a8e50f9b7400582e2d665986f46c8297a87'
-          '908c2ea08592c46e7071012d7e9a09595310ca38')
+          '089e0263722412dd82008ae3e2b3eb335fc8116e'
+          '7b2de8c206babc4a8baea1f8c3a4219dcfa03750')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
   patch -p1 -i ../clear.patch
   patch -p1 -i ../secondaryWheel.patch
-  patch -p1 -i ../01-fix-screen-sel.patch
   ./configure --prefix=/usr \
     --with-terminfo=/usr/share/terminfo \
     --enable-256-color \
diff --git a/clear.patch b/clear.patch
index d9c8ee18594e..325de211dcc7 100644
--- a/clear.patch
+++ b/clear.patch
@@ -1,8 +1,8 @@
 diff --git a/src/command.C b/src/command.C
-index ab1a4cd..4880f02 100644
+index 82ad10a..4491e2d 100644
 --- a/src/command.C
 +++ b/src/command.C
-@@ -2899,6 +2899,10 @@ rxvt_term::process_csi_seq ()
+@@ -2895,6 +2895,10 @@ rxvt_term::process_csi_seq ()
        return;
      }
  
@@ -13,7 +13,7 @@ index ab1a4cd..4880f02 100644
    switch (ch)
      {
          /*
-@@ -2962,6 +2966,12 @@ rxvt_term::process_csi_seq ()
+@@ -2958,6 +2962,12 @@ rxvt_term::process_csi_seq ()
  
        case CSI_CUP:		/* 8.3.21: (1,1) CURSOR POSITION */
        case CSI_HVP:		/* 8.3.64: (1,1) CHARACTER AND LINE POSITION */
@@ -26,7 +26,7 @@ index ab1a4cd..4880f02 100644
          scr_gotorc (arg[0] - 1, nargs < 2 ? 0 : (arg[1] - 1), 0);
          break;
  
-@@ -2973,6 +2983,16 @@ rxvt_term::process_csi_seq ()
+@@ -2969,6 +2979,16 @@ rxvt_term::process_csi_seq ()
          break;
  
        case CSI_ED:		/* 8.3.40: (0) ERASE IN PAGE */
@@ -43,7 +43,7 @@ index ab1a4cd..4880f02 100644
          scr_erase_screen (arg[0]);
          break;
  
-@@ -3116,6 +3136,16 @@ rxvt_term::process_csi_seq ()
+@@ -3112,6 +3132,16 @@ rxvt_term::process_csi_seq ()
        default:
          break;
      }
diff --git a/secondaryWheel.patch b/secondaryWheel.patch
index a94d1c25a33e..26cf6a2cce3f 100644
--- a/secondaryWheel.patch
+++ b/secondaryWheel.patch
@@ -29,10 +29,10 @@ index 4c93c4b..8b429a0 100644
  
  Turn on/off hold window after exit support. If enabled, @@RXVT_NAME@@
 diff --git a/src/command.C b/src/command.C
-index ab1a4cd..9fde946 100644
+index 82ad10a..92f22da 100644
 --- a/src/command.C
 +++ b/src/command.C
-@@ -2225,10 +2225,46 @@ rxvt_term::button_release (XButtonEvent &ev)
+@@ -2221,10 +2221,46 @@ rxvt_term::button_release (XButtonEvent &ev)
                  }
                else
  # endif
@@ -94,7 +94,7 @@ index d814035..a365037 100644
   def(cursorUnderline)
  #if ENABLE_FRILLS
 diff --git a/src/rsinc.h b/src/rsinc.h
-index 2906837..2e77fa1 100644
+index 1483955..10f6642 100644
 --- a/src/rsinc.h
 +++ b/src/rsinc.h
 @@ -103,6 +103,7 @@
@@ -106,7 +106,7 @@ index 2906837..2e77fa1 100644
  #if OFF_FOCUS_FADING
    def (fade)
 diff --git a/src/xdefaults.C b/src/xdefaults.C
-index 856acaf..7394852 100644
+index 69acdd8..3e858de 100644
 --- a/src/xdefaults.C
 +++ b/src/xdefaults.C
 @@ -262,6 +262,7 @@ optList[] = {