From 46466f3644c6715a282ab997703a901c1c43a7be Mon Sep 17 00:00:00 2001 From: Juerg Billeter Date: Thu, 22 Nov 2007 19:01:49 +0000 Subject: [PATCH] update to use vala-gen-introspect 2007-11-22 Juerg Billeter * vapi/packages/vte/: update to use vala-gen-introspect * vapi/vte.vapi: regenerated svn path=/trunk/; revision=701 --- ChangeLog | 6 + vapi/packages/vte/vte.excludes | 7 - vapi/packages/vte/vte.files | 4 +- vapi/packages/vte/vte.gi | 838 +++++++++++++++++++++++++++++++++++++++++ vapi/packages/vte/vte.gidl | 833 ---------------------------------------- vapi/packages/vte/vte.metadata | 3 + vapi/packages/vte/vte.patch | 34 -- vapi/vte.vapi | 70 ++-- 8 files changed, 885 insertions(+), 910 deletions(-) delete mode 100644 vapi/packages/vte/vte.excludes create mode 100644 vapi/packages/vte/vte.gi delete mode 100644 vapi/packages/vte/vte.gidl delete mode 100644 vapi/packages/vte/vte.patch diff --git a/ChangeLog b/ChangeLog index 5213852..899a90e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2007-11-22 Jürg Billeter + * vapi/packages/vte/: update to use vala-gen-introspect + + * vapi/vte.vapi: regenerated + +2007-11-22 Jürg Billeter + * vapi/packages/gtksourceview-2.0/: update to use vala-gen-introspect * vapi/gtksourceview-2.0.vapi: regenerated diff --git a/vapi/packages/vte/vte.excludes b/vapi/packages/vte/vte.excludes deleted file mode 100644 index 78330c6..0000000 --- a/vapi/packages/vte/vte.excludes +++ /dev/null @@ -1,7 +0,0 @@ -vtebg.* -debug.* -vteglyph.* -ring.* -vtetree.* -vteconv.* -vteseq.* diff --git a/vapi/packages/vte/vte.files b/vapi/packages/vte/vte.files index 85de9cf..bb9114c 100644 --- a/vapi/packages/vte/vte.files +++ b/vapi/packages/vte/vte.files @@ -1 +1,3 @@ -src +include/vte/vte.h +include/vte +lib/libvte.so diff --git a/vapi/packages/vte/vte.gi b/vapi/packages/vte/vte.gi new file mode 100644 index 0000000..19f99a6 --- /dev/null +++ b/vapi/packages/vte/vte.gi @@ -0,0 +1,838 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vapi/packages/vte/vte.gidl b/vapi/packages/vte/vte.gidl deleted file mode 100644 index 5b80fd9..0000000 --- a/vapi/packages/vte/vte.gidl +++ /dev/null @@ -1,833 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vapi/packages/vte/vte.metadata b/vapi/packages/vte/vte.metadata index fc444c7..8560e90 100644 --- a/vapi/packages/vte/vte.metadata +++ b/vapi/packages/vte/vte.metadata @@ -1,7 +1,10 @@ Vte cheader_filename="vte/vte.h" VteReaper cheader_filename="vte/reaper.h" VteTerminalAccessible cheader_filename="vte/vteaccess.h" +VteTerminal::copy_clipboard has_emitter="1" vte_terminal_fork_command.argv is_array="1" vte_terminal_fork_command.envv is_array="1" vte_terminal_forkpty.envv is_array="1" +VteTerminal::paste_clipboard has_emitter="1" +VteTerminal.pvt hidden="1" diff --git a/vapi/packages/vte/vte.patch b/vapi/packages/vte/vte.patch deleted file mode 100644 index 22fb0fe..0000000 --- a/vapi/packages/vte/vte.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- vte-0.15.3/src/vte.h.orig 2007-02-17 19:38:45.000000000 +0100 -+++ vte-0.15.3/src/vte.h 2007-02-18 09:23:05.000000000 +0100 -@@ -330,27 +330,19 @@ - * VteCharAttributes structure in the passed GArray, if the array was not NULL. - * Note that it will have one entry per byte, not per character, so indexes - * should match up exactly. */ -+typedef gboolean (*VteIsSelectedFunc) (VteTerminal *terminal, glong column, glong row, gpointer data); - char *vte_terminal_get_text(VteTerminal *terminal, -- gboolean(*is_selected)(VteTerminal *terminal, -- glong column, -- glong row, -- gpointer data), -+ VteIsSelectedFunc is_selected, - gpointer data, - GArray *attributes); - char *vte_terminal_get_text_include_trailing_spaces(VteTerminal *terminal, -- gboolean(*is_selected)(VteTerminal *terminal, -- glong column, -- glong row, -- gpointer data), -+ VteIsSelectedFunc is_selected, - gpointer data, - GArray *attributes); - char *vte_terminal_get_text_range(VteTerminal *terminal, - glong start_row, glong start_col, - glong end_row, glong end_col, -- gboolean(*is_selected)(VteTerminal *terminal, -- glong column, -- glong row, -- gpointer data), -+ VteIsSelectedFunc is_selected, - gpointer data, - GArray *attributes); - void vte_terminal_get_cursor_position(VteTerminal *terminal, diff --git a/vapi/vte.vapi b/vapi/vte.vapi index d31a37f..509c886 100644 --- a/vapi/vte.vapi +++ b/vapi/vte.vapi @@ -15,15 +15,25 @@ namespace Vte { ASCII_DELETE, DELETE_SEQUENCE, } + [CCode (cheader_filename = "vte/vte.h")] + public class CharAttributes { + public long row; + public long column; + public Gdk.Color fore; + public Gdk.Color back; + public uint underline; + public uint strikethrough; + } [CCode (cheader_filename = "vte/reaper.h")] public class Reaper : GLib.Object { + public weak GLib.IOChannel channel; + public weak int[] iopipe; public static int add_child (GLib.Pid pid); public static weak Vte.Reaper get (); - public static GLib.Type get_type (); public signal void child_exited (int p0, int p1); } [CCode (cheader_filename = "vte/vte.h")] - public class Terminal : Gtk.Widget { + public class Terminal : Gtk.Widget, Atk.Implementor, Gtk.Buildable { public weak Gtk.Adjustment adjustment; public long char_width; public long char_height; @@ -33,7 +43,6 @@ namespace Vte { public long column_count; public weak string window_title; public weak string icon_title; - public void copy_clipboard (); public void copy_primary (); public void feed (string data, long length); public void feed_child (string text, long length); @@ -61,10 +70,9 @@ namespace Vte { public void get_padding (int xpad, int ypad); public long get_row_count (); public weak string get_status_line (); - public weak string get_text (Vte.IsSelectedFunc is_selected, pointer data, GLib.Array attributes); - public weak string get_text_include_trailing_spaces (Vte.IsSelectedFunc is_selected, pointer data, GLib.Array attributes); - public weak string get_text_range (long start_row, long start_col, long end_row, long end_col, Vte.IsSelectedFunc is_selected, pointer data, GLib.Array attributes); - public static weak Gtk.Type get_type (); + public weak string get_text (GLib.Callback is_selected, pointer data, GLib.Array attributes); + public weak string get_text_include_trailing_spaces (GLib.Callback is_selected, pointer data, GLib.Array attributes); + public weak string get_text_range (long start_row, long start_col, long end_row, long end_col, GLib.Callback is_selected, pointer data, GLib.Array attributes); public bool get_using_xft (); public bool get_visible_bell (); public weak string get_window_title (); @@ -77,7 +85,6 @@ namespace Vte { public void match_set_cursor (int tag, Gdk.Cursor cursor); public void match_set_cursor_type (int tag, Gdk.CursorType cursor_type); public Terminal (); - public void paste_clipboard (); public void paste_primary (); public void reset (bool full, bool clear_history); public void select_all (); @@ -116,51 +123,44 @@ namespace Vte { public void set_size (long columns, long rows); public void set_visible_bell (bool is_visible); public void set_word_chars (string spec); + public signal void char_size_changed (uint char_width, uint char_height); public signal void child_exited (); - public signal void window_title_changed (); - public signal void icon_title_changed (); - public signal void encoding_changed (); public signal void commit (string text, uint size); - public signal void emulation_changed (); - public signal void char_size_changed (uint char_width, uint char_height); - public signal void selection_changed (); public signal void contents_changed (); + [HasEmitter] + public signal void copy_clipboard (); public signal void cursor_moved (); + public signal void decrease_font_size (); public signal void deiconify_window (); + public signal void emulation_changed (); + public signal void encoding_changed (); + public signal void eof (); + public signal void icon_title_changed (); public signal void iconify_window (); - public signal void raise_window (); + public signal void increase_font_size (); public signal void lower_window (); - public signal void refresh_window (); - public signal void restore_window (); public signal void maximize_window (); - public signal void resize_window (uint width, uint height); public signal void move_window (uint x, uint y); + [HasEmitter] + public signal void paste_clipboard (); + public signal void raise_window (); + public signal void refresh_window (); + public signal void resize_window (uint width, uint height); + public signal void restore_window (); + public signal void selection_changed (); public signal void status_line_changed (); - public signal void increase_font_size (); - public signal void decrease_font_size (); - public signal void text_modified (); - public signal void text_inserted (); public signal void text_deleted (); + public signal void text_inserted (); + public signal void text_modified (); public signal void text_scrolled (int delta); + public signal void window_title_changed (); } [CCode (cheader_filename = "vte/vteaccess.h")] - public class TerminalAccessible : Gtk.Accessible, Atk.Text, Atk.Component, Atk.Action { - public static weak Gtk.Type get_type (); + public class TerminalAccessible : Gtk.Accessible, Atk.Component, Atk.Action, Atk.Text { public TerminalAccessible (Vte.Terminal terminal); } [CCode (cheader_filename = "vte/vte.h")] public class TerminalAccessibleFactory : Atk.ObjectFactory { - public static weak Gtk.Type get_type (); public TerminalAccessibleFactory (); } - [CCode (cheader_filename = "vte/vte.h")] - public class CharAttributes { - public long row; - public long column; - public Gdk.Color fore; - public Gdk.Color back; - public uint underline; - public uint strikethrough; - } - public static delegate bool IsSelectedFunc (Vte.Terminal terminal, long column, long row, pointer data); } -- 2.7.4