parent
9fd1807279
commit
34f681dcf8
|
@ -2,20 +2,20 @@
|
|||
, selectTextPatch ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
versionMajor = "0.38";
|
||||
versionMinor = "0";
|
||||
versionMajor = "0.36";
|
||||
versionMinor = "3";
|
||||
moduleName = "vte";
|
||||
|
||||
name = "${moduleName}-${versionMajor}.${versionMinor}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
|
||||
sha256 = "1llg2xnjpn630vd86ci8csbjjacj3ia6syck2bsq4kinr66z5zsw";
|
||||
sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
|
||||
};
|
||||
|
||||
patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.patch;
|
||||
|
||||
buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses vala libxml2 ];
|
||||
buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
|
||||
|
||||
configureFlags = [ "--enable-introspection" ];
|
||||
|
||||
|
|
|
@ -1,20 +1,7 @@
|
|||
Only in vte-0.38.0.new: expose_select_text.patch
|
||||
diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c
|
||||
--- vte-0.38.0/src/vteaccess.c 2014-08-13 08:00:38.000000000 -0400
|
||||
+++ vte-0.38.0.new/src/vteaccess.c 2014-09-21 17:05:23.934641193 -0400
|
||||
@@ -1427,7 +1427,7 @@
|
||||
*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 -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
|
||||
--- vte-0.38.0/src/vte.c 2014-09-13 03:23:47.000000000 -0400
|
||||
+++ vte-0.38.0.new/src/vte.c 2014-09-21 17:03:04.671656749 -0400
|
||||
@@ -122,7 +122,6 @@
|
||||
diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c
|
||||
--- vte-0.32.2-old/src/vte.c 2012-07-13 21:09:04.003969877 -0400
|
||||
+++ vte-0.32.2/src/vte.c 2012-08-30 04:30:04.285924831 -0400
|
||||
@@ -129,7 +129,6 @@
|
||||
gpointer data,
|
||||
GArray *attributes,
|
||||
gboolean include_trailing_spaces);
|
||||
|
@ -22,7 +9,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
|
|||
static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal);
|
||||
static void vte_terminal_stop_processing (VteTerminal *terminal);
|
||||
|
||||
@@ -3267,9 +3266,10 @@
|
||||
@@ -3508,8 +3507,8 @@
|
||||
_vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n");
|
||||
terminal->pvt->pty_input_source = 0;
|
||||
}
|
||||
|
@ -31,11 +18,9 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
|
|||
+void
|
||||
+vte_terminal_connect_pty_read(VteTerminal *terminal)
|
||||
{
|
||||
+ g_return_if_fail(VTE_IS_TERMINAL(terminal));
|
||||
if (terminal->pvt->pty_channel == NULL) {
|
||||
return;
|
||||
}
|
||||
@@ -3321,9 +3321,10 @@
|
||||
@@ -3560,8 +3559,8 @@
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -44,11 +29,29 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
|
|||
+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);
|
||||
@@ -6154,6 +6155,28 @@
|
||||
@@ -3708,8 +3707,8 @@
|
||||
return NULL;
|
||||
}
|
||||
|
||||
-static char *
|
||||
-_vte_terminal_get_user_shell_with_fallback (void)
|
||||
+char *
|
||||
+vte_terminal_get_user_shell_with_fallback (void)
|
||||
{
|
||||
char *command;
|
||||
const gchar *env;
|
||||
@@ -3744,7 +3743,7 @@
|
||||
char **argv2;
|
||||
char *shell = NULL;
|
||||
|
||||
- argv2 = __vte_pty_get_argv(command ? command : (shell = _vte_terminal_get_user_shell_with_fallback ()),
|
||||
+ argv2 = __vte_pty_get_argv(command ? command : (shell = vte_terminal_get_user_shell_with_fallback ()),
|
||||
argv,
|
||||
flags);
|
||||
g_free(shell);
|
||||
@@ -6545,6 +6544,28 @@
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -77,8 +80,8 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
|
|||
static GtkClipboard *
|
||||
vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board)
|
||||
{
|
||||
@@ -6319,7 +6342,7 @@
|
||||
vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE);
|
||||
@@ -6676,7 +6697,7 @@
|
||||
terminal->pvt->selection_start.row);
|
||||
|
||||
/* Temporarily stop caring about input from the child. */
|
||||
- _vte_terminal_disconnect_pty_read(terminal);
|
||||
|
@ -86,7 +89,7 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
|
|||
}
|
||||
|
||||
static gboolean
|
||||
@@ -6336,7 +6359,7 @@
|
||||
@@ -6693,7 +6714,7 @@
|
||||
terminal->pvt->selecting = FALSE;
|
||||
|
||||
/* Reconnect to input from the child if we paused it. */
|
||||
|
@ -95,8 +98,35 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
|
|||
|
||||
return TRUE;
|
||||
}
|
||||
@@ -6834,6 +6857,50 @@
|
||||
vte_terminal_deselect_all (terminal);
|
||||
@@ -8994,7 +9015,7 @@
|
||||
#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);
|
||||
@@ -14384,7 +14405,7 @@
|
||||
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) {
|
||||
@@ -14440,7 +14461,7 @@
|
||||
_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");
|
||||
g_object_notify(object, "pty-object");
|
||||
@@ -14567,6 +14588,50 @@
|
||||
}
|
||||
}
|
||||
|
||||
+/**
|
||||
|
@ -143,72 +173,21 @@ diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
|
|||
+ _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)
|
||||
@@ -8476,7 +8543,7 @@
|
||||
#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);
|
||||
@@ -12533,7 +12600,7 @@
|
||||
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) {
|
||||
@@ -12588,7 +12655,7 @@
|
||||
_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");
|
||||
|
||||
@@ -12623,7 +12690,7 @@
|
||||
}
|
||||
|
||||
char *
|
||||
-_vte_terminal_get_selection(VteTerminal *terminal)
|
||||
+vte_terminal_get_selection(VteTerminal *terminal)
|
||||
{
|
||||
g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
|
||||
|
||||
Only in vte-0.38.0.new/src: .vte.c.swp
|
||||
diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h
|
||||
--- vte-0.38.0/src/vteint.h 2014-05-16 13:51:26.000000000 -0400
|
||||
+++ vte-0.38.0.new/src/vteint.h 2014-09-21 17:05:44.934589281 -0400
|
||||
@@ -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 -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h
|
||||
--- vte-0.38.0/src/vteterminal.h 2014-09-13 03:23:47.000000000 -0400
|
||||
+++ vte-0.38.0.new/src/vteterminal.h 2014-09-21 17:03:39.094903032 -0400
|
||||
@@ -170,6 +170,18 @@
|
||||
|
||||
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,
|
||||
diff -aur vte-0.32.2-old/src/vte.h vte-0.32.2/src/vte.h
|
||||
--- vte-0.32.2-old/src/vte.h 2012-07-13 21:09:04.003969877 -0400
|
||||
+++ vte-0.32.2/src/vte.h 2012-08-30 04:30:09.695999432 -0400
|
||||
@@ -296,6 +296,15 @@
|
||||
/* simple manipulation of selection */
|
||||
void vte_terminal_select_all(VteTerminal *terminal);
|
||||
void vte_terminal_select_none(VteTerminal *terminal);
|
||||
+gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal);
|
||||
+void vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode);
|
||||
+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);
|
||||
+ long end_col, long end_row);
|
||||
+
|
||||
+/* pause and unpause output */
|
||||
+void vte_terminal_disconnect_pty_read(VteTerminal *vte);
|
||||
|
@ -216,13 +195,20 @@ diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h
|
|||
|
||||
/* Set the terminal's size. */
|
||||
void vte_terminal_set_size(VteTerminal *terminal,
|
||||
@@ -276,6 +288,8 @@
|
||||
@@ -435,6 +444,8 @@
|
||||
GArray *attributes);
|
||||
void vte_terminal_get_cursor_position(VteTerminal *terminal,
|
||||
glong *column,
|
||||
glong *row) _VTE_GNUC_NONNULL(1);
|
||||
glong *column, glong *row);
|
||||
+void vte_terminal_set_cursor_position(VteTerminal *terminal,
|
||||
+ long column, long row) _VTE_GNUC_NONNULL(1);
|
||||
+ long column, long row);
|
||||
/* Display string matching: clear all matching expressions. */
|
||||
void vte_terminal_match_clear_all(VteTerminal *terminal);
|
||||
|
||||
/* Add a matching expression, returning the tag the widget assigns to that
|
||||
* expression. */
|
||||
Only in vte-0.38.0.new/src: .vteterminal.h.swp
|
||||
@@ -484,6 +495,7 @@
|
||||
VtePty *vte_terminal_get_pty_object(VteTerminal *terminal);
|
||||
|
||||
char *vte_get_user_shell (void);
|
||||
+char *vte_terminal_get_user_shell_with_fallback(void);
|
||||
|
||||
/* Accessors for bindings. */
|
||||
#if !GTK_CHECK_VERSION (2, 91, 2)
|
||||
|
|
Loading…
Reference in New Issue