summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreroen <eroen@occam.eroen.eu>2015-08-16 11:11:53 +0200
committereroen <eroen@occam.eroen.eu>2015-08-16 13:54:52 +0200
commitd37a8b346eef35f1786d40c1935a80ba5c3f3a15 (patch)
tree1fd1abf929f621648ad2aba3747350a74cce4f67 /x11-libs
parenttermite - restrict old versions to vte-2.90 (diff)
downloaderoen-d37a8b346eef35f1786d40c1935a80ba5c3f3a15.tar.gz
eroen-d37a8b346eef35f1786d40c1935a80ba5c3f3a15.tar.bz2
eroen-d37a8b346eef35f1786d40c1935a80ba5c3f3a15.zip
vte-0.40.2 - bump
vte-ng patchset (for termite) from https://github.com/thestinger/vte-ng ending in commit 86d350b9c7a3f1416c69515d38f4ca6f7b0feabc
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/vte/files/vte-ng-0.40.2.a-1.patch108
-rw-r--r--x11-libs/vte/files/vte-ng-0.40.2.a-2.patch56
-rw-r--r--x11-libs/vte/files/vte-ng-0.40.2.a-3.patch53
-rw-r--r--x11-libs/vte/files/vte-ng-0.40.2.a-4.patch61
-rw-r--r--x11-libs/vte/files/vte-ng-0.40.2.a-5.patch63
-rw-r--r--x11-libs/vte/vte-0.40.2.ebuild6
6 files changed, 346 insertions, 1 deletions
diff --git a/x11-libs/vte/files/vte-ng-0.40.2.a-1.patch b/x11-libs/vte/files/vte-ng-0.40.2.a-1.patch
new file mode 100644
index 0000000..b78c830
--- /dev/null
+++ b/x11-libs/vte/files/vte-ng-0.40.2.a-1.patch
@@ -0,0 +1,108 @@
+From d5a1fd1bdc75c5b16e093699cfd0cf005acaba43 Mon Sep 17 00:00:00 2001
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Sun, 21 Jun 2015 09:50:26 -0400
+Subject: [PATCH] expose functions for pausing/unpausing output
+
+---
+ src/vte.c | 21 +++++++++++----------
+ src/vteterminal.h | 4 ++++
+ 2 files changed, 15 insertions(+), 10 deletions(-)
+
+diff --git a/src/vte.c b/src/vte.c
+index 68f7167..efa65dc 100644
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -123,7 +123,6 @@ static char *vte_terminal_get_text_maybe_wrapped(VteTerminal *terminal,
+ gpointer data,
+ GArray *attributes,
+ gboolean include_trailing_spaces);
+-static void _vte_terminal_disconnect_pty_read(VteTerminal *terminal);
+ static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal);
+ static void vte_terminal_stop_processing (VteTerminal *terminal);
+
+@@ -3344,9 +3343,10 @@ static void mark_input_source_invalid(VteTerminal *terminal)
+ _vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n");
+ terminal->pvt->pty_input_source = 0;
+ }
+-static void
+-_vte_terminal_connect_pty_read(VteTerminal *terminal)
++void
++vte_terminal_connect_pty_read(VteTerminal *terminal)
+ {
++ g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ if (terminal->pvt->pty_channel == NULL) {
+ return;
+ }
+@@ -3398,9 +3398,10 @@ _vte_terminal_connect_pty_write(VteTerminal *terminal)
+ }
+ }
+
+-static void
+-_vte_terminal_disconnect_pty_read(VteTerminal *terminal)
++void
++vte_terminal_disconnect_pty_read(VteTerminal *terminal)
+ {
++ g_return_if_fail(VTE_IS_TERMINAL(terminal));
+ if (terminal->pvt->pty_input_source != 0) {
+ _vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n");
+ g_source_remove(terminal->pvt->pty_input_source);
+@@ -6465,7 +6466,7 @@ vte_terminal_start_selection(VteTerminal *terminal, long x, long y,
+ vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE);
+
+ /* Temporarily stop caring about input from the child. */
+- _vte_terminal_disconnect_pty_read(terminal);
++ vte_terminal_disconnect_pty_read(terminal);
+ }
+
+ static gboolean
+@@ -6482,7 +6483,7 @@ _vte_terminal_maybe_end_selection (VteTerminal *terminal)
+ terminal->pvt->selecting = FALSE;
+
+ /* Reconnect to input from the child if we paused it. */
+- _vte_terminal_connect_pty_read(terminal);
++ vte_terminal_connect_pty_read(terminal);
+
+ return TRUE;
+ }
+@@ -8631,7 +8632,7 @@ vte_terminal_finalize(GObject *object)
+ #endif
+ kill(terminal->pvt->pty_pid, SIGHUP);
+ }
+- _vte_terminal_disconnect_pty_read(terminal);
++ vte_terminal_disconnect_pty_read(terminal);
+ _vte_terminal_disconnect_pty_write(terminal);
+ if (terminal->pvt->pty_channel != NULL) {
+ g_io_channel_unref (terminal->pvt->pty_channel);
+@@ -12188,7 +12189,7 @@ vte_terminal_set_pty(VteTerminal *terminal,
+ g_object_freeze_notify(object);
+
+ if (pvt->pty != NULL) {
+- _vte_terminal_disconnect_pty_read(terminal);
++ vte_terminal_disconnect_pty_read(terminal);
+ _vte_terminal_disconnect_pty_write(terminal);
+
+ if (terminal->pvt->pty_channel != NULL) {
+@@ -12243,7 +12244,7 @@ vte_terminal_set_pty(VteTerminal *terminal,
+ _vte_terminal_setup_utf8 (terminal);
+
+ /* Open channels to listen for input on. */
+- _vte_terminal_connect_pty_read (terminal);
++ vte_terminal_connect_pty_read (terminal);
+
+ g_object_notify(object, "pty");
+
+diff --git a/src/vteterminal.h b/src/vteterminal.h
+index b7b5277..d5d5871 100644
+--- a/src/vteterminal.h
++++ b/src/vteterminal.h
+@@ -170,6 +170,10 @@ void vte_terminal_paste_primary(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+ void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+ void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+
++/* pause and unpause output */
++void vte_terminal_disconnect_pty_read(VteTerminal *vte);
++void vte_terminal_connect_pty_read(VteTerminal *vte);
++
+ /* By-word selection */
+ void vte_terminal_set_word_char_exceptions(VteTerminal *terminal,
+ const char *exceptions) _VTE_GNUC_NONNULL(1);
diff --git a/x11-libs/vte/files/vte-ng-0.40.2.a-2.patch b/x11-libs/vte/files/vte-ng-0.40.2.a-2.patch
new file mode 100644
index 0000000..6d9ed13
--- /dev/null
+++ b/x11-libs/vte/files/vte-ng-0.40.2.a-2.patch
@@ -0,0 +1,56 @@
+From e06d88d4d8174746602f9408438f2271bdbbc3bd Mon Sep 17 00:00:00 2001
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Sun, 21 Jun 2015 09:57:38 -0400
+Subject: [PATCH] expose function for setting the cursor position
+
+---
+ src/vte.c | 22 ++++++++++++++++++++++
+ src/vteterminal.h | 2 ++
+ 2 files changed, 24 insertions(+)
+
+diff --git a/src/vte.c b/src/vte.c
+index efa65dc..91c2a3a 100644
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -6303,6 +6303,28 @@ vte_terminal_get_cursor_position(VteTerminal *terminal,
+ }
+ }
+
++/**
++ * vte_terminal_set_cursor_position:
++ * @terminal: a #VteTerminal
++ * @column: the new cursor column
++ * @row: the new cursor row
++ *
++ * Set the location of the cursor.
++ */
++void
++vte_terminal_set_cursor_position(VteTerminal *terminal,
++ long column, long row)
++{
++ g_return_if_fail(VTE_IS_TERMINAL(terminal));
++
++ _vte_invalidate_cursor_once(terminal, FALSE);
++ terminal->pvt->cursor.col = column;
++ terminal->pvt->cursor.row = row;
++ _vte_invalidate_cursor_once(terminal, FALSE);
++ _vte_check_cursor_blink(terminal);
++ vte_terminal_queue_cursor_moved(terminal);
++}
++
+ static GtkClipboard *
+ vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board)
+ {
+diff --git a/src/vteterminal.h b/src/vteterminal.h
+index d5d5871..a056b06 100644
+--- a/src/vteterminal.h
++++ b/src/vteterminal.h
+@@ -284,6 +284,8 @@ char *vte_terminal_get_text_range(VteTerminal *terminal,
+ void vte_terminal_get_cursor_position(VteTerminal *terminal,
+ glong *column,
+ glong *row) _VTE_GNUC_NONNULL(1);
++void vte_terminal_set_cursor_position(VteTerminal *terminal,
++ long column, long row) _VTE_GNUC_NONNULL(1);
+
+ /* Add a matching expression, returning the tag the widget assigns to that
+ * expression. */
diff --git a/x11-libs/vte/files/vte-ng-0.40.2.a-3.patch b/x11-libs/vte/files/vte-ng-0.40.2.a-3.patch
new file mode 100644
index 0000000..8961f44
--- /dev/null
+++ b/x11-libs/vte/files/vte-ng-0.40.2.a-3.patch
@@ -0,0 +1,53 @@
+From 1dae60049dec98a36ba08677d6732cb613fe796c Mon Sep 17 00:00:00 2001
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Sun, 21 Jun 2015 09:59:05 -0400
+Subject: [PATCH] add function for setting the text selection
+
+---
+ src/vte.c | 18 ++++++++++++++++++
+ src/vteterminal.h | 3 +++
+ 2 files changed, 21 insertions(+)
+
+diff --git a/src/vte.c b/src/vte.c
+index 91c2a3a..b5c4b52 100644
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -7005,6 +7005,24 @@ vte_terminal_unselect_all(VteTerminal *terminal)
+ vte_terminal_deselect_all (terminal);
+ }
+
++
++/**
++ * vte_terminal_select_text:
++ * @terminal: a #VteTerminal
++ * @start_col: the starting column for the selection
++ * @start_row: the starting row for the selection
++ * @end_col: the end column for the selection
++ * @end_row: the end row for the selection
++ *
++ * Sets the current selection region.
++ */
++void
++vte_terminal_select_text(VteTerminal *terminal,
++ long start_col, long start_row,
++ long end_col, long end_row) {
++ _vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0);
++}
++
+ /* Autoscroll a bit. */
+ static gboolean
+ vte_terminal_autoscroll(VteTerminal *terminal)
+diff --git a/src/vteterminal.h b/src/vteterminal.h
+index a056b06..4b3d29f 100644
+--- a/src/vteterminal.h
++++ b/src/vteterminal.h
+@@ -169,6 +169,9 @@ void vte_terminal_paste_primary(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+
+ void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+ void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
++void vte_terminal_select_text(VteTerminal *terminal,
++ long start_col, long start_row,
++ long end_col, long end_row) _VTE_GNUC_NONNULL(1);
+
+ /* pause and unpause output */
+ void vte_terminal_disconnect_pty_read(VteTerminal *vte);
diff --git a/x11-libs/vte/files/vte-ng-0.40.2.a-4.patch b/x11-libs/vte/files/vte-ng-0.40.2.a-4.patch
new file mode 100644
index 0000000..7d03be6
--- /dev/null
+++ b/x11-libs/vte/files/vte-ng-0.40.2.a-4.patch
@@ -0,0 +1,61 @@
+From aa07717d21bbadedfd502cb7ad4338a476240e6a Mon Sep 17 00:00:00 2001
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Sun, 21 Jun 2015 09:59:37 -0400
+Subject: [PATCH] add functions to get/set block selection mode
+
+---
+ src/vte.c | 26 ++++++++++++++++++++++++++
+ src/vteterminal.h | 3 +++
+ 2 files changed, 29 insertions(+)
+
+diff --git a/src/vte.c b/src/vte.c
+index b5c4b52..c64887b 100644
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -7005,6 +7005,32 @@ vte_terminal_unselect_all(VteTerminal *terminal)
+ vte_terminal_deselect_all (terminal);
+ }
+
++/**
++ * vte_terminal_get_selection_block_mode:
++ * @terminal: a #VteTerminal
++ *
++ * Checks whether or not block selection is enabled.
++ *
++ * Returns: %TRUE if block selection is enabled, %FALSE if not
++ */
++gboolean
++vte_terminal_get_selection_block_mode(VteTerminal *terminal) {
++ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
++ return terminal->pvt->selection_block_mode;
++}
++
++/**
++ * vte_terminal_set_selection_block_mode:
++ * @terminal: a #VteTerminal
++ * @block_mode: whether block selection is enabled
++ *
++ * Sets whether or not block selection is enabled.
++ */
++void
++vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) {
++ g_return_if_fail(VTE_IS_TERMINAL(terminal));
++ terminal->pvt->selection_block_mode = block_mode;
++}
+
+ /**
+ * vte_terminal_select_text:
+diff --git a/src/vteterminal.h b/src/vteterminal.h
+index 4b3d29f..2ad8cc6 100644
+--- a/src/vteterminal.h
++++ b/src/vteterminal.h
+@@ -169,6 +169,9 @@ void vte_terminal_paste_primary(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+
+ void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+ void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
++gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
++void vte_terminal_set_selection_block_mode(VteTerminal *terminal,
++ gboolean block_mode) _VTE_GNUC_NONNULL(1);
+ void vte_terminal_select_text(VteTerminal *terminal,
+ long start_col, long start_row,
+ long end_col, long end_row) _VTE_GNUC_NONNULL(1);
diff --git a/x11-libs/vte/files/vte-ng-0.40.2.a-5.patch b/x11-libs/vte/files/vte-ng-0.40.2.a-5.patch
new file mode 100644
index 0000000..29304f3
--- /dev/null
+++ b/x11-libs/vte/files/vte-ng-0.40.2.a-5.patch
@@ -0,0 +1,63 @@
+From 86d350b9c7a3f1416c69515d38f4ca6f7b0feabc Mon Sep 17 00:00:00 2001
+From: Daniel Micay <danielmicay@gmail.com>
+Date: Sun, 21 Jun 2015 10:00:11 -0400
+Subject: [PATCH] expose function for getting the selected text
+
+---
+ src/vte.c | 2 +-
+ src/vteaccess.c | 2 +-
+ src/vteint.h | 1 -
+ src/vteterminal.h | 2 ++
+ 4 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/vte.c b/src/vte.c
+index c64887b..06a8ebb 100644
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -12343,7 +12343,7 @@ _vte_terminal_accessible_ref(VteTerminal *terminal)
+ }
+
+ char *
+-_vte_terminal_get_selection(VteTerminal *terminal)
++vte_terminal_get_selection(VteTerminal *terminal)
+ {
+ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
+
+diff --git a/src/vteaccess.c b/src/vteaccess.c
+index 41d4cf1..5b2eaa2 100644
+--- a/src/vteaccess.c
++++ b/src/vteaccess.c
+@@ -1444,7 +1444,7 @@ vte_terminal_accessible_get_selection(AtkText *text, gint selection_number,
+ *start_offset = offset_from_xy (priv, start_x, start_y);
+ _vte_terminal_get_end_selection (terminal, &end_x, &end_y);
+ *end_offset = offset_from_xy (priv, end_x, end_y);
+- return _vte_terminal_get_selection (terminal);
++ return vte_terminal_get_selection (terminal);
+ }
+
+ static gboolean
+diff --git a/src/vteint.h b/src/vteint.h
+index fd5d62d..601ba56 100644
+--- a/src/vteint.h
++++ b/src/vteint.h
+@@ -25,7 +25,6 @@
+ G_BEGIN_DECLS
+
+ void _vte_terminal_accessible_ref(VteTerminal *terminal);
+-char* _vte_terminal_get_selection(VteTerminal *terminal);
+ void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y);
+ void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y);
+ void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset);
+diff --git a/src/vteterminal.h b/src/vteterminal.h
+index 2ad8cc6..a980d4c 100644
+--- a/src/vteterminal.h
++++ b/src/vteterminal.h
+@@ -175,6 +175,8 @@ void vte_terminal_set_selection_block_mode(VteTerminal *terminal,
+ void vte_terminal_select_text(VteTerminal *terminal,
+ long start_col, long start_row,
+ long end_col, long end_row) _VTE_GNUC_NONNULL(1);
++char *
++vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
+
+ /* pause and unpause output */
+ void vte_terminal_disconnect_pty_read(VteTerminal *vte);
diff --git a/x11-libs/vte/vte-0.40.2.ebuild b/x11-libs/vte/vte-0.40.2.ebuild
index 518b214..1521847 100644
--- a/x11-libs/vte/vte-0.40.2.ebuild
+++ b/x11-libs/vte/vte-0.40.2.ebuild
@@ -44,7 +44,11 @@ RDEPEND="${RDEPEND}
"
src_prepare() {
- use termite-patch && epatch "${FILESDIR}"/${PN}-0.32.2-expose_select_text.patch
+ if use termite-patch; then
+ for i in $(seq 5); do
+ epatch "${FILESDIR}"/vte-ng-${PV}.a-${i}.patch
+ done
+ fi
vala_src_prepare
gnome2_src_prepare