From b337607279ee7e9add6b53c2a9d895402c75cc00 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Thu, 23 Aug 2012 12:03:20 +0200 Subject: [PATCH] vapi: sync bamf bindings with plank Rename to libbamf3.vapi to follow upstream --- CMakeLists.txt | 4 +- vapi/bamf.vapi | 168 ---------------------------------------- vapi/libbamf3.vapi | 189 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 191 insertions(+), 170 deletions(-) delete mode 100644 vapi/bamf.vapi create mode 100644 vapi/libbamf3.vapi diff --git a/CMakeLists.txt b/CMakeLists.txt index 72b15b52..75546fd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") find_package(PkgConfig) pkg_check_modules(DEPS REQUIRED libmutter granite clutter-1.0 clutter-gtk-1.0 libbamf3 xfixes gee-1.0 libplank) -pkg_check_modules(MUTTER36 libmutter>=3.5.3) +pkg_check_modules(MUTTER36 QUIET libmutter>=3.5.3) if (MUTTER36_FOUND) set (GALAVALAFLAGS "--define=HAS_MUTTER36") endif (MUTTER36_FOUND) @@ -60,13 +60,13 @@ vala_precompile(VALA_C ${CMAKE_BINARY_DIR}/src/Config.vala PACKAGES granite + libbamf3 libmutter plank clutter-gtk-1.0 gdk-x11-3.0 gdesktopenums-3.0 xfixes-4.0 - bamf OPTIONS -g --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi/ diff --git a/vapi/bamf.vapi b/vapi/bamf.vapi deleted file mode 100644 index 8397864e..00000000 --- a/vapi/bamf.vapi +++ /dev/null @@ -1,168 +0,0 @@ -/* bamf.vapi generated by vapigen, do not modify. */ - -[CCode (cprefix = "Bamf", lower_case_cprefix = "bamf_")] -namespace Bamf { - [CCode (cheader_filename = "libbamf/libbamf.h", type_check_function = "BAMF_IS_APPLICATION")] - public class Application : Bamf.View { - [CCode (has_construct_function = false)] - protected Application (); - public unowned string? get_application_type (); - public unowned string? get_desktop_file (); - public bool get_show_menu_stubs (); - public GLib.List? get_windows (); - public GLib.Array? get_xids (); - public virtual signal void window_added (Bamf.View p0); - public virtual signal void window_removed (Bamf.View p0); - } - [CCode (cheader_filename = "libbamf/libbamf.h", type_check_function = "BAMF_IS_CONTROL")] - public class Control : GLib.Object { - [CCode (has_construct_function = false)] - protected Control (); - public static unowned Bamf.Control get_default (); - public void insert_desktop_file (string desktop_file); - public void register_application_for_pid (string application, int32 pid); - public void register_tab_provider (string path); - public void set_approver_behavior (int32 behavior); - } - [CCode (cheader_filename = "libbamf/libbamf.h", type_check_function = "BAMF_IS_INDICATOR")] - public class Indicator : Bamf.View { - [CCode (has_construct_function = false)] - protected Indicator (); - public unowned string? get_dbus_menu_path (); - public unowned string? get_remote_address (); - public unowned string? get_remote_path (); - } - [CCode (cheader_filename = "libbamf/libbamf.h", type_check_function = "BAMF_IS_MATCHER")] - public class Matcher : GLib.Object { - [CCode (has_construct_function = false)] - protected Matcher (); - public bool application_is_running (string application); - public unowned Bamf.Application? get_active_application (); - public unowned Bamf.Window? get_active_window (); - public unowned Bamf.Application? get_application_for_desktop_file (string desktop_file_path, bool create_if_not_found); - public unowned Bamf.Application? get_application_for_window (Bamf.Window window); - public unowned Bamf.Application? get_application_for_xid (uint32 xid); - public GLib.List? get_applications (); - public static unowned Bamf.Matcher get_default (); - public GLib.List? get_running_applications (); - public GLib.List? get_tabs (); - public GLib.List? get_window_stack_for_monitor (int monitor); - public GLib.List? get_windows (); - public GLib.Array? get_xids_for_application (string application); - public void register_favorites ([CCode (array_length = false)] string[] favorites); - public virtual signal void active_application_changed (Bamf.View? p0, Bamf.View? p1); - public virtual signal void active_window_changed (Bamf.View? p0, Bamf.View? p1); - public virtual signal void stacking_order_changed (); - public virtual signal void view_closed (Bamf.View p0); - public virtual signal void view_opened (Bamf.View p0); - } - [CCode (cheader_filename = "libbamf/libbamf.h", type_check_function = "BAMF_IS_TAB_SOURCE")] - public class TabSource : GLib.Object { - [CCode (has_construct_function = false)] - protected TabSource (); - public unowned string get_tab_ids (); - public unowned GLib.Array get_tab_preview (string tab_id); - public unowned string get_tab_uri (string tab_id); - public uint32 get_tab_xid (string tab_id); - public virtual void show_tab (string tab_id, GLib.Error error); - [NoWrapper] - public virtual unowned string tab_ids (); - [NoWrapper] - public virtual unowned GLib.Array tab_preview (string tab_id); - [NoWrapper] - public virtual unowned string tab_uri (string tab_id); - [NoWrapper] - public virtual uint32 tab_xid (string tab_id); - [NoAccessorMethod] - public string id { owned get; set construct; } - public virtual signal void tab_closed (string p0); - public virtual signal void tab_opened (string p0); - public virtual signal void tab_uri_changed (string p0, string p1, string p2); - } - [CCode (cheader_filename = "libbamf/libbamf.h", type_check_function = "BAMF_IS_VIEW")] - public class View : GLib.InitiallyUnowned { - [CCode (has_construct_function = false)] - protected View (); - [NoWrapper] - public virtual Bamf.ClickBehavior click_behavior (); - public virtual GLib.List? get_children (); - public Bamf.ClickBehavior get_click_suggestion (); - public virtual unowned string? get_icon (); - public virtual unowned string? get_name (); - public unowned string? get_view_type (); - public virtual bool is_active (); - public bool is_closed (); - public virtual bool is_running (); - public bool is_sticky (); - public virtual bool is_urgent (); - [CCode (cname = "bamf_view_user_visible")] - public bool is_user_visible (); - [NoWrapper] - public virtual void set_path (string path); - public void set_sticky (bool value); - [NoWrapper] - public virtual unowned string view_type (); - [NoAccessorMethod] - public bool active { get; } - [NoAccessorMethod] - public string path { owned get; } - [NoAccessorMethod] - public bool running { get; } - [NoAccessorMethod] - public bool urgent { get; } - [NoAccessorMethod] - public bool user_visible { get; } - public virtual signal void active_changed (bool active); - public virtual signal void child_added (Bamf.View? child); - public virtual signal void child_removed (Bamf.View? child); - public virtual signal void closed (); - public virtual signal void name_changed (string old_name, string new_name); - public virtual signal void running_changed (bool running); - public virtual signal void urgent_changed (bool urgent); - public virtual signal void user_visible_changed (bool user_visible); - } - [CCode (cheader_filename = "libbamf/libbamf.h", type_check_function = "BAMF_IS_WINDOW")] - public class Window : Bamf.View { - [CCode (has_construct_function = false)] - protected Window (); - public int get_monitor (); - public uint32 get_pid (); - public unowned Bamf.Window? get_transient (); - public unowned string? get_utf8_prop (string prop); - public Bamf.WindowType get_window_type (); - public uint32 get_xid (); - public ulong last_active (); - public Bamf.WindowMaximizationType maximized (); - public virtual signal void maximized_changed (int old_value, int new_value); - public virtual signal void monitor_changed (int old_value, int new_value); - } - [CCode (cheader_filename = "libbamf/libbamf.h", cprefix = "BAMF_CLICK_BEHAVIOR_", has_type_id = false)] - public enum ClickBehavior { - NONE, - OPEN, - FOCUS, - FOCUS_ALL, - MINIMIZE, - RESTORE, - RESTORE_ALL, - PICKER - } - [CCode (cheader_filename = "libbamf/libbamf.h", cprefix = "BAMF_WINDOW_", has_type_id = false)] - public enum WindowMaximizationType { - FLOATING, - HORIZONTAL_MAXIMIZED, - VERTICAL_MAXIMIZED, - MAXIMIZED - } - [CCode (cheader_filename = "libbamf/libbamf.h", cprefix = "BAMF_WINDOW_", has_type_id = false)] - public enum WindowType { - NORMAL, - DESKTOP, - DOCK, - DIALOG, - TOOLBAR, - MENU, - UTILITY, - SPLASHSCREEN - } -} diff --git a/vapi/libbamf3.vapi b/vapi/libbamf3.vapi new file mode 100644 index 00000000..f6f68804 --- /dev/null +++ b/vapi/libbamf3.vapi @@ -0,0 +1,189 @@ +/* libbamf3.vapi generated by vapigen, do not modify. */ + +[CCode (cprefix = "Bamf", gir_namespace = "Bamf", gir_version = "0.2", lower_case_cprefix = "bamf_")] +namespace Bamf { + [CCode (cheader_filename = "libbamf/libbamf.h", type_id = "bamf_application_get_type ()")] + public class Application : Bamf.View { + [CCode (has_construct_function = false)] + protected Application (); + public unowned string get_application_type (); + public unowned string get_desktop_file (); + public bool get_show_menu_stubs (); + public GLib.List get_windows (); + public GLib.Array get_xids (); + public signal void window_added (Bamf.View object); + public signal void window_removed (Bamf.View object); + } + [CCode (cheader_filename = "libbamf/libbamf.h", type_id = "bamf_control_get_type ()")] + public class Control : GLib.Object { + [CCode (has_construct_function = false)] + protected Control (); + public void insert_desktop_file (string desktop_file); + public void register_application_for_pid (string application, int32 pid); + public void register_tab_provider (string path); + public void set_approver_behavior (int32 behavior); + } + [CCode (cheader_filename = "libbamf/libbamf.h", type_id = "bamf_factory_get_type ()")] + public class Factory : GLib.Object { + [CCode (has_construct_function = false)] + protected Factory (); + } + [CCode (cheader_filename = "libbamf/libbamf.h", type_id = "bamf_indicator_get_type ()")] + public class Indicator : Bamf.View { + [CCode (has_construct_function = false)] + protected Indicator (); + public unowned string get_dbus_menu_path (); + public unowned string get_remote_address (); + public unowned string get_remote_path (); + } + [CCode (cheader_filename = "libbamf/libbamf.h", type_id = "bamf_matcher_get_type ()")] + public class Matcher : GLib.Object { + [CCode (has_construct_function = false)] + protected Matcher (); + public bool application_is_running (string application); + public unowned Bamf.Application get_active_application (); + public unowned Bamf.Window get_active_window (); + public unowned Bamf.Application get_application_for_desktop_file (string desktop_file_path, bool create_if_not_found); + public unowned Bamf.Application get_application_for_window (Bamf.Window window); + public unowned Bamf.Application get_application_for_xid (uint32 xid); + public GLib.List get_applications (); + public static Bamf.Matcher get_default (); + public GLib.List get_running_applications (); + public GLib.List get_tabs (); + public GLib.List get_window_stack_for_monitor (int monitor); + public GLib.List get_windows (); + public GLib.Array get_xids_for_application (string application); + public void register_favorites ([CCode (array_length = false)] string[] favorites); + public signal void active_application_changed (Bamf.View p0, Bamf.View p1); + public signal void active_window_changed (Bamf.View p0, Bamf.View p1); + public signal void stacking_order_changed (); + public signal void view_closed (Bamf.View p0); + public signal void view_opened (Bamf.View p0); + } + [CCode (cheader_filename = "libbamf/libbamf.h", type_id = "bamf_tab_get_type ()")] + public class Tab : Bamf.View { + [CCode (has_construct_function = false)] + public Tab (string id, string uri); + public string get_id (); + public string get_preview (); + public string get_uri (); + public void set_preview (string uri); + public void set_uri (string uri); + public virtual void show (); + [NoAccessorMethod] + public string id { owned get; set construct; } + public string preview { owned get; set; } + public string uri { owned get; set construct; } + public virtual signal void preview_updated (); + public virtual signal void uri_changed (string new_uri, string p0); + } + [CCode (cheader_filename = "libbamf/libbamf.h", type_id = "bamf_tab_source_get_type ()")] + public class TabSource : GLib.Object { + [CCode (has_construct_function = false)] + protected TabSource (); + public string get_tab_uri (string tab_id); + public uint32 get_tab_xid (string tab_id); + [NoWrapper] + public virtual string tab_uri (string tab_id); + [NoWrapper] + public virtual uint32 tab_xid (string tab_id); + [NoAccessorMethod] + public string id { owned get; set construct; } + public signal void tab_closed (string object); + public signal void tab_opened (string object); + public signal void tab_uri_changed (string object, string p0, string p1); + } + [CCode (cheader_filename = "libbamf/libbamf.h", type_id = "bamf_view_get_type ()")] + public class View : GLib.InitiallyUnowned { + [CCode (has_construct_function = false)] + protected View (); + [NoWrapper] + public virtual Bamf.ClickBehavior click_behavior (); + public virtual GLib.List get_children (); + public Bamf.ClickBehavior get_click_suggestion (); + public virtual string get_icon (); + public virtual string get_name (); + [CCode (vfunc_name = "view_type")] + public virtual unowned string get_view_type (); + public virtual bool is_active (); + public bool is_closed (); + public virtual bool is_running (); + public bool is_sticky (); + public virtual bool is_urgent (); + [CCode (cname = "bamf_view_user_visible")] + public bool is_user_visible (); + [NoWrapper] + public virtual void set_path (string path); + public void set_sticky (bool value); + [NoAccessorMethod] + public bool active { get; } + [NoAccessorMethod] + public string path { owned get; } + [NoAccessorMethod] + public bool running { get; } + [NoAccessorMethod] + public bool urgent { get; } + [NoAccessorMethod] + public bool user_visible { get; } + public virtual signal void active_changed (bool active); + public virtual signal void child_added (Bamf.View child); + public virtual signal void child_removed (Bamf.View child); + public virtual signal void closed (); + public virtual signal void name_changed (string old_name, string new_name); + public virtual signal void running_changed (bool running); + public virtual signal void urgent_changed (bool urgent); + public virtual signal void user_visible_changed (bool user_visible); + } + [CCode (cheader_filename = "libbamf/libbamf.h", type_id = "bamf_window_get_type ()")] + public class Window : Bamf.View { + [CCode (has_construct_function = false)] + protected Window (); + public int get_monitor (); + public uint32 get_pid (); + public unowned Bamf.Window get_transient (); + public string get_utf8_prop (string prop); + public Bamf.WindowType get_window_type (); + public uint32 get_xid (); + public long last_active (); + public Bamf.WindowMaximizationType maximized (); + public virtual signal void maximized_changed (int old_value, int new_value); + public virtual signal void monitor_changed (int old_value, int new_value); + } + [CCode (cheader_filename = "libbamf/libbamf.h", cprefix = "BAMF_CLICK_BEHAVIOR_")] + public enum ClickBehavior { + NONE, + OPEN, + FOCUS, + FOCUS_ALL, + MINIMIZE, + RESTORE, + RESTORE_ALL, + PICKER + } + [CCode (cheader_filename = "libbamf/libbamf.h", cprefix = "BAMF_FACTORY_")] + public enum FactoryViewType { + VIEW, + WINDOW, + APPLICATION, + INDICATOR, + NONE + } + [CCode (cheader_filename = "libbamf/libbamf.h", cprefix = "BAMF_WINDOW_")] + public enum WindowMaximizationType { + FLOATING, + HORIZONTAL_MAXIMIZED, + VERTICAL_MAXIMIZED, + MAXIMIZED + } + [CCode (cheader_filename = "libbamf/libbamf.h", cprefix = "BAMF_WINDOW_")] + public enum WindowType { + NORMAL, + DESKTOP, + DOCK, + DIALOG, + TOOLBAR, + MENU, + UTILITY, + SPLASHSCREEN + } +}