From b56d5949c9b0c3b40a942cd83f71e4420473435b Mon Sep 17 00:00:00 2001 From: root Date: Thu, 28 Feb 2013 00:03:26 -0800 Subject: Thu Feb 28 00:03:24 PST 2013 --- community/rxvt-unicode/01-fix-screen-sel.patch | 66 ++++++++++++++++++++++++++ community/rxvt-unicode/PKGBUILD | 15 +++--- community/rxvt-unicode/urxvt-tabbed.desktop | 3 +- community/rxvt-unicode/urxvt.desktop | 3 +- community/rxvt-unicode/urxvtc.desktop | 3 +- 5 files changed, 78 insertions(+), 12 deletions(-) create mode 100644 community/rxvt-unicode/01-fix-screen-sel.patch (limited to 'community/rxvt-unicode') diff --git a/community/rxvt-unicode/01-fix-screen-sel.patch b/community/rxvt-unicode/01-fix-screen-sel.patch new file mode 100644 index 000000000..bee7dc262 --- /dev/null +++ b/community/rxvt-unicode/01-fix-screen-sel.patch @@ -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++) diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD index 9f6dfad3b..7eb95367e 100644 --- a/community/rxvt-unicode/PKGBUILD +++ b/community/rxvt-unicode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81737 2012-12-28 00:16:43Z seblu $ +# $Id: PKGBUILD 85229 2013-02-27 20:00:33Z andrea $ # Maintainer: Sébastien Luttringer # Contributor: Angel Velasquez # Contributor: tobias @@ -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 @@ source=( '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 \ @@ -73,4 +76,4 @@ package() { done } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/rxvt-unicode/urxvt-tabbed.desktop b/community/rxvt-unicode/urxvt-tabbed.desktop index f3efdc9b9..bd48c0a72 100644 --- a/community/rxvt-unicode/urxvt-tabbed.desktop +++ b/community/rxvt-unicode/urxvt-tabbed.desktop @@ -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; diff --git a/community/rxvt-unicode/urxvt.desktop b/community/rxvt-unicode/urxvt.desktop index 0a9baf7df..d90c182e2 100644 --- a/community/rxvt-unicode/urxvt.desktop +++ b/community/rxvt-unicode/urxvt.desktop @@ -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; diff --git a/community/rxvt-unicode/urxvtc.desktop b/community/rxvt-unicode/urxvtc.desktop index e39a418f6..67751095b 100644 --- a/community/rxvt-unicode/urxvtc.desktop +++ b/community/rxvt-unicode/urxvtc.desktop @@ -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; -- cgit v1.2.3-54-g00ecf