From: Jürg Billeter Date: Tue, 22 Mar 2011 20:18:02 +0000 (+0100) Subject: vte: Update to 0.27.90 X-Git-Tag: 0.12.0~29 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=133fae06cf6cf7428bb14b77d8617991b09d264d;p=thirdparty%2Fvala.git vte: Update to 0.27.90 Fixes bug 627410. --- diff --git a/vapi/packages/vte/vte.defines b/vapi/packages/vte/vte.defines new file mode 100644 index 000000000..169706c87 --- /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 bb9114c09..2fb757730 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 55c4f643a..8fa75dea6 100644 --- a/vapi/packages/vte/vte.gi +++ b/vapi/packages/vte/vte.gi @@ -1,6 +1,9 @@ + + + @@ -18,6 +21,12 @@ + + + + + + @@ -43,6 +52,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -110,18 +203,33 @@ - + + + + + + + + + + + + + + + + - + @@ -257,6 +365,12 @@ + + + + + + @@ -274,7 +388,7 @@ - + @@ -283,7 +397,7 @@ - + @@ -296,7 +410,7 @@ - + @@ -408,14 +522,60 @@ + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -635,6 +795,13 @@ + + + + + + + @@ -685,6 +852,13 @@ + + + + + + + @@ -713,6 +887,7 @@ + @@ -953,7 +1128,7 @@ - - + + diff --git a/vapi/packages/vte/vte.metadata b/vapi/packages/vte/vte.metadata index c39835a6f..b68a94fa5 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 b44cf17a3..92e437bc9 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 (); }