GNOME.org
 

[vala] vte: Update to 0.27.90

commit 133fae06cf6cf7428bb14b77d8617991b09d264d
Author: Jürg Billeter <j bitron ch>
Date:   Tue Mar 22 21:18:02 2011 +0100

    vte: Update to 0.27.90
    
    Fixes bug 627410.

 vapi/packages/vte/vte.defines  |    1 +
 vapi/packages/vte/vte.files    |    4 +-
 vapi/packages/vte/vte.gi       |  191 ++++++++++++++++++++++++++++++++++++++--
 vapi/packages/vte/vte.metadata |    9 +-
 vapi/vte.vapi                  |   65 ++++++++++++--
 5 files changed, 250 insertions(+), 20 deletions(-)
---
diff --git a/vapi/packages/vte/vte.defines b/vapi/packages/vte/vte.defines
new file mode 100644
index 0000000..169706c
--- /dev/null
+++ b/vapi/packages/vte/vte.defines
@@ -0,0 +1 @@
+-DVTE_COMPILATION
diff --git a/vapi/packages/vte/vte.files b/vapi/packages/vte/vte.files
index bb9114c..2fb7577 100644
--- a/vapi/packages/vte/vte.files
+++ b/vapi/packages/vte/vte.files
@@ -1,3 +1,3 @@
-include/vte/vte.h
-include/vte
+include/vte-0.0/vte/vte.h
+include/vte-0.0/vte
 lib/libvte.so
diff --git a/vapi/packages/vte/vte.gi b/vapi/packages/vte/vte.gi
index 55c4f64..8fa75de 100644
--- a/vapi/packages/vte/vte.gi
+++ b/vapi/packages/vte/vte.gi
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <api version="1.0">
 	<namespace name="Vte">
+		<function name="get_user_shell" symbol="vte_get_user_shell">
+			<return-type type="char*"/>
+		</function>
 		<callback name="VteSelectionFunc">
 			<return-type type="gboolean"/>
 			<parameters>
@@ -18,6 +21,12 @@
 			<field name="underline" type="guint"/>
 			<field name="strikethrough" type="guint"/>
 		</struct>
+		<struct name="VtePtyClass">
+		</struct>
+		<enum name="VtePtyError" type-name="VtePtyError" get-type="vte_pty_error_get_type">
+			<member name="VTE_PTY_ERROR_PTY_HELPER_FAILED" value="0"/>
+			<member name="VTE_PTY_ERROR_PTY98_FAILED" value="1"/>
+		</enum>
 		<enum name="VteTerminalAntiAlias" type-name="VteTerminalAntiAlias" get-type="vte_terminal_anti_alias_get_type">
 			<member name="VTE_ANTI_ALIAS_USE_DEFAULT" value="0"/>
 			<member name="VTE_ANTI_ALIAS_FORCE_ENABLE" value="1"/>
@@ -43,6 +52,90 @@
 		<enum name="VteTerminalWriteFlags" type-name="VteTerminalWriteFlags" get-type="vte_terminal_write_flags_get_type">
 			<member name="VTE_TERMINAL_WRITE_DEFAULT" value="0"/>
 		</enum>
+		<flags name="VtePtyFlags" type-name="VtePtyFlags" get-type="vte_pty_flags_get_type">
+			<member name="VTE_PTY_NO_LASTLOG" value="1"/>
+			<member name="VTE_PTY_NO_UTMP" value="2"/>
+			<member name="VTE_PTY_NO_WTMP" value="4"/>
+			<member name="VTE_PTY_NO_HELPER" value="8"/>
+			<member name="VTE_PTY_NO_FALLBACK" value="16"/>
+			<member name="VTE_PTY_DEFAULT" value="0"/>
+		</flags>
+		<object name="VtePty" parent="GObject" type-name="VtePty" get-type="vte_pty_get_type">
+			<implements>
+				<interface name="GInitable"/>
+			</implements>
+			<method name="child_setup" symbol="vte_pty_child_setup">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="pty" type="VtePty*"/>
+				</parameters>
+			</method>
+			<method name="close" symbol="vte_pty_close">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="pty" type="VtePty*"/>
+				</parameters>
+			</method>
+			<method name="error_quark" symbol="vte_pty_error_quark">
+				<return-type type="GQuark"/>
+			</method>
+			<method name="get_fd" symbol="vte_pty_get_fd">
+				<return-type type="int"/>
+				<parameters>
+					<parameter name="pty" type="VtePty*"/>
+				</parameters>
+			</method>
+			<method name="get_size" symbol="vte_pty_get_size">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="pty" type="VtePty*"/>
+					<parameter name="rows" type="int*"/>
+					<parameter name="columns" type="int*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="vte_pty_new">
+				<return-type type="VtePty*"/>
+				<parameters>
+					<parameter name="flags" type="VtePtyFlags"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_foreign" symbol="vte_pty_new_foreign">
+				<return-type type="VtePty*"/>
+				<parameters>
+					<parameter name="fd" type="int"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</constructor>
+			<method name="set_size" symbol="vte_pty_set_size">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="pty" type="VtePty*"/>
+					<parameter name="rows" type="int"/>
+					<parameter name="columns" type="int"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<method name="set_term" symbol="vte_pty_set_term">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="pty" type="VtePty*"/>
+					<parameter name="emulation" type="char*"/>
+				</parameters>
+			</method>
+			<method name="set_utf8" symbol="vte_pty_set_utf8">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="pty" type="VtePty*"/>
+					<parameter name="utf8" type="gboolean"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
+			<property name="fd" type="gint" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="flags" type="VtePtyFlags" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="term" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+		</object>
 		<object name="VteReaper" parent="GObject" type-name="VteReaper" get-type="vte_reaper_get_type">
 			<method name="add_child" symbol="vte_reaper_add_child">
 				<return-type type="int"/>
@@ -110,18 +203,33 @@
 					<parameter name="command" type="char*"/>
 					<parameter name="argv" type="char**"/>
 					<parameter name="envv" type="char**"/>
-					<parameter name="directory" type="char*"/>
+					<parameter name="working_directory" type="char*"/>
 					<parameter name="lastlog" type="gboolean"/>
 					<parameter name="utmp" type="gboolean"/>
 					<parameter name="wtmp" type="gboolean"/>
 				</parameters>
 			</method>
+			<method name="fork_command_full" symbol="vte_terminal_fork_command_full">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="terminal" type="VteTerminal*"/>
+					<parameter name="pty_flags" type="VtePtyFlags"/>
+					<parameter name="working_directory" type="char*"/>
+					<parameter name="argv" type="char**"/>
+					<parameter name="envv" type="char**"/>
+					<parameter name="spawn_flags" type="GSpawnFlags"/>
+					<parameter name="child_setup" type="GSpawnChildSetupFunc"/>
+					<parameter name="child_setup_data" type="gpointer"/>
+					<parameter name="child_pid" type="GPid*"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
 			<method name="forkpty" symbol="vte_terminal_forkpty">
 				<return-type type="pid_t"/>
 				<parameters>
 					<parameter name="terminal" type="VteTerminal*"/>
 					<parameter name="envv" type="char**"/>
-					<parameter name="directory" type="char*"/>
+					<parameter name="working_directory" type="char*"/>
 					<parameter name="lastlog" type="gboolean"/>
 					<parameter name="utmp" type="gboolean"/>
 					<parameter name="wtmp" type="gboolean"/>
@@ -257,6 +365,12 @@
 					<parameter name="terminal" type="VteTerminal*"/>
 				</parameters>
 			</method>
+			<method name="get_pty_object" symbol="vte_terminal_get_pty_object">
+				<return-type type="VtePty*"/>
+				<parameters>
+					<parameter name="terminal" type="VteTerminal*"/>
+				</parameters>
+			</method>
 			<method name="get_row_count" symbol="vte_terminal_get_row_count">
 				<return-type type="glong"/>
 				<parameters>
@@ -274,7 +388,7 @@
 				<parameters>
 					<parameter name="terminal" type="VteTerminal*"/>
 					<parameter name="is_selected" type="VteSelectionFunc"/>
-					<parameter name="data" type="gpointer"/>
+					<parameter name="user_data" type="gpointer"/>
 					<parameter name="attributes" type="GArray*"/>
 				</parameters>
 			</method>
@@ -283,7 +397,7 @@
 				<parameters>
 					<parameter name="terminal" type="VteTerminal*"/>
 					<parameter name="is_selected" type="VteSelectionFunc"/>
-					<parameter name="data" type="gpointer"/>
+					<parameter name="user_data" type="gpointer"/>
 					<parameter name="attributes" type="GArray*"/>
 				</parameters>
 			</method>
@@ -296,7 +410,7 @@
 					<parameter name="end_row" type="glong"/>
 					<parameter name="end_col" type="glong"/>
 					<parameter name="is_selected" type="VteSelectionFunc"/>
-					<parameter name="data" type="gpointer"/>
+					<parameter name="user_data" type="gpointer"/>
 					<parameter name="attributes" type="GArray*"/>
 				</parameters>
 			</method>
@@ -408,14 +522,60 @@
 					<parameter name="terminal" type="VteTerminal*"/>
 				</parameters>
 			</method>
+			<method name="pty_new" symbol="vte_terminal_pty_new">
+				<return-type type="VtePty*"/>
+				<parameters>
+					<parameter name="terminal" type="VteTerminal*"/>
+					<parameter name="flags" type="VtePtyFlags"/>
+					<parameter name="error" type="GError**"/>
+				</parameters>
+			</method>
 			<method name="reset" symbol="vte_terminal_reset">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="terminal" type="VteTerminal*"/>
-					<parameter name="full" type="gboolean"/>
+					<parameter name="clear_tabstops" type="gboolean"/>
 					<parameter name="clear_history" type="gboolean"/>
 				</parameters>
 			</method>
+			<method name="search_find_next" symbol="vte_terminal_search_find_next">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="terminal" type="VteTerminal*"/>
+				</parameters>
+			</method>
+			<method name="search_find_previous" symbol="vte_terminal_search_find_previous">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="terminal" type="VteTerminal*"/>
+				</parameters>
+			</method>
+			<method name="search_get_gregex" symbol="vte_terminal_search_get_gregex">
+				<return-type type="GRegex*"/>
+				<parameters>
+					<parameter name="terminal" type="VteTerminal*"/>
+				</parameters>
+			</method>
+			<method name="search_get_wrap_around" symbol="vte_terminal_search_get_wrap_around">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="terminal" type="VteTerminal*"/>
+				</parameters>
+			</method>
+			<method name="search_set_gregex" symbol="vte_terminal_search_set_gregex">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="terminal" type="VteTerminal*"/>
+					<parameter name="regex" type="GRegex*"/>
+				</parameters>
+			</method>
+			<method name="search_set_wrap_around" symbol="vte_terminal_search_set_wrap_around">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="terminal" type="VteTerminal*"/>
+					<parameter name="wrap_around" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="select_all" symbol="vte_terminal_select_all">
 				<return-type type="void"/>
 				<parameters>
@@ -635,6 +795,13 @@
 					<parameter name="pty_master" type="int"/>
 				</parameters>
 			</method>
+			<method name="set_pty_object" symbol="vte_terminal_set_pty_object">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="terminal" type="VteTerminal*"/>
+					<parameter name="pty" type="VtePty*"/>
+				</parameters>
+			</method>
 			<method name="set_scroll_background" symbol="vte_terminal_set_scroll_background">
 				<return-type type="void"/>
 				<parameters>
@@ -685,6 +852,13 @@
 					<parameter name="spec" type="char*"/>
 				</parameters>
 			</method>
+			<method name="watch_child" symbol="vte_terminal_watch_child">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="terminal" type="VteTerminal*"/>
+					<parameter name="child_pid" type="GPid"/>
+				</parameters>
+			</method>
 			<method name="write_contents" symbol="vte_terminal_write_contents">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -713,6 +887,7 @@
 			<property name="icon-title" type="char*" readable="1" writable="0" construct="0" construct-only="0"/>
 			<property name="pointer-autohide" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="pty" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="pty-object" type="VtePty*" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="scroll-background" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="scroll-on-keystroke" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="scroll-on-output" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
@@ -953,7 +1128,7 @@
 			</constructor>
 		</object>
 		<constant name="VTE_MAJOR_VERSION" type="int" value="0"/>
-		<constant name="VTE_MICRO_VERSION" type="int" value="3"/>
-		<constant name="VTE_MINOR_VERSION" type="int" value="24"/>
+		<constant name="VTE_MICRO_VERSION" type="int" value="90"/>
+		<constant name="VTE_MINOR_VERSION" type="int" value="27"/>
 	</namespace>
 </api>
diff --git a/vapi/packages/vte/vte.metadata b/vapi/packages/vte/vte.metadata
index c39835a..b68a94f 100644
--- a/vapi/packages/vte/vte.metadata
+++ b/vapi/packages/vte/vte.metadata
@@ -4,9 +4,10 @@ VteTerminalAccessible cheader_filename="vte/vteaccess.h"
 VteTerminal::copy_clipboard has_emitter="1"
 vte_terminal_fork_command no_array_length="1"
 vte_terminal_fork_command.command nullable="1"
-vte_terminal_fork_command.argv is_array="1" no_array_length="1" nullable="1"
-vte_terminal_fork_command.envv is_array="1" no_array_length="1" nullable="1"
-vte_terminal_fork_command.directory nullable="1"
+vte_terminal_fork_command*.argv is_array="1" no_array_length="1" nullable="1"
+vte_terminal_fork_command*.envv is_array="1" no_array_length="1" nullable="1"
+vte_terminal_fork_command*.working_directory nullable="1"
+vte_terminal_fork_command_full.child_setup_data hidden="1"
 vte_terminal_forkpty.envv is_array="1"
 VteTerminal::paste_clipboard has_emitter="1"
 VteTerminal.pvt hidden="1"
@@ -14,4 +15,4 @@ vte_terminal_get_cursor_position.column is_out="1"
 vte_terminal_get_cursor_position.row is_out="1"
 vte_terminal_set_colors.palette is_array="1"
 vte_terminal_set_colors.palette_size hidden="1"
-
+vte_terminal_pty_new transfer_ownership="1"
diff --git a/vapi/vte.vapi b/vapi/vte.vapi
index b44cf17..92e437b 100644
--- a/vapi/vte.vapi
+++ b/vapi/vte.vapi
@@ -12,6 +12,30 @@ namespace Vte {
 		public uint strikethrough;
 		public uint underline;
 	}
+	[CCode (cheader_filename = "vte/vte.h")]
+	public class Pty : GLib.Object, GLib.Initable {
+		[CCode (has_construct_function = false)]
+		public Pty (Vte.PtyFlags flags) throws GLib.Error;
+		public void child_setup ();
+		public void close ();
+		public static GLib.Quark error_quark ();
+		[CCode (has_construct_function = false)]
+		public Pty.foreign (int fd) throws GLib.Error;
+		public int get_fd ();
+		public bool get_size (int rows, int columns) throws GLib.Error;
+		public bool set_size (int rows, int columns) throws GLib.Error;
+		public void set_term (string emulation);
+		public bool set_utf8 (bool utf8) throws GLib.Error;
+		public int fd { get; construct; }
+		[NoAccessorMethod]
+		public Vte.PtyFlags flags { get; construct; }
+		[NoAccessorMethod]
+		public string term { owned get; set; }
+	}
+	[Compact]
+	[CCode (cheader_filename = "vte/vte.h")]
+	public class PtyClass {
+	}
 	[CCode (cheader_filename = "vte/reaper.h")]
 	public class Reaper : GLib.Object {
 		[CCode (has_construct_function = false)]
@@ -35,8 +59,9 @@ namespace Vte {
 		public void feed (string data, long length);
 		public void feed_child (string text, long length);
 		public void feed_child_binary (string data, long length);
-		public int fork_command (string? command, [CCode (array_length = false)] string[]? argv, [CCode (array_length = false)] string[]? envv, string? directory, bool lastlog, bool utmp, bool wtmp);
-		public int forkpty (string[] envv, string directory, bool lastlog, bool utmp, bool wtmp);
+		public int fork_command (string? command, [CCode (array_length = false)] string[]? argv, [CCode (array_length = false)] string[]? envv, string? working_directory, bool lastlog, bool utmp, bool wtmp);
+		public bool fork_command_full (Vte.PtyFlags pty_flags, string? working_directory, [CCode (array_length = false)] string[]? argv, [CCode (array_length = false)] string[]? envv, GLib.SpawnFlags spawn_flags, GLib.SpawnChildSetupFunc child_setup, GLib.Pid child_pid) throws GLib.Error;
+		public int forkpty (string[] envv, string working_directory, bool lastlog, bool utmp, bool wtmp);
 		public unowned Gtk.Adjustment get_adjustment ();
 		public bool get_allow_bold ();
 		public bool get_audible_bell ();
@@ -58,11 +83,12 @@ namespace Vte {
 		public bool get_mouse_autohide ();
 		public void get_padding (int xpad, int ypad);
 		public int get_pty ();
+		public unowned Vte.Pty get_pty_object ();
 		public long get_row_count ();
 		public unowned string get_status_line ();
-		public unowned string get_text (Vte.SelectionFunc is_selected, void* data, GLib.Array attributes);
-		public unowned string get_text_include_trailing_spaces (Vte.SelectionFunc is_selected, void* data, GLib.Array attributes);
-		public unowned string get_text_range (long start_row, long start_col, long end_row, long end_col, Vte.SelectionFunc is_selected, void* data, GLib.Array attributes);
+		public unowned string get_text (Vte.SelectionFunc is_selected, GLib.Array attributes);
+		public unowned string get_text_include_trailing_spaces (Vte.SelectionFunc is_selected, GLib.Array attributes);
+		public unowned string get_text_range (long start_row, long start_col, long end_row, long end_col, Vte.SelectionFunc is_selected, GLib.Array attributes);
 		public bool get_using_xft ();
 		public bool get_visible_bell ();
 		public unowned string get_window_title ();
@@ -77,7 +103,14 @@ namespace Vte {
 		public void match_set_cursor_name (int tag, string cursor_name);
 		public void match_set_cursor_type (int tag, Gdk.CursorType cursor_type);
 		public void paste_primary ();
-		public void reset (bool full, bool clear_history);
+		public Vte.Pty pty_new (Vte.PtyFlags flags) throws GLib.Error;
+		public void reset (bool clear_tabstops, bool clear_history);
+		public bool search_find_next ();
+		public bool search_find_previous ();
+		public unowned GLib.Regex search_get_gregex ();
+		public bool search_get_wrap_around ();
+		public void search_set_gregex (GLib.Regex regex);
+		public void search_set_wrap_around (bool wrap_around);
 		public void select_all ();
 		public void select_none ();
 		public void set_allow_bold (bool allow_bold);
@@ -109,6 +142,7 @@ namespace Vte {
 		public void set_mouse_autohide (bool setting);
 		public void set_opacity (uint16 opacity);
 		public void set_pty (int pty_master);
+		public void set_pty_object (Vte.Pty pty);
 		public void set_scroll_background (bool scroll);
 		public void set_scroll_on_keystroke (bool scroll);
 		public void set_scroll_on_output (bool scroll);
@@ -120,6 +154,7 @@ namespace Vte {
 		public virtual void vte_reserved3 ();
 		[NoWrapper]
 		public virtual void vte_reserved4 ();
+		public void watch_child (GLib.Pid child_pid);
 		public bool write_contents (GLib.OutputStream stream, Vte.TerminalWriteFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
 		public bool allow_bold { get; set; }
 		public bool audible_bell { get; set; }
@@ -149,6 +184,7 @@ namespace Vte {
 		[NoAccessorMethod]
 		public bool pointer_autohide { get; set; }
 		public int pty { get; set; }
+		public Vte.Pty pty_object { get; set; }
 		[NoAccessorMethod]
 		public bool scroll_background { get; set; }
 		[NoAccessorMethod]
@@ -205,6 +241,21 @@ namespace Vte {
 		[CCode (type = "AtkObjectFactory*", has_construct_function = false)]
 		public TerminalAccessibleFactory ();
 	}
+	[CCode (cprefix = "VTE_PTY_ERROR_", cheader_filename = "vte/vte.h")]
+	public enum PtyError {
+		PTY_HELPER_FAILED,
+		PTY98_FAILED
+	}
+	[CCode (cprefix = "VTE_PTY_", cheader_filename = "vte/vte.h")]
+	[Flags]
+	public enum PtyFlags {
+		NO_LASTLOG,
+		NO_UTMP,
+		NO_WTMP,
+		NO_HELPER,
+		NO_FALLBACK,
+		DEFAULT
+	}
 	[CCode (cprefix = "VTE_ANTI_ALIAS_", cheader_filename = "vte/vte.h")]
 	public enum TerminalAntiAlias {
 		USE_DEFAULT,
@@ -243,4 +294,6 @@ namespace Vte {
 	public const int MICRO_VERSION;
 	[CCode (cheader_filename = "vte/vte.h")]
 	public const int MINOR_VERSION;
+	[CCode (cheader_filename = "vte/vte.h")]
+	public static unowned string get_user_shell ();
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]