Move external vapi files under $(top_srcdir)/vapi

https://bugzilla.gnome.org/show_bug.cgi?id=688218

3 files changed, 1 insertions, 450 deletions

diff --git a/libcaribou/Makefile.am b/libcaribou/Makefile.am
index 64c0009..770035b 100644
--- a/libcaribou/Makefile.am
+++ b/libcaribou/Makefile.am
@@ -3,7 +3,7 @@ lib_LTLIBRARIES = libcaribou.la
 libcaribou_la_VALAFLAGS = \
 	-H caribou.h --vapi caribou-1.0.vapi \
 	-h caribou-internals.h \
-	--vapidir=. \
+	--vapidir=$(top_srcdir)/vapi \
 	--pkg xtst --pkg gee-0.8 --pkg gdk-x11-3.0 --pkg libxml-2.0 \
 	--pkg libxklavier --pkg external-libs \
 	--internal-vapi caribou-internals-1.0.vapi \
@@ -49,8 +49,6 @@ libcaribou_la_SOURCES = \
 
 EXTRA_DIST = \
 	caribou-1.0.deps \
-	external-libs.vapi \
-	libxklavier.vapi \
 	libcaribou.symbols
 
 #
diff --git a/libcaribou/external-libs.vapi b/libcaribou/external-libs.vapi
deleted file mode 100644
index 1489216..0000000
--- a/libcaribou/external-libs.vapi
+++ /dev/null
@@ -1,259 +0,0 @@
-using X;
-
-[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "X11/XKBlib.h")]
-namespace Xkb {
-
-    [CCode (cname = "XkbGetKeyboard")]
-    public Desc get_keyboard (X.Display dpy, uint which, uint device_spec);
-
-    [CCode (cname = "XkbSetMap")]
-    public void set_map (X.Display dpy, uint which, Desc xkb);
-
-    [CCode (cname = "XkbChangeMap")]
-    public bool change_map (X.Display dpy, Desc xkb, MapChanges changes);
-
-    [CCode (cname = "XkbFreeKeyboard")]
-    public void free_keyboard (Desc xkb, uint which, bool free_all);
-
-    [CCode (cname = "XkbGetState")]
-    public void get_state (X.Display dpy, uint device_spec, out State state);
-
-    [CCode (cname = "XkbSelectEvents")]
-    public void select_events (X.Display dpy, uint device_spec, ulong bits_to_change,
-        ulong values_for_bits);
-
-    [CCode (cname = "XkbLatchModifiers")]
-    public void latch_modifiers (X.Display dpy, uint device_spec, uint affect,
-                                 uint values);
-
-    [CCode (cname = "XkbLockModifiers")]
-    public void lock_modifiers (X.Display dpy, uint device_spec, uint affect,
-                                uint values);
-
-
-    [Compact]
-    [CCode (cname = "XkbAnyEvent", free_function = "")]
-    public struct AnyEvent {
-        int xkb_type;
-    }
-
-    [Compact]
-    [CCode (cname = "XkbStateNotifyEvent", free_function = "")]
-    public struct StateNotifyEvent {
-        uint changed;
-        int locked_group;
-        uint mods;
-    }
-
-    [Compact]
-    [CCode (cname = "XkbEvent", free_function = "")]
-    public struct Event {
-        int type;
-        AnyEvent any;
-        StateNotifyEvent state;
-    }
-
-    [Compact]
-    [CCode (cname = "XkbStateRec", free_function = "")]
-    public struct State {
-        uchar   group;
-        uchar   locked_group;
-        ushort  base_group;
-        ushort  latched_group;
-        uchar   mods;
-        uchar   base_mods;
-        uchar   latched_mods;
-        uchar   locked_mods;
-        uchar   compat_state;
-        uchar   grab_mods;
-        uchar   compat_grab_mods;
-        uchar   lookup_mods;
-        uchar   compat_lookup_mods;
-        ushort  ptr_buttons;
-    }
-
-    [Compact]
-    [CCode (cname = "XkbDescRec", free_function = "")]
-    public class Desc {
-        public X.Display dpy;
-        public ushort flags;
-        public ushort device_spec;
-        public uchar min_key_code;
-        public uchar max_key_code;
-        public Controls          ctrls;
-        public ServerMap         server;
-        public ClientMap         map;
-        public Indicator         indicators;
-        public Names             names;
-        public CompatMap         compat;
-        public Geometry          geom;
-    }
-
-    [Compact]
-    [CCode (cname = "XkbControlsRec", free_function = "")]
-    public class Controls {
-    }
-
-    [Compact]
-    [CCode (cname = "XkbServerMapRec", free_function = "")]
-    public class ServerMap {
-    }
-
-    [Compact]
-    [CCode (cname = "XkbKeyTypeRec", free_function = "")]
-    public struct KeyType {
-    }
-
-    [CCode (cname = "XkbSymMapRec", free_function = "")]
-    public struct SymMap {
-        uchar    kt_index[4];
-        uchar    group_info;
-        uchar    width;
-        ushort   offset;
-    }
-
-    [CCode (cname = "XkbMapChangesRec", free_function = "")]
-	public struct MapChanges {
-        ushort changed;
-        char min_key_code;
-        char max_key_code;
-        uchar first_type;
-        uchar num_types;
-        char first_key_sym;
-        uchar num_key_syms;
-        char first_key_act;
-        uchar num_key_acts;
-        char first_key_behavior;
-        uchar num_key_behaviors;
-        char first_key_explicit;
-        uchar num_key_explicit;
-        char first_modmap_key;
-        uchar num_modmap_keys;
-        char first_vmodmap_key;
-        uchar num_vmodmap_keys;
-        uchar pad;
-        ushort vmods;
-	}
-
-    [Compact]
-    [CCode (cname = "XkbClientMapRec", free_function = "")]
-    public class ClientMap {
-        public uchar            size_types;
-        public uchar            num_types;
-        public KeyType[]        types;
-
-        public ushort           size_syms;
-        public ushort           num_syms;
-        [CCode (array_length = false, array_null_terminated = true)]
-        public ulong[]          syms;
-        [CCode (array_length = false, array_null_terminated = true)]
-        public SymMap[]         key_sym_map;
-
-        [CCode (array_length = false, array_null_terminated = true)]
-        public uchar[]          modmap;
-    }
-
-    [Compact]
-    [CCode (cname = "XkbIndicatorRec", free_function = "")]
-    public class Indicator {
-    }
-
-    [Compact]
-    [CCode (cname = "XkbNamesRec", free_function = "")]
-    public class Names {
-    }
-
-    [Compact]
-    [CCode (cname = "XkbCompatMapRec", free_function = "")]
-    public class CompatMap {
-    }
-
-    [Compact]
-    [CCode (cname = "XkbGeometryRec", free_function = "")]
-    public class Geometry {
-    }
-
-    [CCode (cname = "XkbUseCoreKbd")]
-    public int UseCoreKbd;
-    [CCode (cname = "XkbUseCorePtr")]
-    public int UseCorePtr;
-    [CCode (cname = "XkbDfltXIClass")]
-    public int DfltXIClass;
-    [CCode (cname = "XkbDfltXIId")]
-    public int DfltXIId;
-    [CCode (cname = "XkbAllXIClasses")]
-    public int AllXIClasses;
-    [CCode (cname = "XkbAllXIIds")]
-    public int AllXIIds;
-    [CCode (cname = "XkbXINone")]
-    public int XINone;
-
-    [CCode (cname = "XkbGBN_TypesMask")]
-    public int GBN_TypesMask;
-    [CCode (cname = "XkbGBN_CompatMapMask")]
-    public int GBN_CompatMapMask;
-    [CCode (cname = "XkbGBN_ClientSymbolsMask")]
-    public int GBN_ClientSymbolsMask;
-    [CCode (cname = "XkbGBN_ServerSymbolsMask")]
-    public int GBN_ServerSymbolsMask;
-    [CCode (cname = "XkbGBN_SymbolsMask")]
-    public int GBN_SymbolsMask;
-    [CCode (cname = "XkbGBN_IndicatorMapMask")]
-    public int GBN_IndicatorMapMask;
-    [CCode (cname = "XkbGBN_KeyNamesMask")]
-    public int GBN_KeyNamesMask;
-    [CCode (cname = "XkbGBN_GeometryMask")]
-    public int GBN_GeometryMask;
-    [CCode (cname = "XkbGBN_OtherNamesMask")]
-    public int GBN_OtherNamesMask;
-    [CCode (cname = "XkbGBN_AllComponentsMask")]
-    public int GBN_AllComponentsMask;
-
-    [CCode (cname = "XkbOneLevelIndex")]
-    public int OneLevelIndex;
-
-    [CCode (cname = "XkbNewKeyboardNotifyMask")]
-    public int NewKeyboardNotifyMask;
-    [CCode (cname = "XkbMapNotifyMask")]
-    public int MapNotifyMask;
-    [CCode (cname = "XkbStateNotifyMask")]
-    public int StateNotifyMask;
-    [CCode (cname = "XkbControlsNotifyMask")]
-    public int ControlsNotifyMask;
-    [CCode (cname = "XkbIndicatorStateNotifyMask")]
-    public int IndicatorStateNotifyMask;
-    [CCode (cname = "XkbIndicatorMapNotifyMask")]
-    public int IndicatorMapNotifyMask;
-    [CCode (cname = "XkbNamesNotifyMask")]
-    public int NamesNotifyMask;
-    [CCode (cname = "XkbCompatMapNotifyMask")]
-    public int CompatMapNotifyMask;
-    [CCode (cname = "XkbBellNotifyMask")]
-    public int BellNotifyMask;
-    [CCode (cname = "XkbActionMessageMask")]
-    public int ActionMessageMask;
-    [CCode (cname = "XkbAccessXNotifyMask")]
-    public int AccessXNotifyMask;
-    [CCode (cname = "XkbExtensionDeviceNotifyMask")]
-    public int ExtensionDeviceNotifyMask;
-    [CCode (cname = "XkbAllEventsMask")]
-    public int AllEventsMask;
-
-    [CCode (cname = "XkbStateNotify")]
-    public int StateNotify;
-
-    [CCode (cname = "XkbGroupStateMask")]
-    public int GroupStateMask;
-
-    [CCode (cname = "XkbModifierStateMask")]
-    public int ModifierStateMask;
-
-    [CCode (cname = "XkbAllMapComponentsMask")]
-    public int AllMapComponentsMask;
-
-    [CCode (cname = "XkbKeySymsMask")]
-    public int KeySymsMask;
-
-    [CCode (cname = "XkbKeyTypesMask")]
-    public int KeyTypesMask;
-}
diff --git a/libcaribou/libxklavier.vapi b/libcaribou/libxklavier.vapi
deleted file mode 100644
index 6420d01..0000000
--- a/libcaribou/libxklavier.vapi
+++ /dev/null
@@ -1,188 +0,0 @@
-/* libxklavier.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "Xkl", lower_case_cprefix = "xkl_")]
-namespace Xkl {
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public class ConfigItem : GLib.Object {
-		[CCode (array_length = false)]
-		public weak char[] description;
-		[CCode (array_length = false)]
-		public weak char[] name;
-		[CCode (array_length = false)]
-		public weak char[] short_description;
-		[CCode (has_construct_function = false)]
-		public ConfigItem ();
-	}
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public class ConfigRec : GLib.Object {
-        [CCode (array_length = false, array_null_terminated = true)]
-		public string[] layouts;
-		public weak string model;
-        [CCode (array_length = false, array_null_terminated = true)]
-		public string[] options;
-        [CCode (array_length = false, array_null_terminated = true)]
-		public string[] variants;
-		[CCode (has_construct_function = false)]
-		public ConfigRec ();
-		public bool activate (Xkl.Engine engine);
-		public bool equals (Xkl.ConfigRec data2);
-		public bool get_from_backup (Xkl.Engine engine);
-		public bool get_from_root_window_property (X.Atom rules_atom_name, string rules_file_out, Xkl.Engine engine);
-		public bool get_from_server (Xkl.Engine engine);
-		public void reset ();
-		public bool set_to_root_window_property (X.Atom rules_atom_name, string rules_file, Xkl.Engine engine);
-		public static bool write_to_file (Xkl.Engine engine, string file_name, Xkl.ConfigRec data, bool binary);
-	}
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public class ConfigRegistry : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected ConfigRegistry ();
-		public bool find_layout (Xkl.ConfigItem item);
-		public bool find_model (Xkl.ConfigItem item);
-		public bool find_option (string option_group_name, Xkl.ConfigItem item);
-		public bool find_option_group (Xkl.ConfigItem item);
-		public bool find_variant (string layout_name, Xkl.ConfigItem item);
-		public void foreach_country (Xkl.ConfigItemProcessFunc func, void* data);
-		public void foreach_country_variant (string country_code, Xkl.TwoConfigItemsProcessFunc func, void* data);
-		public void foreach_language (Xkl.ConfigItemProcessFunc func, void* data);
-		public void foreach_language_variant (string language_code, Xkl.TwoConfigItemsProcessFunc func, void* data);
-		public void foreach_layout (Xkl.ConfigItemProcessFunc func, void* data);
-		public void foreach_layout_variant (string layout_name, Xkl.ConfigItemProcessFunc func, void* data);
-		public void foreach_model (Xkl.ConfigItemProcessFunc func, void* data);
-		public void foreach_option (string option_group_name, Xkl.ConfigItemProcessFunc func, void* data);
-		public void foreach_option_group (Xkl.ConfigItemProcessFunc func, void* data);
-		public static unowned Xkl.ConfigRegistry get_instance (Xkl.Engine engine);
-		public bool load (bool if_extras_needed);
-		public void search_by_pattern (string pattern, Xkl.TwoConfigItemsProcessFunc func, void* data);
-		[NoAccessorMethod]
-		public Xkl.Engine engine { owned get; construct; }
-	}
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public class Engine : GLib.Object {
-		[CCode (has_construct_function = false)]
-		protected Engine ();
-		public static void INT__LONG_LONG (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-		public static void VOID__FLAGS_INT_BOOLEAN (GLib.Closure closure, GLib.Value return_value, uint n_param_values, GLib.Value param_values, void* invocation_hint, void* marshal_data);
-		public void allow_one_switch_to_secondary_group ();
-		public bool backup_names_prop ();
-		[NoWrapper]
-		public virtual void config_notify ();
-		public void delete_state (X.Window win);
-		public int filter_events (X.Event* evt);
-		public unowned string get_backend_name ();
-		public unowned Xkl.State get_current_state ();
-		public X.Window get_current_window ();
-		public int get_current_window_group ();
-		public int get_default_group ();
-		public uint get_features ();
-		public unowned string get_groups_names ();
-		public bool get_indicators_handling ();
-		public unowned string get_indicators_names ();
-		public static unowned Xkl.Engine get_instance (X.Display display);
-		public uint get_max_num_groups ();
-		public int get_next_group ();
-		public uint get_num_groups ();
-		public int get_prev_group ();
-		public uint get_secondary_groups_mask ();
-		public bool get_state (X.Window win, Xkl.State state_out);
-		public unowned string get_window_title (X.Window win);
-		public bool grab_key (int keycode, uint modifiers);
-		public bool is_group_per_toplevel_window ();
-		public bool is_window_from_same_toplevel_window (X.Window win1, X.Window win2);
-		public bool is_window_transparent (X.Window win);
-		public void lock_group (int group);
-		public int pause_listen ();
-		public int resume_listen ();
-		public void save_state (X.Window win, Xkl.State state);
-		public void set_default_group (int group);
-		public void set_group_per_toplevel_window (bool is_global);
-		public void set_indicators_handling (bool whether_handle);
-		public void set_secondary_groups_mask (uint mask);
-		public void set_window_transparent (X.Window win, bool transparent);
-		public int start_listen (uint flags);
-		[NoWrapper]
-		public virtual void state_notify (Xkl.EngineStateChange change_type, int group, bool restore);
-		public int stop_listen (uint flags);
-		public bool ungrab_key (int keycode, uint modifiers);
-		[NoAccessorMethod]
-		public string backendName { owned get; }
-		public uint default_group { get; }
-		[NoAccessorMethod]
-		public void* display { get; construct; }
-		public Xkl.EngineFeatures features { get; }
-		public bool indicators_handling { get; }
-		public uint max_num_groups { get; }
-		public uint num_groups { get; }
-		public uint secondary_groups_mask { get; }
-		[CCode (cname = "X_config_changed")]
-		public virtual signal void X_config_changed ();
-		[CCode (cname = "X_new_device")]
-		public virtual signal void X_new_device ();
-		[CCode (cname = "X_state_changed")]
-		public virtual signal void X_state_changed (int p0, int p1, bool p2);
-		public virtual signal int new_toplevel_window (long p0, long p1);
-	}
-	[Compact]
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public class State {
-		public int32 group;
-		public uint32 indicators;
-	}
-	[CCode (cprefix = "XKLF_", cheader_filename = "libxklavier/xklavier.h")]
-	[Flags]
-	public enum EngineFeatures {
-		CAN_TOGGLE_INDICATORS,
-		CAN_OUTPUT_CONFIG_AS_ASCII,
-		CAN_OUTPUT_CONFIG_AS_BINARY,
-		MULTIPLE_LAYOUTS_SUPPORTED,
-		REQUIRES_MANUAL_LAYOUT_MANAGEMENT,
-		DEVICE_DISCOVERY
-	}
-	[CCode (cprefix = "XKLL_", cheader_filename = "libxklavier/xklavier.h")]
-	public enum EngineListenModes {
-		MANAGE_WINDOW_STATES,
-		TRACK_KEYBOARD_STATE,
-		MANAGE_LAYOUTS
-	}
-	[CCode (cprefix = "", cheader_filename = "libxklavier/xklavier.h")]
-	public enum EngineStateChange {
-		GROUP_CHANGED,
-		INDICATORS_CHANGED
-	}
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public delegate void ConfigItemProcessFunc (Xkl.ConfigRegistry config, Xkl.ConfigItem item);
-	[CCode (cheader_filename = "libxklavier/xklavier.h", has_target = false)]
-	public delegate void LogAppender (char[] file, char[] function, int level, char[] format, void* args);
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public delegate void TwoConfigItemsProcessFunc (Xkl.ConfigRegistry config, Xkl.ConfigItem item, Xkl.ConfigItem subitem);
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public const int MAX_CI_DESC_LENGTH;
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public const int MAX_CI_NAME_LENGTH;
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public const int MAX_CI_SHORT_DESC_LENGTH;
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public const string XCI_PROP_ALLOW_MULTIPLE_SELECTION;
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public const string XCI_PROP_COUNTRY_LIST;
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public const string XCI_PROP_EXTRA_ITEM;
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public const string XCI_PROP_LANGUAGE_LIST;
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public const string XCI_PROP_VENDOR;
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public static void default_log_appender (char[] file, char[] function, int level, char[] format, void* args);
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public static unowned string get_country_name (string code);
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public static unowned string get_language_name (string code);
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public static unowned string get_last_error ();
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public static bool restore_names_prop (Xkl.Engine engine);
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public static void set_debug_level (int level);
-	[CCode (cheader_filename = "libxklavier/xklavier.h")]
-	public static void set_log_appender (Xkl.LogAppender fun);
-}