From e7d13a7588cc89f58ad72fc063ee9df231d29df5 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Wed, 23 Jun 2010 15:01:20 +0000 Subject: Version bump and try to handle bugs 324631 and 323443 in a way most people are happy. (Portage version: 2.1.8.3/cvs/Linux x86_64) --- .../vte/files/vte-0.24.2-invisible-cursor.patch | 39 ++++++++++++++++++++++ .../vte/files/vte-0.24.2-invisible-cursor2.patch | 34 +++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 x11-libs/vte/files/vte-0.24.2-invisible-cursor.patch create mode 100644 x11-libs/vte/files/vte-0.24.2-invisible-cursor2.patch (limited to 'x11-libs/vte/files') diff --git a/x11-libs/vte/files/vte-0.24.2-invisible-cursor.patch b/x11-libs/vte/files/vte-0.24.2-invisible-cursor.patch new file mode 100644 index 000000000000..59380f9561fe --- /dev/null +++ b/x11-libs/vte/files/vte-0.24.2-invisible-cursor.patch @@ -0,0 +1,39 @@ +From b58bc5359085d2c9233ac6d6a265645bfa217e82 Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod +Date: Wed, 31 Mar 2010 18:05:10 +0000 +Subject: Bug 602596 - Cursor can become invisible + +Always compute the full fore/back color first, then reverse. +That's what xterm does also. +--- +diff --git a/src/vte.c b/src/vte.c +index 178010b..c6844e9 100644 +--- a/src/vte.c ++++ b/src/vte.c +@@ -8760,10 +8760,6 @@ vte_terminal_determine_colors(VteTerminal *terminal, + if (highlight && !cursor && terminal->pvt->highlight_color_set) { + *fore = cell ? cell->attr.fore : VTE_DEF_FG; + *back = VTE_DEF_HL; +- } else +- if (reverse ^ ((cell != NULL) && (cell->attr.reverse))) { +- *fore = cell ? cell->attr.back : VTE_DEF_BG; +- *back = cell ? cell->attr.fore : VTE_DEF_FG; + } else { + *fore = cell ? cell->attr.fore : VTE_DEF_FG; + *back = cell ? cell->attr.back : VTE_DEF_BG; +@@ -8796,6 +8792,13 @@ vte_terminal_determine_colors(VteTerminal *terminal, + } + } + } ++ ++ if (reverse ^ ((cell != NULL) && (cell->attr.reverse))) { ++ int tmp; ++ tmp = *fore; ++ *fore = *back; ++ *back = tmp; ++ } + } + + /* Check if a unicode character is actually a graphic character we draw +-- +cgit v0.8.3.1 diff --git a/x11-libs/vte/files/vte-0.24.2-invisible-cursor2.patch b/x11-libs/vte/files/vte-0.24.2-invisible-cursor2.patch new file mode 100644 index 000000000000..633e9c3baa0d --- /dev/null +++ b/x11-libs/vte/files/vte-0.24.2-invisible-cursor2.patch @@ -0,0 +1,34 @@ +From f412a6f73a7b3a432bb88830b63ee25ea648619d Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod +Date: Thu, 01 Apr 2010 05:34:18 +0000 +Subject: Followup on Bug 602596 - Cursor can become invisible + +Fix invisible attribute. +--- +diff --git a/src/vte.c b/src/vte.c +index c6844e9..eddf06b 100644 +--- a/src/vte.c ++++ b/src/vte.c +@@ -8767,9 +8767,6 @@ vte_terminal_determine_colors(VteTerminal *terminal, + + /* Handle invisible, bold, and standout text by adjusting colors. */ + if (cell) { +- if (cell->attr.invisible) { +- *fore = *back; +- } + if (cell->attr.bold) { + if (*fore == VTE_DEF_FG) { + *fore = VTE_BOLD_FG; +@@ -8799,6 +8796,10 @@ vte_terminal_determine_colors(VteTerminal *terminal, + *fore = *back; + *back = tmp; + } ++ ++ if (cell && cell->attr.invisible) { ++ *fore = *back; ++ } + } + + /* Check if a unicode character is actually a graphic character we draw +-- +cgit v0.8.3.1 -- cgit v1.2.3-65-gdbad