[arch-commits] Commit in rxvt-unicode/trunk (5 files)

Thu Jan 24 13:11:21 UTC 2013

Date: Thursday, January 24, 2013 @ 14:11:21
  Author: seblu
Revision: 82788

upgpkg: rxvt-unicode 9.16-2

- fix FS#33466
- fix FS#33241

Added:
  rxvt-unicode/trunk/01-fix-screen-sel.patch
Modified:
  rxvt-unicode/trunk/PKGBUILD
  rxvt-unicode/trunk/urxvt-tabbed.desktop
  rxvt-unicode/trunk/urxvt.desktop
  rxvt-unicode/trunk/urxvtc.desktop

-------------------------+
 01-fix-screen-sel.patch |   66 ++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD                |   11 ++++---
 urxvt-tabbed.desktop    |    3 --
 urxvt.desktop           |    3 --
 urxvtc.desktop          |    3 --
 5 files changed, 76 insertions(+), 10 deletions(-)

Added: 01-fix-screen-sel.patch
===================================================================

--- 01-fix-screen-sel.patch	                        (rev 0)
+++ 01-fix-screen-sel.patch	2013-01-24 13:11:21 UTC (rev 82788)
@@ -0,0 +1,66 @@
+--- 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++)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-24 12:57:51 UTC (rev 82787)
+++ PKGBUILD	2013-01-24 13:11:21 UTC (rev 82788)
@@ -6,7 +6,7 @@
 
 pkgname=rxvt-unicode
 pkgver=9.16
-pkgrel=1
+pkgrel=2
 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)'
 arch=('i686' 'x86_64')
 url='http://software.schmorp.de/pkg/rxvt-unicode.html'
@@ -18,14 +18,17 @@
   'urxvt.desktop'
   'urxvtc.desktop'
   'urxvt-tabbed.desktop'
+  '01-fix-screen-sel.patch'
 )
 md5sums=('2e2942e8367624affebc0568e3671b66'
-         '88d8786d74b819450adf722180db09fd'
-         'bebf5b6b399b74b557fcedbdb47cc387'
-         '2604896bb107fbb5511bfd6f46d65894')
+         'c2b828d37d06cbf4c32937a2959f2fc2'
+         '10e80aebaef042fb63d2585440dc3637'
+         '830abe6f31fb926a1bcd2650731be15e'
+         '266e027bd4a998073f17d548d288d414')
 
 build() {
   cd $pkgname-$pkgver
+  patch -p1 -i "$srcdir/01-fix-screen-sel.patch"
   ./configure \
     --prefix=/usr \
     --with-terminfo=/usr/share/terminfo \

Modified: urxvt-tabbed.desktop
===================================================================
--- urxvt-tabbed.desktop	2013-01-24 12:57:51 UTC (rev 82787)
+++ urxvt-tabbed.desktop	2013-01-24 13:11:21 UTC (rev 82788)
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=urxvt (tabbed)
 Comment=An unicode capable and tabbed rxvt clone
 Exec=urxvt-tabbed
 Icon=terminal
 Terminal=false
 Type=Application
-Categories=Application;System;TerminalEmulator;
+Categories=System;TerminalEmulator;

Modified: urxvt.desktop
===================================================================
--- urxvt.desktop	2013-01-24 12:57:51 UTC (rev 82787)
+++ urxvt.desktop	2013-01-24 13:11:21 UTC (rev 82788)
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=urxvt
 Comment=An unicode capable rxvt clone
 Exec=urxvt
 Icon=terminal
 Terminal=false
 Type=Application
-Categories=Application;System;TerminalEmulator;
+Categories=System;TerminalEmulator;

Modified: urxvtc.desktop
===================================================================
--- urxvtc.desktop	2013-01-24 12:57:51 UTC (rev 82787)
+++ urxvtc.desktop	2013-01-24 13:11:21 UTC (rev 82788)
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=urxvt (client)
 Comment=An unicode capable rxvt clone client for urxvtd
 Exec=urxvtc
 Icon=terminal
 Terminal=false
 Type=Application
-Categories=Application;System;TerminalEmulator;
+Categories=System;TerminalEmulator;


