Gentoo Archives: gentoo-commits

From: "Mart Raudsepp (leio)" <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/vte/files: vte-0.17.4-fix-highlighting-on-activity.patch vte-0.17.4-fix-selecting-on-activity.patch
Date: Sat, 01 Nov 2008 17:41:26
Message-Id: E1KwKTT-00011t-Mo@stork.gentoo.org
1 leio 08/11/01 17:41:23
2
3 Added: vte-0.17.4-fix-highlighting-on-activity.patch
4 Removed: vte-0.17.4-fix-selecting-on-activity.patch
5 Log:
6 Include a fix for the previous patch, fixing selection clipboard retention from alternate screen (less, vim, etc)
7 (Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64)
8
9 Revision Changes Path
10 1.1 x11-libs/vte/files/vte-0.17.4-fix-highlighting-on-activity.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/vte/files/vte-0.17.4-fix-highlighting-on-activity.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/vte/files/vte-0.17.4-fix-highlighting-on-activity.patch?rev=1.1&content-type=text/plain
14
15 Index: vte-0.17.4-fix-highlighting-on-activity.patch
16 ===================================================================
17 Upstream revisions 2134 and 2135 with useless whitespace change hunks removed:
18
19 2008-10-23 Chris Wilson
20
21 Bug 557375 – >=vte-0.16.14 breaks highlighting on activity
22
23 * src/vte.c (vte_terminal_deselect_all),
24 (vte_terminal_extend_selection):
25 After the user modifies the selection, copy it to PRIMARY and store
26 it on the terminal. This ensures that after a screen redraw, we
27 compare the contents of the selected region with the current
28 selection, instead of stale data.
29
30 2008-10-31 Chris Wilson
31
32 * src/vte.c (vte_terminal_deselect_all):
33 Preserve the copy of the selection until it is replace by a new
34 selection, so that we can perform asynchronous copies from the
35 clipboard.
36
37 --- trunk/src/vte.c 2008/10/23 08:39:44 2130
38 +++ trunk/src/vte.c 2008/10/31 12:59:29 2135
39 @@ -1018,10 +1018,16 @@
40 {
41 if (terminal->pvt->has_selection) {
42 gint sx, sy, ex, ey;
43 - terminal->pvt->has_selection = FALSE;
44 +
45 _vte_debug_print(VTE_DEBUG_SELECTION,
46 "Deselecting all text.\n");
47 +
48 + terminal->pvt->has_selection = FALSE;
49 + /* Don't free the current selection, as we need to keep
50 + * hold of it for async copying from the clipboard. */
51 +
52 vte_terminal_emit_selection_changed(terminal);
53 +
54 sx = terminal->pvt->selection_start.x;
55 sy = terminal->pvt->selection_start.y;
56 ex = terminal->pvt->selection_end.x;
57 @@ -6510,6 +6514,7 @@
58 terminal->pvt->selection_start.y,
59 terminal->pvt->selection_end.x,
60 terminal->pvt->selection_end.y);
61 + vte_terminal_copy_primary(terminal);
62 vte_terminal_emit_selection_changed(terminal);
63 }