From 0ab8f98fafc0a11754cbc1ac7d1c70e6679854cc Mon Sep 17 00:00:00 2001 From: Juerg Billeter Date: Mon, 9 Jul 2007 05:27:31 +0000 Subject: [PATCH] write static delegate instead of callback use static delegate instead of 2007-07-09 Juerg Billeter * vala/valainterfacewriter.vala: write static delegate instead of callback * tests/test-014.vala, tests/test-015.vala, vapi/atk.vala, vapi/cairo.vala, vapi/gdk-2.0.vala, vapi/gio-standalone.vala, vapi/gtk+-2.0.vala, vapi/hal.vala, vapi/pango.vala, vapi/vte.vala: use static delegate instead of callback svn path=/trunk/; revision=333 --- ChangeLog | 9 +++ tests/test-014.vala | 2 +- tests/test-015.vala | 2 +- vala/valainterfacewriter.vala | 2 +- vapi/atk.vala | 12 +-- vapi/cairo.vala | 6 +- vapi/gdk-2.0.vala | 16 ++-- vapi/gio-standalone.vala | 18 ++--- vapi/gtk+-2.0.vala | 126 ++++++++++++++--------------- vapi/hal.vala | 8 +- vapi/pango.vala | 8 +- vapi/vte.vala | 182 +----------------------------------------- 12 files changed, 112 insertions(+), 279 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16dcb074..8bc3f4de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2007-07-09 Jürg Billeter + * vala/valainterfacewriter.vala: write static delegate instead of + callback + * tests/test-014.vala, tests/test-015.vala, vapi/atk.vala, + vapi/cairo.vala, vapi/gdk-2.0.vala, vapi/gio-standalone.vala, + vapi/gtk+-2.0.vala, vapi/hal.vala, vapi/pango.vala, vapi/vte.vala: use + static delegate instead of callback + +2007-07-09 Jürg Billeter + * vala/scanner.l, vala/parser.y: support delegate keyword and optional modifiers to declare callbacks diff --git a/tests/test-014.vala b/tests/test-014.vala index 0cc6321c..30b727b6 100644 --- a/tests/test-014.vala +++ b/tests/test-014.vala @@ -1,6 +1,6 @@ using GLib; -callback int Maman.ActionCallback (); +static delegate int Maman.ActionCallback (); class Maman.Bar { static int do_action () { diff --git a/tests/test-015.vala b/tests/test-015.vala index e8ed952d..943abb9c 100644 --- a/tests/test-015.vala +++ b/tests/test-015.vala @@ -1,6 +1,6 @@ using GLib; -callback int Maman.ActionCallback (int i); +static delegate int Maman.ActionCallback (int i); class Maman.Bar { static int do_action (ActionCallback cb) { diff --git a/vala/valainterfacewriter.vala b/vala/valainterfacewriter.vala index 51412b44..39a598e9 100644 --- a/vala/valainterfacewriter.vala +++ b/vala/valainterfacewriter.vala @@ -343,7 +343,7 @@ public class Vala.InterfaceWriter : CodeVisitor { } write_indent (); - write_string ("public callback "); + write_string ("public static delegate "); var type = cb.return_type.data_type; if (type == null) { diff --git a/vapi/atk.vala b/vapi/atk.vala index ae9ce114..faf5c586 100644 --- a/vapi/atk.vala +++ b/vapi/atk.vala @@ -633,12 +633,12 @@ namespace Atk { public static weak string type_get_name (Atk.StateType type); public static Atk.StateType type_register (string name); } - public callback void EventListener (Atk.Object obj); - public callback void EventListenerInit (); - public callback void FocusHandler (Atk.Object arg1, bool arg2); - public callback bool Function (pointer data); - public callback int KeySnoopFunc (Atk.KeyEventStruct event, pointer func_data); - public callback void PropertyChangeHandler (Atk.Object arg1, Atk.PropertyValues arg2); + public static delegate void EventListener (Atk.Object obj); + public static delegate void EventListenerInit (); + public static delegate void FocusHandler (Atk.Object arg1, bool arg2); + public static delegate bool Function (pointer data); + public static delegate int KeySnoopFunc (Atk.KeyEventStruct event, pointer func_data); + public static delegate void PropertyChangeHandler (Atk.Object arg1, Atk.PropertyValues arg2); public static uint add_focus_tracker (Atk.EventListener focus_tracker); public static uint add_global_event_listener (GLib.SignalEmissionHook listener, string event_type); public static uint add_key_event_listener (Atk.KeySnoopFunc listener, pointer data); diff --git a/vapi/cairo.vala b/vapi/cairo.vala index 3a883a2f..5e22a4d3 100644 --- a/vapi/cairo.vala +++ b/vapi/cairo.vala @@ -1,6 +1,6 @@ /* cairo.vala * - * Copyright (C) 2006 Jürg Billeter + * Copyright (C) 2006-2007 Jürg Billeter * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -477,9 +477,9 @@ namespace Cairo { } [NoArrayLength ()] - public callback Status ReadFunc (pointer closure, uchar[] data, uint length); + public static delegate Status ReadFunc (pointer closure, uchar[] data, uint length); [NoArrayLength ()] - public callback Status WriteFunc (pointer closure, uchar[] data, uint length); + public static delegate Status WriteFunc (pointer closure, uchar[] data, uint length); [ReferenceType (dup_function = "cairo_surface_reference", free_function = "cairo_surface_destroy")] [CCode (cname = "cairo_surface_t", cheader_filename = "cairo-ps.h")] diff --git a/vapi/gdk-2.0.vala b/vapi/gdk-2.0.vala index dfd62bcd..c288484e 100644 --- a/vapi/gdk-2.0.vala +++ b/vapi/gdk-2.0.vala @@ -1842,14 +1842,14 @@ namespace Gdk { public static void leave (); public static void set_lock_functions (GLib.Callback enter_fn, GLib.Callback leave_fn); } - public callback void DestroyNotify (pointer data); - public callback void EventFunc (Gdk.Event event, pointer data); - public callback Gdk.FilterReturn FilterFunc (pointer xevent, Gdk.Event event, pointer data); - public callback void InputFunction (pointer data, int source, Gdk.InputCondition condition); - public callback void PixbufDestroyNotify (uchar[] pixels, pointer data); - public callback bool PixbufSaveFunc (string buf, ulong count, GLib.Error error, pointer data); - public callback void SpanFunc (Gdk.Span span, pointer data); - public callback bool invalidate_maybe_recurseChildFunc (Gdk.Window arg1, pointer data); + public static delegate void DestroyNotify (pointer data); + public static delegate void EventFunc (Gdk.Event event, pointer data); + public static delegate Gdk.FilterReturn FilterFunc (pointer xevent, Gdk.Event event, pointer data); + public static delegate void InputFunction (pointer data, int source, Gdk.InputCondition condition); + public static delegate void PixbufDestroyNotify (uchar[] pixels, pointer data); + public static delegate bool PixbufSaveFunc (string buf, ulong count, GLib.Error error, pointer data); + public static delegate void SpanFunc (Gdk.Span span, pointer data); + public static delegate bool invalidate_maybe_recurseChildFunc (Gdk.Window arg1, pointer data); public static void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func, pointer data); public static void add_option_entries_libgtk_only (GLib.OptionGroup group); public static weak GLib.List devices_list (); diff --git a/vapi/gio-standalone.vala b/vapi/gio-standalone.vala index 22e41be9..57eb8061 100644 --- a/vapi/gio-standalone.vala +++ b/vapi/gio-standalone.vala @@ -636,13 +636,13 @@ namespace GLib { public bool is_user_mountable; public bool is_loopback; } - public callback void AsyncNextFilesCallback (GLib.FileEnumerator enumerator, GLib.List files, int num_files, pointer user_data, GLib.Error error); - public callback void AsyncReadyCallback (GLib.Object source_object, GLib.AsyncResult res, pointer user_data); - public callback void AsyncStopEnumeratingCallback (GLib.FileEnumerator enumerator, bool result, pointer user_data, GLib.Error error); - public callback bool FDSourceFunc (pointer user_data, GLib.IOCondition condition, int fd); - public callback void FileProgressCallback (int64 current_num_bytes, int64 total_num_bytes, pointer user_data); - public callback void IODataFunc (pointer user_data); - public callback void IOJobFunc (GLib.IOJob job, GLib.Cancellable cancellable, pointer user_data); - public callback void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable cancellable); - public callback void UnixMountCallback (pointer user_data); + public static delegate void AsyncNextFilesCallback (GLib.FileEnumerator enumerator, GLib.List files, int num_files, pointer user_data, GLib.Error error); + public static delegate void AsyncReadyCallback (GLib.Object source_object, GLib.AsyncResult res, pointer user_data); + public static delegate void AsyncStopEnumeratingCallback (GLib.FileEnumerator enumerator, bool result, pointer user_data, GLib.Error error); + public static delegate bool FDSourceFunc (pointer user_data, GLib.IOCondition condition, int fd); + public static delegate void FileProgressCallback (int64 current_num_bytes, int64 total_num_bytes, pointer user_data); + public static delegate void IODataFunc (pointer user_data); + public static delegate void IOJobFunc (GLib.IOJob job, GLib.Cancellable cancellable, pointer user_data); + public static delegate void SimpleAsyncThreadFunc (GLib.SimpleAsyncResult res, GLib.Object object, GLib.Cancellable cancellable); + public static delegate void UnixMountCallback (pointer user_data); } diff --git a/vapi/gtk+-2.0.vala b/vapi/gtk+-2.0.vala index b4a434fd..777e81b5 100644 --- a/vapi/gtk+-2.0.vala +++ b/vapi/gtk+-2.0.vala @@ -6124,69 +6124,69 @@ namespace Gtk { public struct Type { public pointer @class (); } - public callback void AboutDialogActivateLinkFunc (Gtk.AboutDialog about, string link_, pointer data); - public callback bool AccelGroupActivate (Gtk.AccelGroup accel_group, GLib.Object acceleratable, uint keyval, Gdk.ModifierType modifier); - public callback bool AccelGroupFindFunc (Gtk.AccelKey key, GLib.Closure closure, pointer data); - public callback void AccelMapForeach (pointer data, string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool changed); - public callback int AssistantPageFunc (int current_page, pointer data); - public callback void BuilderConnectFunc (Gtk.Builder builder, GLib.Object object, string signal_name, string handler_name, GLib.Object connect_object, GLib.ConnectFlags @flags, pointer user_data); - public callback void Callback (Gtk.Widget widget, pointer data); - public callback void CellLayoutDataFunc (Gtk.CellLayout cell_layout, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, ref Gtk.TreeIter iter, pointer data); - public callback void ClipboardClearFunc (Gtk.Clipboard clipboard, pointer user_data_or_owner); - public callback void ClipboardGetFunc (Gtk.Clipboard clipboard, Gtk.SelectionData selection_data, uint info, pointer user_data_or_owner); - public callback void ClipboardImageReceivedFunc (Gtk.Clipboard clipboard, Gdk.Pixbuf pixbuf, pointer data); - public callback void ClipboardReceivedFunc (Gtk.Clipboard clipboard, Gtk.SelectionData selection_data, pointer data); - public callback void ClipboardRichTextReceivedFunc (Gtk.Clipboard clipboard, Gdk.Atom format, uchar[] text, ulong length, pointer data); - public callback void ClipboardTargetsReceivedFunc (Gtk.Clipboard clipboard, Gdk.Atom atoms, int n_atoms, pointer data); - public callback void ClipboardTextReceivedFunc (Gtk.Clipboard clipboard, string text, pointer data); - public callback void ColorSelectionChangePaletteFunc (Gdk.Color colors, int n_colors); - public callback void ColorSelectionChangePaletteWithScreenFunc (Gdk.Screen screen, Gdk.Color colors, int n_colors); - public callback void DestroyNotify (pointer data); - public callback bool EntryCompletionMatchFunc (Gtk.EntryCompletion completion, string key, ref Gtk.TreeIter iter, pointer user_data); - public callback bool FileFilterFunc (Gtk.FileFilterInfo filter_info, pointer data); - public callback bool Function (pointer data); - public callback void IconViewForeachFunc (Gtk.IconView icon_view, Gtk.TreePath path, pointer data); - public callback void ItemFactoryCallback (); - public callback void ItemFactoryCallback1 (pointer callback_data, uint callback_action, Gtk.Widget widget); - public callback void ItemFactoryCallback2 (); - public callback int KeySnoopFunc (Gtk.Widget grab_widget, Gdk.EventKey event, pointer func_data); - public callback void LinkButtonUriFunc (Gtk.LinkButton button, string link_, pointer user_data); - public callback void MenuCallback (Gtk.Widget widget, pointer user_data); - public callback void MenuDetachFunc (Gtk.Widget attach_widget, Gtk.Menu menu); - public callback void MenuPositionFunc (Gtk.Menu menu, int x, int y, bool push_in, pointer user_data); - public callback void MnemonicHashForeach (uint keyval, GLib.SList targets, pointer data); - public callback void ModuleDisplayInitFunc (Gdk.Display display); - public callback void ModuleInitFunc (int argc, string argv); - public callback Gtk.Notebook NotebookWindowCreationFunc (Gtk.Notebook source, Gtk.Widget page, int x, int y, pointer data); - public callback void PageSetupDoneFunc (Gtk.PageSetup page_setup, pointer data); - public callback void PrintFunc (pointer func_data, string str); - public callback void PrintJobCompleteFunc (Gtk.PrintJob print_job, pointer user_data, GLib.Error error); - public callback void PrintSettingsFunc (string key, string value, pointer user_data); - public callback bool PrinterFunc (Gtk.Printer printer, pointer data); - public callback void PrinterOptionSetFunc (Gtk.PrinterOption option, pointer user_data); - public callback bool RcPropertyParser (GLib.ParamSpec pspec, GLib.String rc_string, GLib.Value property_value); - public callback bool RecentFilterFunc (Gtk.RecentFilterInfo filter_info, pointer user_data); - public callback int RecentSortFunc (Gtk.RecentInfo a, Gtk.RecentInfo b, pointer user_data); - public callback void SignalFunc (); - public callback bool TextBufferDeserializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, ref Gtk.TextIter iter, uchar[] data, ulong length, bool create_tags, pointer user_data, GLib.Error error); - public callback uchar TextBufferSerializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, ref Gtk.TextIter start, ref Gtk.TextIter end, ulong length, pointer user_data); - public callback bool TextCharPredicate (unichar ch, pointer user_data); - public callback void TextTagTableForeach (Gtk.TextTag tag, pointer data); - public callback string TranslateFunc (string path, pointer func_data); - public callback void TreeCellDataFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, ref Gtk.TreeIter iter, pointer data); - public callback void TreeDestroyCountFunc (Gtk.TreeView tree_view, Gtk.TreePath path, int children, pointer user_data); - public callback int TreeIterCompareFunc (Gtk.TreeModel model, ref Gtk.TreeIter a, ref Gtk.TreeIter b, pointer user_data); - public callback void TreeModelFilterModifyFunc (Gtk.TreeModel model, ref Gtk.TreeIter iter, GLib.Value value, int column, pointer data); - public callback bool TreeModelFilterVisibleFunc (Gtk.TreeModel model, ref Gtk.TreeIter iter, pointer data); - public callback bool TreeModelForeachFunc (Gtk.TreeModel model, Gtk.TreePath path, ref Gtk.TreeIter iter, pointer data); - public callback void TreeSelectionForeachFunc (Gtk.TreeModel model, Gtk.TreePath path, ref Gtk.TreeIter iter, pointer data); - public callback bool TreeSelectionFunc (Gtk.TreeSelection selection, Gtk.TreeModel model, Gtk.TreePath path, bool path_currently_selected, pointer data); - public callback bool TreeViewColumnDropFunc (Gtk.TreeView tree_view, Gtk.TreeViewColumn column, Gtk.TreeViewColumn prev_column, Gtk.TreeViewColumn next_column, pointer data); - public callback void TreeViewMappingFunc (Gtk.TreeView tree_view, Gtk.TreePath path, pointer user_data); - public callback bool TreeViewRowSeparatorFunc (Gtk.TreeModel model, ref Gtk.TreeIter iter, pointer data); - public callback bool TreeViewSearchEqualFunc (Gtk.TreeModel model, int column, string key, ref Gtk.TreeIter iter, pointer search_data); - public callback void TreeViewSearchPositionFunc (Gtk.TreeView tree_view, Gtk.Widget search_dialog, pointer user_data); - public callback void WindowKeysForeachFunc (Gtk.Window window, uint keyval, Gdk.ModifierType modifiers, bool is_mnemonic, pointer data); + public static delegate void AboutDialogActivateLinkFunc (Gtk.AboutDialog about, string link_, pointer data); + public static delegate bool AccelGroupActivate (Gtk.AccelGroup accel_group, GLib.Object acceleratable, uint keyval, Gdk.ModifierType modifier); + public static delegate bool AccelGroupFindFunc (Gtk.AccelKey key, GLib.Closure closure, pointer data); + public static delegate void AccelMapForeach (pointer data, string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool changed); + public static delegate int AssistantPageFunc (int current_page, pointer data); + public static delegate void BuilderConnectFunc (Gtk.Builder builder, GLib.Object object, string signal_name, string handler_name, GLib.Object connect_object, GLib.ConnectFlags @flags, pointer user_data); + public static delegate void Callback (Gtk.Widget widget, pointer data); + public static delegate void CellLayoutDataFunc (Gtk.CellLayout cell_layout, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, ref Gtk.TreeIter iter, pointer data); + public static delegate void ClipboardClearFunc (Gtk.Clipboard clipboard, pointer user_data_or_owner); + public static delegate void ClipboardGetFunc (Gtk.Clipboard clipboard, Gtk.SelectionData selection_data, uint info, pointer user_data_or_owner); + public static delegate void ClipboardImageReceivedFunc (Gtk.Clipboard clipboard, Gdk.Pixbuf pixbuf, pointer data); + public static delegate void ClipboardReceivedFunc (Gtk.Clipboard clipboard, Gtk.SelectionData selection_data, pointer data); + public static delegate void ClipboardRichTextReceivedFunc (Gtk.Clipboard clipboard, Gdk.Atom format, uchar[] text, ulong length, pointer data); + public static delegate void ClipboardTargetsReceivedFunc (Gtk.Clipboard clipboard, Gdk.Atom atoms, int n_atoms, pointer data); + public static delegate void ClipboardTextReceivedFunc (Gtk.Clipboard clipboard, string text, pointer data); + public static delegate void ColorSelectionChangePaletteFunc (Gdk.Color colors, int n_colors); + public static delegate void ColorSelectionChangePaletteWithScreenFunc (Gdk.Screen screen, Gdk.Color colors, int n_colors); + public static delegate void DestroyNotify (pointer data); + public static delegate bool EntryCompletionMatchFunc (Gtk.EntryCompletion completion, string key, ref Gtk.TreeIter iter, pointer user_data); + public static delegate bool FileFilterFunc (Gtk.FileFilterInfo filter_info, pointer data); + public static delegate bool Function (pointer data); + public static delegate void IconViewForeachFunc (Gtk.IconView icon_view, Gtk.TreePath path, pointer data); + public static delegate void ItemFactoryCallback (); + public static delegate void ItemFactoryCallback1 (pointer callback_data, uint callback_action, Gtk.Widget widget); + public static delegate void ItemFactoryCallback2 (); + public static delegate int KeySnoopFunc (Gtk.Widget grab_widget, Gdk.EventKey event, pointer func_data); + public static delegate void LinkButtonUriFunc (Gtk.LinkButton button, string link_, pointer user_data); + public static delegate void MenuCallback (Gtk.Widget widget, pointer user_data); + public static delegate void MenuDetachFunc (Gtk.Widget attach_widget, Gtk.Menu menu); + public static delegate void MenuPositionFunc (Gtk.Menu menu, int x, int y, bool push_in, pointer user_data); + public static delegate void MnemonicHashForeach (uint keyval, GLib.SList targets, pointer data); + public static delegate void ModuleDisplayInitFunc (Gdk.Display display); + public static delegate void ModuleInitFunc (int argc, string argv); + public static delegate Gtk.Notebook NotebookWindowCreationFunc (Gtk.Notebook source, Gtk.Widget page, int x, int y, pointer data); + public static delegate void PageSetupDoneFunc (Gtk.PageSetup page_setup, pointer data); + public static delegate void PrintFunc (pointer func_data, string str); + public static delegate void PrintJobCompleteFunc (Gtk.PrintJob print_job, pointer user_data, GLib.Error error); + public static delegate void PrintSettingsFunc (string key, string value, pointer user_data); + public static delegate bool PrinterFunc (Gtk.Printer printer, pointer data); + public static delegate void PrinterOptionSetFunc (Gtk.PrinterOption option, pointer user_data); + public static delegate bool RcPropertyParser (GLib.ParamSpec pspec, GLib.String rc_string, GLib.Value property_value); + public static delegate bool RecentFilterFunc (Gtk.RecentFilterInfo filter_info, pointer user_data); + public static delegate int RecentSortFunc (Gtk.RecentInfo a, Gtk.RecentInfo b, pointer user_data); + public static delegate void SignalFunc (); + public static delegate bool TextBufferDeserializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, ref Gtk.TextIter iter, uchar[] data, ulong length, bool create_tags, pointer user_data, GLib.Error error); + public static delegate uchar TextBufferSerializeFunc (Gtk.TextBuffer register_buffer, Gtk.TextBuffer content_buffer, ref Gtk.TextIter start, ref Gtk.TextIter end, ulong length, pointer user_data); + public static delegate bool TextCharPredicate (unichar ch, pointer user_data); + public static delegate void TextTagTableForeach (Gtk.TextTag tag, pointer data); + public static delegate string TranslateFunc (string path, pointer func_data); + public static delegate void TreeCellDataFunc (Gtk.TreeViewColumn tree_column, Gtk.CellRenderer cell, Gtk.TreeModel tree_model, ref Gtk.TreeIter iter, pointer data); + public static delegate void TreeDestroyCountFunc (Gtk.TreeView tree_view, Gtk.TreePath path, int children, pointer user_data); + public static delegate int TreeIterCompareFunc (Gtk.TreeModel model, ref Gtk.TreeIter a, ref Gtk.TreeIter b, pointer user_data); + public static delegate void TreeModelFilterModifyFunc (Gtk.TreeModel model, ref Gtk.TreeIter iter, GLib.Value value, int column, pointer data); + public static delegate bool TreeModelFilterVisibleFunc (Gtk.TreeModel model, ref Gtk.TreeIter iter, pointer data); + public static delegate bool TreeModelForeachFunc (Gtk.TreeModel model, Gtk.TreePath path, ref Gtk.TreeIter iter, pointer data); + public static delegate void TreeSelectionForeachFunc (Gtk.TreeModel model, Gtk.TreePath path, ref Gtk.TreeIter iter, pointer data); + public static delegate bool TreeSelectionFunc (Gtk.TreeSelection selection, Gtk.TreeModel model, Gtk.TreePath path, bool path_currently_selected, pointer data); + public static delegate bool TreeViewColumnDropFunc (Gtk.TreeView tree_view, Gtk.TreeViewColumn column, Gtk.TreeViewColumn prev_column, Gtk.TreeViewColumn next_column, pointer data); + public static delegate void TreeViewMappingFunc (Gtk.TreeView tree_view, Gtk.TreePath path, pointer user_data); + public static delegate bool TreeViewRowSeparatorFunc (Gtk.TreeModel model, ref Gtk.TreeIter iter, pointer data); + public static delegate bool TreeViewSearchEqualFunc (Gtk.TreeModel model, int column, string key, ref Gtk.TreeIter iter, pointer search_data); + public static delegate void TreeViewSearchPositionFunc (Gtk.TreeView tree_view, Gtk.Widget search_dialog, pointer user_data); + public static delegate void WindowKeysForeachFunc (Gtk.Window window, uint keyval, Gdk.ModifierType modifiers, bool is_mnemonic, pointer data); public const string STOCK_ABOUT; public const string STOCK_ADD; public const string STOCK_APPLY; diff --git a/vapi/hal.vala b/vapi/hal.vala index 44f7c877..a2147795 100644 --- a/vapi/hal.vala +++ b/vapi/hal.vala @@ -22,8 +22,8 @@ [CCode (cheader_filename = "libhal.h", cprefix = "LibHal")] namespace Hal { - public callback void DeviceAdded (Context ctx, string udi); - public callback void DeviceRemoved (Context ctx, string udi); + public static delegate void DeviceAdded (Context ctx, string udi); + public static delegate void DeviceRemoved (Context ctx, string udi); [ReferenceType (free_function = "libhal_ctx_free")] [CCode (cprefix = "libhal_ctx_")] @@ -33,8 +33,8 @@ namespace Hal { public bool set_dbus_connection (DBus.Connection conn); public bool set_user_data (pointer user_data); public pointer get_user_data (); - public bool set_device_added (DeviceAdded _callback); - public bool set_device_removed (DeviceRemoved _callback); + public bool set_device_added (DeviceAdded _static delegate); + public bool set_device_removed (DeviceRemoved _static delegate); [NoArrayLength] [CCode (cname = "libhal_find_device_by_capability")] public string[] find_device_by_capability (string capability, ref int num_devices, ref DBus.Error error); diff --git a/vapi/pango.vala b/vapi/pango.vala index c507991f..9ca8eb08 100644 --- a/vapi/pango.vala +++ b/vapi/pango.vala @@ -786,10 +786,10 @@ namespace Pango { public static weak string check (int required_major, int required_minor, int required_micro); public static weak string string (); } - public callback pointer AttrDataCopyFunc (pointer data); - public callback bool AttrFilterFunc (Pango.Attribute attribute, pointer data); - public callback void CairoShapeRendererFunc (Cairo.Context cr, Pango.AttrShape attr, bool do_path, pointer data); - public callback bool FontsetForeachFunc (Pango.Fontset fontset, Pango.Font font, pointer data); + public static delegate pointer AttrDataCopyFunc (pointer data); + public static delegate bool AttrFilterFunc (Pango.Attribute attribute, pointer data); + public static delegate void CairoShapeRendererFunc (Cairo.Context cr, Pango.AttrShape attr, bool do_path, pointer data); + public static delegate bool FontsetForeachFunc (Pango.Fontset fontset, Pango.Font font, pointer data); public static void extents_to_pixels (ref Pango.Rectangle ink_rect, ref Pango.Rectangle logical_rect); public static Pango.Direction find_base_dir (string text, int length); public static void find_paragraph_boundary (string text, int length, int paragraph_delimiter_index, int next_paragraph_start); diff --git a/vapi/vte.vala b/vapi/vte.vala index a2ee279a..bd0006fd 100644 --- a/vapi/vte.vala +++ b/vapi/vte.vala @@ -1,4 +1,4 @@ -[CCode (cheader_filename = "vte/vte.h")] +[CCode (cprefix = "Vte", lower_case_cprefix = "vte_", cheader_filename = "vte/vte.h")] namespace Vte { [CCode (cprefix = "VTE_ANTI_ALIAS_")] public enum TerminalAntiAlias { @@ -15,14 +15,8 @@ namespace Vte { } [CCode (cheader_filename = "vte/reaper.h")] public class Reaper : GLib.Object { - [NoArrayLength] - [CCode (cname = "vte_reaper_add_child")] public static int add_child (GLib.Pid pid); - [NoArrayLength] - [CCode (cname = "vte_reaper_get")] - public static weak Vte.Reaper @get (); - [NoArrayLength] - [CCode (cname = "vte_reaper_get_type")] + public static weak Vte.Reaper get (); public static GLib.Type get_type (); public signal void child_exited (int p0, int p1); } @@ -37,248 +31,86 @@ namespace Vte { public long column_count; public weak string window_title; public weak string icon_title; - [NoArrayLength] - [CCode (cname = "vte_terminal_copy_clipboard")] public void copy_clipboard (); - [NoArrayLength] - [CCode (cname = "vte_terminal_copy_primary")] public void copy_primary (); - [NoArrayLength] - [CCode (cname = "vte_terminal_feed")] public void feed (string data, long length); - [NoArrayLength] - [CCode (cname = "vte_terminal_feed_child")] public void feed_child (string text, long length); - [NoArrayLength] - [CCode (cname = "vte_terminal_feed_child_binary")] public void feed_child_binary (string data, long length); - [NoArrayLength] - [CCode (cname = "vte_terminal_fork_command")] public int fork_command (string command, string argv, string envv, string directory, bool lastlog, bool utmp, bool wtmp); - [NoArrayLength] - [CCode (cname = "vte_terminal_forkpty")] public int forkpty (string envv, string directory, bool lastlog, bool utmp, bool wtmp); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_adjustment")] public weak Gtk.Adjustment get_adjustment (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_allow_bold")] public bool get_allow_bold (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_audible_bell")] public bool get_audible_bell (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_char_ascent")] public long get_char_ascent (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_char_descent")] public long get_char_descent (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_char_height")] public long get_char_height (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_char_width")] public long get_char_width (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_column_count")] public long get_column_count (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_cursor_position")] public void get_cursor_position (long column, long row); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_default_emulation")] public weak string get_default_emulation (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_emulation")] public weak string get_emulation (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_encoding")] public weak string get_encoding (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_font")] public weak Pango.FontDescription get_font (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_has_selection")] public bool get_has_selection (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_icon_title")] public weak string get_icon_title (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_mouse_autohide")] public bool get_mouse_autohide (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_padding")] public void get_padding (int xpad, int ypad); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_row_count")] public long get_row_count (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_status_line")] public weak string get_status_line (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_text")] public weak string get_text (Vte.IsSelectedFunc is_selected, pointer data, GLib.Array attributes); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_text_include_trailing_spaces")] public weak string get_text_include_trailing_spaces (Vte.IsSelectedFunc is_selected, pointer data, GLib.Array attributes); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_text_range")] 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); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_type")] public static weak Gtk.Type get_type (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_using_xft")] public bool get_using_xft (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_visible_bell")] public bool get_visible_bell (); - [NoArrayLength] - [CCode (cname = "vte_terminal_get_window_title")] public weak string get_window_title (); - [NoArrayLength] - [CCode (cname = "vte_terminal_im_append_menuitems")] public void im_append_menuitems (Gtk.MenuShell menushell); - [NoArrayLength] - [CCode (cname = "vte_terminal_is_word_char")] public bool is_word_char (unichar c); - [NoArrayLength] - [CCode (cname = "vte_terminal_match_add")] public int match_add (string match); - [NoArrayLength] - [CCode (cname = "vte_terminal_match_check")] public weak string match_check (long column, long row, int tag); - [NoArrayLength] - [CCode (cname = "vte_terminal_match_clear_all")] public void match_clear_all (); - [NoArrayLength] - [CCode (cname = "vte_terminal_match_remove")] public void match_remove (int tag); - [NoArrayLength] - [CCode (cname = "vte_terminal_match_set_cursor")] public void match_set_cursor (int tag, Gdk.Cursor cursor); - [NoArrayLength] - [CCode (cname = "vte_terminal_match_set_cursor_type")] public void match_set_cursor_type (int tag, Gdk.CursorType cursor_type); - [NoArrayLength] - [CCode (cname = "vte_terminal_new")] public Terminal (); - [NoArrayLength] - [CCode (cname = "vte_terminal_paste_clipboard")] public void paste_clipboard (); - [NoArrayLength] - [CCode (cname = "vte_terminal_paste_primary")] public void paste_primary (); - [NoArrayLength] - [CCode (cname = "vte_terminal_reset")] public void reset (bool full, bool clear_history); - [NoArrayLength] - [CCode (cname = "vte_terminal_select_all")] public void select_all (); - [NoArrayLength] - [CCode (cname = "vte_terminal_select_none")] public void select_none (); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_allow_bold")] public void set_allow_bold (bool allow_bold); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_audible_bell")] public void set_audible_bell (bool is_audible); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_background_image")] public void set_background_image (Gdk.Pixbuf image); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_background_image_file")] public void set_background_image_file (string path); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_background_saturation")] public void set_background_saturation (double saturation); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_background_tint_color")] public void set_background_tint_color (Gdk.Color color); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_background_transparent")] public void set_background_transparent (bool transparent); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_backspace_binding")] public void set_backspace_binding (Vte.TerminalEraseBinding binding); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_color_background")] public void set_color_background (Gdk.Color background); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_color_bold")] public void set_color_bold (Gdk.Color bold); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_color_cursor")] public void set_color_cursor (Gdk.Color cursor_background); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_color_dim")] public void set_color_dim (Gdk.Color dim); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_color_foreground")] public void set_color_foreground (Gdk.Color foreground); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_color_highlight")] public void set_color_highlight (Gdk.Color highlight_background); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_colors")] public void set_colors (Gdk.Color foreground, Gdk.Color background, Gdk.Color palette, long palette_size); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_cursor_blinks")] public void set_cursor_blinks (bool blink); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_default_colors")] public void set_default_colors (); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_delete_binding")] public void set_delete_binding (Vte.TerminalEraseBinding binding); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_emulation")] public void set_emulation (string emulation); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_encoding")] public void set_encoding (string codeset); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_font")] public void set_font (Pango.FontDescription font_desc); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_font_from_string")] public void set_font_from_string (string name); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_font_from_string_full")] public void set_font_from_string_full (string name, Vte.TerminalAntiAlias antialias); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_font_full")] public void set_font_full (Pango.FontDescription font_desc, Vte.TerminalAntiAlias antialias); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_mouse_autohide")] public void set_mouse_autohide (bool setting); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_opacity")] public void set_opacity (ushort opacity); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_pty")] public void set_pty (int pty_master); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_scroll_background")] public void set_scroll_background (bool scroll); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_scroll_on_keystroke")] public void set_scroll_on_keystroke (bool scroll); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_scroll_on_output")] public void set_scroll_on_output (bool scroll); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_scrollback_lines")] public void set_scrollback_lines (long lines); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_size")] public void set_size (long columns, long rows); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_visible_bell")] public void set_visible_bell (bool is_visible); - [NoArrayLength] - [CCode (cname = "vte_terminal_set_word_chars")] public void set_word_chars (string spec); public signal void child_exited (); public signal void window_title_changed (); @@ -309,20 +141,12 @@ namespace Vte { } [CCode (cheader_filename = "vte/vteaccess.h")] public class TerminalAccessible : Gtk.Accessible, Atk.Text, Atk.Component, Atk.Action { - [NoArrayLength] - [CCode (cname = "vte_terminal_accessible_get_type")] public static weak Gtk.Type get_type (); - [NoArrayLength] - [CCode (cname = "vte_terminal_accessible_new")] public TerminalAccessible (Vte.Terminal terminal); } [CCode (cheader_filename = "vte/vte.h")] public class TerminalAccessibleFactory : Atk.ObjectFactory { - [NoArrayLength] - [CCode (cname = "vte_terminal_accessible_factory_get_type")] public static weak Gtk.Type get_type (); - [NoArrayLength] - [CCode (cname = "vte_terminal_accessible_factory_new")] public TerminalAccessibleFactory (); } [ReferenceType] @@ -334,5 +158,5 @@ namespace Vte { public uint underline; public uint strikethrough; } - public callback bool IsSelectedFunc (Vte.Terminal terminal, long column, long row, pointer data); + public static delegate bool IsSelectedFunc (Vte.Terminal terminal, long column, long row, pointer data); } -- 2.11.4.GIT