diff options
| author | Erik Moen | 2019-08-27 22:48:15 +0200 |
|---|---|---|
| committer | Erik Moen | 2019-08-27 22:48:15 +0200 |
| commit | 9e58877c354b378da4f56972df3e2be5d669dfe4 (patch) | |
| tree | 705eabfe36a0a82f3ef7bb3c8677063189f3646f /x11-libs/vte/files | |
| parent | 0465f9b9afb55f0b9f88a368276e9a1fe54e3c19 (diff) | |
| download | eroen-overlay-9e58877c354b378da4f56972df3e2be5d669dfe4.tar.gz eroen-overlay-9e58877c354b378da4f56972df3e2be5d669dfe4.tar.bz2 eroen-overlay-9e58877c354b378da4f56972df3e2be5d669dfe4.tar.xz | |
vte-0.54.4 from gentoo + vte-ng
Signed-off-by: Erik Moen <eroen-overlay@occam.eroen.eu>
Diffstat (limited to 'x11-libs/vte/files')
7 files changed, 321 insertions, 0 deletions
diff --git a/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch b/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch new file mode 100644 index 00000000..5da32bea --- /dev/null +++ b/x11-libs/vte/files/0.54.4-vala-0.44-compat.patch @@ -0,0 +1,29 @@ +From 53690d5cee51bdb7c3f7680d3c22b316b1086f2c Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz <ricotz@ubuntu.com> +Date: Sat, 1 Dec 2018 19:04:59 +0100 +Subject: [PATCH] vala: Fix build with vala 0.43+ git master due to empty + struct definition + +This should get a proper refactoring as the FIXME suggests. + +See https://gitlab.gnome.org/GNOME/vte/issues/76 +--- + bindings/vala/app.vala | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/bindings/vala/app.vala b/bindings/vala/app.vala +index 8663d63c..a534e76b 100644 +--- a/bindings/vala/app.vala ++++ b/bindings/vala/app.vala +@@ -819,6 +819,8 @@ class App : Gtk.Application + + public struct Options + { ++ //FIXME Merge this struct into App class ++ public int dummy; + public static bool audible = false; + public static string? command = null; + private static string? cjk_ambiguous_width_string = null; +-- +2.20.1 + diff --git a/x11-libs/vte/files/vte-0.54.2-ng/01-expose-functions-for-pausing.patch b/x11-libs/vte/files/vte-0.54.2-ng/01-expose-functions-for-pausing.patch new file mode 100644 index 00000000..9ff6bb85 --- /dev/null +++ b/x11-libs/vte/files/vte-0.54.2-ng/01-expose-functions-for-pausing.patch @@ -0,0 +1,64 @@ +expose functions for pausing unpausing output + +From: Jelle van der Waa <jelle@vdwaa.nl> + + +--- + src/vte/vteterminal.h | 6 ++++++ + src/vtegtk.cc | 26 ++++++++++++++++++++++++++ + 2 files changed, 32 insertions(+) + +diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h +index 89539cc4..a41ec359 100644 +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -175,6 +175,12 @@ void vte_terminal_feed_child_binary(VteTerminal *terminal, + const guint8 *data, + gsize length) _VTE_GNUC_NONNULL(1); + ++_VTE_PUBLIC ++void vte_terminal_connect_pty_read(VteTerminal *terminal); ++ ++_VTE_PUBLIC ++void vte_terminal_disconnect_pty_read(VteTerminal *terminal); ++ + /* Copy currently-selected text to the clipboard, or from the clipboard to + * the terminal. */ + _VTE_PUBLIC +diff --git a/src/vtegtk.cc b/src/vtegtk.cc +index 89e3d7a8..f0f3f3e8 100644 +--- a/src/vtegtk.cc ++++ b/src/vtegtk.cc +@@ -2780,6 +2780,32 @@ vte_terminal_feed_child(VteTerminal *terminal, + IMPL(terminal)->feed_child(text, length); + } + ++/** ++ * vte_terminal_connect_pty_read: ++ * @terminal: a #VteTerminal ++ * ++ * Unpause output ++ */ ++void ++vte_terminal_connect_pty_read(VteTerminal *terminal) ++{ ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); ++ IMPL(terminal)->connect_pty_read(); ++} ++ ++/** ++ * vte_terminal_disconnect_pty_read: ++ * @terminal: a #VteTerminal ++ * ++ * Pause output ++ */ ++void ++vte_terminal_disconnect_pty_read(VteTerminal *terminal) ++{ ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); ++ IMPL(terminal)->disconnect_pty_read(); ++} ++ + /** + * vte_terminal_feed_child_binary: + * @terminal: a #VteTerminal diff --git a/x11-libs/vte/files/vte-0.54.2-ng/02-expose-function-for-setting.patch b/x11-libs/vte/files/vte-0.54.2-ng/02-expose-function-for-setting.patch new file mode 100644 index 00000000..169abf5a --- /dev/null +++ b/x11-libs/vte/files/vte-0.54.2-ng/02-expose-function-for-setting.patch @@ -0,0 +1,61 @@ +expose function for setting cursor position + +From: Jelle van der Waa <jelle@vdwaa.nl> + + +--- + src/vte/vteterminal.h | 5 +++++ + src/vtegtk.cc | 24 ++++++++++++++++++++++++ + 2 files changed, 29 insertions(+) + +diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h +index a41ec359..fe90a374 100644 +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -383,6 +383,11 @@ _VTE_PUBLIC + void vte_terminal_get_cursor_position(VteTerminal *terminal, + glong *column, + glong *row) _VTE_GNUC_NONNULL(1); ++_VTE_PUBLIC ++void vte_terminal_set_cursor_position(VteTerminal *terminal, ++ glong column, ++ glong row) _VTE_GNUC_NONNULL(1); ++ + + _VTE_PUBLIC + char *vte_terminal_hyperlink_check_event(VteTerminal *terminal, +diff --git a/src/vtegtk.cc b/src/vtegtk.cc +index f0f3f3e8..17be4728 100644 +--- a/src/vtegtk.cc ++++ b/src/vtegtk.cc +@@ -2415,6 +2415,30 @@ 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)); ++ ++ auto impl = IMPL(terminal); ++ impl->invalidate_cursor_once(FALSE); ++ impl->m_screen->cursor.col = column; ++ impl->m_screen->cursor.row = row; ++ impl->invalidate_cursor_once(FALSE); ++ impl->check_cursor_blink(); ++ impl->queue_cursor_moved(); ++ ++} ++ + /** + * vte_terminal_pty_new_sync: + * @terminal: a #VteTerminal diff --git a/x11-libs/vte/files/vte-0.54.2-ng/03-add-function-for-setting-the.patch b/x11-libs/vte/files/vte-0.54.2-ng/03-add-function-for-setting-the.patch new file mode 100644 index 00000000..f1b685c4 --- /dev/null +++ b/x11-libs/vte/files/vte-0.54.2-ng/03-add-function-for-setting-the.patch @@ -0,0 +1,56 @@ +add function for setting the text selections + +From: Jelle van der Waa <jelle@vdwaa.nl> + + +--- + src/vte/vteterminal.h | 4 ++++ + src/vtegtk.cc | 20 ++++++++++++++++++++ + 2 files changed, 24 insertions(+) + +diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h +index fe90a374..b92443bb 100644 +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -196,6 +196,10 @@ _VTE_PUBLIC + void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + _VTE_PUBLIC + void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); ++_VTE_PUBLIC ++void vte_terminal_select_text(VteTerminal *terminal, long start_col, long start_row, ++ long end_col, long end_row) _VTE_GNUC_NONNULL(1); ++ + + /* By-word selection */ + _VTE_PUBLIC +diff --git a/src/vtegtk.cc b/src/vtegtk.cc +index 17be4728..2ebf070f 100644 +--- a/src/vtegtk.cc ++++ b/src/vtegtk.cc +@@ -2390,6 +2390,26 @@ vte_terminal_unselect_all(VteTerminal *terminal) + IMPL(terminal)->deselect_all(); + } + ++/** ++ * 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) ++{ ++ g_return_if_fail (VTE_IS_TERMINAL (terminal)); ++ ++ IMPL(terminal)->select_text(start_col, start_row, end_col, end_row); ++} ++ + /** + * vte_terminal_get_cursor_position: + * @terminal: a #VteTerminal diff --git a/x11-libs/vte/files/vte-0.54.2-ng/04-add-functions-to-get-set-block.patch b/x11-libs/vte/files/vte-0.54.2-ng/04-add-functions-to-get-set-block.patch new file mode 100644 index 00000000..1c7b55bc --- /dev/null +++ b/x11-libs/vte/files/vte-0.54.2-ng/04-add-functions-to-get-set-block.patch @@ -0,0 +1,62 @@ +add functions to get/set block selection mode + +From: Jelle van der Waa <jelle@vdwaa.nl> + + +--- + src/vte/vteterminal.h | 5 +++++ + src/vtegtk.cc | 25 +++++++++++++++++++++++++ + 2 files changed, 30 insertions(+) + +diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h +index b92443bb..87096bc0 100644 +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -197,6 +197,11 @@ void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + _VTE_PUBLIC + void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + _VTE_PUBLIC ++gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); ++_VTE_PUBLIC ++void vte_terminal_set_selection_block_mode(VteTerminal *terminal, ++ gboolean block_mode) _VTE_GNUC_NONNULL(1); ++_VTE_PUBLIC + 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/src/vtegtk.cc b/src/vtegtk.cc +index 2ebf070f..27ad64da 100644 +--- a/src/vtegtk.cc ++++ b/src/vtegtk.cc +@@ -2389,6 +2389,31 @@ vte_terminal_unselect_all(VteTerminal *terminal) + + IMPL(terminal)->deselect_all(); + } ++/** ++ * 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 IMPL(terminal)->m_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)); ++ IMPL(terminal)->m_selection_block_mode = block_mode; ++} + + /** + * vte_terminal_select_text: diff --git a/x11-libs/vte/files/vte-0.54.2-ng/05-expose-function-for-getting.patch b/x11-libs/vte/files/vte-0.54.2-ng/05-expose-function-for-getting.patch new file mode 100644 index 00000000..94701472 --- /dev/null +++ b/x11-libs/vte/files/vte-0.54.2-ng/05-expose-function-for-getting.patch @@ -0,0 +1,43 @@ +expose function for getting the selected text + +From: Jelle van der Waa <jelle@vdwaa.nl> + + +--- + src/vte/vteterminal.h | 4 +++- + src/vtegtk.cc | 7 +++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/vte/vteterminal.h b/src/vte/vteterminal.h +index 87096bc0..8bdbde30 100644 +--- a/src/vte/vteterminal.h ++++ b/src/vte/vteterminal.h +@@ -204,7 +204,9 @@ void vte_terminal_set_selection_block_mode(VteTerminal *terminal, + _VTE_PUBLIC + void vte_terminal_select_text(VteTerminal *terminal, long start_col, long start_row, + long end_col, long end_row) _VTE_GNUC_NONNULL(1); +- ++_VTE_PUBLIC ++char * ++vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + + /* By-word selection */ + _VTE_PUBLIC +diff --git a/src/vtegtk.cc b/src/vtegtk.cc +index 27ad64da..0067e58a 100644 +--- a/src/vtegtk.cc ++++ b/src/vtegtk.cc +@@ -2435,6 +2435,13 @@ vte_terminal_select_text(VteTerminal *terminal, + IMPL(terminal)->select_text(start_col, start_row, end_col, end_row); + } + ++char * ++vte_terminal_get_selection(VteTerminal *terminal) ++{ ++ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); ++ return g_strdup (IMPL(terminal)->m_selection[VTE_SELECTION_PRIMARY]->str); ++} ++ + /** + * vte_terminal_get_cursor_position: + * @terminal: a #VteTerminal diff --git a/x11-libs/vte/files/vte-0.54.2-ng/series b/x11-libs/vte/files/vte-0.54.2-ng/series new file mode 100644 index 00000000..7bffb7f1 --- /dev/null +++ b/x11-libs/vte/files/vte-0.54.2-ng/series @@ -0,0 +1,6 @@ +# This series applies on GIT commit 6c37e5164aef8b2ac3dea02f6c1a3152dad93fda +01-expose-functions-for-pausing.patch +02-expose-function-for-setting.patch +03-add-function-for-setting-the.patch +04-add-functions-to-get-set-block.patch +05-expose-function-for-getting.patch |
