···
1
-
Only in vte-0.40.0.new: .git
2
-
diff --unified -aur vte-0.40.0/src/vteaccess.c vte-0.40.0.new/src/vteaccess.c
3
-
--- vte-0.40.0/src/vteaccess.c 2015-03-16 06:34:37.000000000 -0400
4
-
+++ vte-0.40.0.new/src/vteaccess.c 2015-04-10 00:08:53.146853382 -0400
5
-
@@ -1444,7 +1444,7 @@
6
-
*start_offset = offset_from_xy (priv, start_x, start_y);
7
-
_vte_terminal_get_end_selection (terminal, &end_x, &end_y);
8
-
*end_offset = offset_from_xy (priv, end_x, end_y);
9
-
- return _vte_terminal_get_selection (terminal);
10
-
+ return vte_terminal_get_selection (terminal);
14
-
diff --unified -aur vte-0.40.0/src/vte.c vte-0.40.0.new/src/vte.c
15
-
--- vte-0.40.0/src/vte.c 2015-03-18 12:38:09.000000000 -0400
16
-
+++ vte-0.40.0.new/src/vte.c 2015-04-10 00:08:53.150186722 -0400
20
-
gboolean include_trailing_spaces);
21
-
-static void _vte_terminal_disconnect_pty_read(VteTerminal *terminal);
22
-
static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal);
23
-
static void vte_terminal_stop_processing (VteTerminal *terminal);
25
-
@@ -3344,9 +3343,10 @@
26
-
_vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n");
27
-
terminal->pvt->pty_input_source = 0;
30
-
-_vte_terminal_connect_pty_read(VteTerminal *terminal)
32
-
+vte_terminal_connect_pty_read(VteTerminal *terminal)
34
-
+ g_return_if_fail(VTE_IS_TERMINAL(terminal));
35
-
if (terminal->pvt->pty_channel == NULL) {
38
-
@@ -3398,9 +3398,10 @@
43
-
-_vte_terminal_disconnect_pty_read(VteTerminal *terminal)
45
-
+vte_terminal_disconnect_pty_read(VteTerminal *terminal)
47
-
+ g_return_if_fail(VTE_IS_TERMINAL(terminal));
48
-
if (terminal->pvt->pty_input_source != 0) {
49
-
_vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n");
50
-
g_source_remove(terminal->pvt->pty_input_source);
51
-
@@ -6302,6 +6303,28 @@
56
-
+ * vte_terminal_set_cursor_position:
57
-
+ * @terminal: a #VteTerminal
58
-
+ * @column: the new cursor column
59
-
+ * @row: the new cursor row
61
-
+ * Set the location of the cursor.
64
-
+vte_terminal_set_cursor_position(VteTerminal *terminal,
65
-
+ long column, long row)
67
-
+ g_return_if_fail(VTE_IS_TERMINAL(terminal));
69
-
+ _vte_invalidate_cursor_once(terminal, FALSE);
70
-
+ terminal->pvt->cursor.col = column;
71
-
+ terminal->pvt->cursor.row = row;
72
-
+ _vte_invalidate_cursor_once(terminal, FALSE);
73
-
+ _vte_check_cursor_blink(terminal);
74
-
+ vte_terminal_queue_cursor_moved(terminal);
77
-
static GtkClipboard *
78
-
vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board)
80
-
@@ -6465,7 +6488,7 @@
81
-
vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE);
83
-
/* Temporarily stop caring about input from the child. */
84
-
- _vte_terminal_disconnect_pty_read(terminal);
85
-
+ vte_terminal_disconnect_pty_read(terminal);
89
-
@@ -6482,7 +6505,7 @@
90
-
terminal->pvt->selecting = FALSE;
92
-
/* Reconnect to input from the child if we paused it. */
93
-
- _vte_terminal_connect_pty_read(terminal);
94
-
+ vte_terminal_connect_pty_read(terminal);
98
-
@@ -6982,6 +7005,50 @@
99
-
vte_terminal_deselect_all (terminal);
103
-
+ * vte_terminal_get_selection_block_mode:
104
-
+ * @terminal: a #VteTerminal
106
-
+ * Checks whether or not block selection is enabled.
108
-
+ * Returns: %TRUE if block selection is enabled, %FALSE if not
111
-
+vte_terminal_get_selection_block_mode(VteTerminal *terminal) {
112
-
+ g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
113
-
+ return terminal->pvt->selection_block_mode;
117
-
+ * vte_terminal_set_selection_block_mode:
118
-
+ * @terminal: a #VteTerminal
119
-
+ * @block_mode: whether block selection is enabled
121
-
+ * Sets whether or not block selection is enabled.
124
-
+vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) {
125
-
+ g_return_if_fail(VTE_IS_TERMINAL(terminal));
126
-
+ terminal->pvt->selection_block_mode = block_mode;
130
-
+ * vte_terminal_select_text:
131
-
+ * @terminal: a #VteTerminal
132
-
+ * @start_col: the starting column for the selection
133
-
+ * @start_row: the starting row for the selection
134
-
+ * @end_col: the end column for the selection
135
-
+ * @end_row: the end row for the selection
137
-
+ * Sets the current selection region.
140
-
+vte_terminal_select_text(VteTerminal *terminal,
141
-
+ long start_col, long start_row,
142
-
+ long end_col, long end_row) {
143
-
+ _vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0);
146
-
/* Autoscroll a bit. */
148
-
vte_terminal_autoscroll(VteTerminal *terminal)
149
-
@@ -8631,7 +8698,7 @@
151
-
kill(terminal->pvt->pty_pid, SIGHUP);
153
-
- _vte_terminal_disconnect_pty_read(terminal);
154
-
+ vte_terminal_disconnect_pty_read(terminal);
155
-
_vte_terminal_disconnect_pty_write(terminal);
156
-
if (terminal->pvt->pty_channel != NULL) {
157
-
g_io_channel_unref (terminal->pvt->pty_channel);
158
-
@@ -12188,7 +12255,7 @@
159
-
g_object_freeze_notify(object);
161
-
if (pvt->pty != NULL) {
162
-
- _vte_terminal_disconnect_pty_read(terminal);
163
-
+ vte_terminal_disconnect_pty_read(terminal);
164
-
_vte_terminal_disconnect_pty_write(terminal);
166
-
if (terminal->pvt->pty_channel != NULL) {
167
-
@@ -12243,7 +12310,7 @@
168
-
_vte_terminal_setup_utf8 (terminal);
170
-
/* Open channels to listen for input on. */
171
-
- _vte_terminal_connect_pty_read (terminal);
172
-
+ vte_terminal_connect_pty_read (terminal);
174
-
g_object_notify(object, "pty");
176
-
@@ -12276,7 +12343,7 @@
180
-
-_vte_terminal_get_selection(VteTerminal *terminal)
181
-
+vte_terminal_get_selection(VteTerminal *terminal)
183
-
g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
185
-
diff --unified -aur vte-0.40.0/src/vteint.h vte-0.40.0.new/src/vteint.h
186
-
--- vte-0.40.0/src/vteint.h 2014-05-28 08:22:48.000000000 -0400
187
-
+++ vte-0.40.0.new/src/vteint.h 2015-04-10 00:08:53.153520062 -0400
191
-
void _vte_terminal_accessible_ref(VteTerminal *terminal);
192
-
-char* _vte_terminal_get_selection(VteTerminal *terminal);
193
-
void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y);
194
-
void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y);
195
-
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);
196
-
diff --unified -aur vte-0.40.0/src/vteterminal.h vte-0.40.0.new/src/vteterminal.h
197
-
--- vte-0.40.0/src/vteterminal.h 2015-03-18 12:38:09.000000000 -0400
198
-
+++ vte-0.40.0.new/src/vteterminal.h 2015-04-10 00:08:53.150186722 -0400
199
-
@@ -169,6 +169,18 @@
201
-
void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
202
-
void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
203
-
+gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
204
-
+void vte_terminal_set_selection_block_mode(VteTerminal *terminal,
205
-
+ gboolean block_mode) _VTE_GNUC_NONNULL(1);
206
-
+void vte_terminal_select_text(VteTerminal *terminal,
207
-
+ long start_col, long start_row,
208
-
+ long end_col, long end_row) _VTE_GNUC_NONNULL(1);
210
-
+vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
212
-
+/* pause and unpause output */
213
-
+void vte_terminal_disconnect_pty_read(VteTerminal *vte);
214
-
+void vte_terminal_connect_pty_read(VteTerminal *vte);
216
-
/* By-word selection */
217
-
void vte_terminal_set_word_char_exceptions(VteTerminal *terminal,
218
-
@@ -280,6 +292,8 @@
219
-
void vte_terminal_get_cursor_position(VteTerminal *terminal,
221
-
glong *row) _VTE_GNUC_NONNULL(1);
222
-
+void vte_terminal_set_cursor_position(VteTerminal *terminal,
223
-
+ long column, long row) _VTE_GNUC_NONNULL(1);
225
-
/* Add a matching expression, returning the tag the widget assigns to that