Add clutter-gdk-1.0, clutter-x11-1.0 bindings

8 files changed, 158 insertions, 0 deletions

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 8df7e3496..bb7219bde 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -21,6 +21,8 @@ dist_vapi_DATA = \
 	ccss-1.vapi \
 	clutter-1.0.deps \
 	clutter-1.0.vapi \
+	clutter-gdk-1.0.deps \
+	clutter-gdk-1.0.vapi \
 	clutter-gst-1.0.deps \
 	clutter-gst-1.0.vapi \
 	clutter-gst-2.0.deps \
@@ -30,6 +32,8 @@ dist_vapi_DATA = \
 	clutter-gtk-1.0.deps \
 	clutter-gtk-1.0.vapi \
 	clutter-json-1.0.vapi \
+	clutter-x11-1.0.deps \
+	clutter-x11-1.0.vapi \
 	cogl-1.0.vapi \
 	cogl-1.0.deps \
 	cogl-pango-1.0.vapi \
@@ -392,9 +396,11 @@ GIR_BINDINGS = \
 	atk \
 	atspi-2 \
 	clutter-1.0 \
+	clutter-gdk-1.0 \
 	clutter-gtk-1.0 \
 	clutter-gst-1.0 \
 	clutter-gst-2.0 \
+	clutter-x11-1.0 \
 	cogl-pango-1.0 \
 	gdk-3.0 \
 	gdk-pixbuf-2.0 \
@@ -455,6 +461,9 @@ atspi-2:
 clutter-1.0:
 	$(GENVAPI) --library $(srcdir)/clutter-1.0 --metadatadir $(METADATADIR) $(METADATADIR)/Clutter-1.0-custom.vala --pkg atk --pkg cairo --pkg pango --pkg cogl-1.0 --pkg cogl-pango-1.0 --pkg json-glib-1.0 $(GIRDIR)/Clutter-1.0.gir
 
+clutter-gdk-1.0:
+	$(GENVAPI) --library $(srcdir)/clutter-gdk-1.0 --metadatadir $(METADATADIR) --pkg clutter-1.0 --pkg gdk-3.0 $(GIRDIR)/ClutterGdk-1.0.gir
+
 clutter-gtk-0.10:
 	$(GENVAPI) --library $(srcdir)/clutter-gtk-0.10 $(PACKAGESDIR)/clutter-gtk-0.10/clutter-gtk-0.10.gi
 
@@ -467,6 +476,9 @@ clutter-gst-1.0:
 clutter-gst-2.0:
 	$(GENVAPI) --library $(srcdir)/clutter-gst-2.0 --metadatadir $(METADATADIR) $(METADATADIR)/ClutterGst-2.0-custom.vala --pkg cogl-1.0 --pkg clutter-1.0 --pkg gstreamer-base-1.0 --pkg gstreamer-video-1.0 $(GIRDIR)/ClutterGst-2.0.gir
 
+clutter-x11-1.0:
+	$(GENVAPI) --library $(srcdir)/clutter-x11-1.0 --metadatadir $(METADATADIR) --pkg clutter-1.0 --pkg x11 $(GIRDIR)/ClutterX11-1.0.gir
+
 cogl-1.0:
 	$(GENVAPI) --library $(srcdir)/cogl-1.0 $(PACKAGESDIR)/cogl-1.0/cogl-1.0-custom.vala $(PACKAGESDIR)/cogl-1.0/cogl-1.0.gi
 
diff --git a/vapi/clutter-gdk-1.0.deps b/vapi/clutter-gdk-1.0.deps
new file mode 100644
index 000000000..44d7effbb
--- /dev/null
+++ b/vapi/clutter-gdk-1.0.deps
@@ -0,0 +1,2 @@
+clutter-1.0
+gdk-3.0
diff --git a/vapi/clutter-gdk-1.0.vapi b/vapi/clutter-gdk-1.0.vapi
new file mode 100644
index 000000000..a461479e6
--- /dev/null
+++ b/vapi/clutter-gdk-1.0.vapi
@@ -0,0 +1,19 @@
+/* clutter-gdk-1.0.vapi generated by vapigen, do not modify. */
+
+[CCode (cprefix = "ClutterGdk", gir_namespace = "ClutterGdk", gir_version = "1.0", lower_case_cprefix = "clutter_gdk_")]
+namespace ClutterGdk {
+	[CCode (cheader_filename = "clutter/gdk/clutter-gdk.h")]
+	public static void disable_event_retrieval ();
+	[CCode (cheader_filename = "clutter/gdk/clutter-gdk.h")]
+	public static unowned Gdk.Display get_default_display ();
+	[CCode (cheader_filename = "clutter/gdk/clutter-gdk.h")]
+	public static unowned Clutter.Stage get_stage_from_window (Gdk.Window window);
+	[CCode (cheader_filename = "clutter/gdk/clutter-gdk.h")]
+	public static unowned Gdk.Window get_stage_window (Clutter.Stage stage);
+	[CCode (cheader_filename = "clutter/gdk/clutter-gdk.h")]
+	public static Gdk.FilterReturn handle_event (Gdk.Event event);
+	[CCode (cheader_filename = "clutter/gdk/clutter-gdk.h")]
+	public static void set_display (Gdk.Display display);
+	[CCode (cheader_filename = "clutter/gdk/clutter-gdk.h")]
+	public static bool set_stage_foreign (Clutter.Stage stage, Gdk.Window window);
+}
diff --git a/vapi/clutter-x11-1.0.deps b/vapi/clutter-x11-1.0.deps
new file mode 100644
index 000000000..14fdf7673
--- /dev/null
+++ b/vapi/clutter-x11-1.0.deps
@@ -0,0 +1,2 @@
+clutter-1.0
+x11
diff --git a/vapi/clutter-x11-1.0.vapi b/vapi/clutter-x11-1.0.vapi
new file mode 100644
index 000000000..fca8ce608
--- /dev/null
+++ b/vapi/clutter-x11-1.0.vapi
@@ -0,0 +1,115 @@
+/* clutter-x11-1.0.vapi generated by vapigen, do not modify. */
+
+[CCode (cprefix = "ClutterX11", gir_namespace = "ClutterX11", gir_version = "1.0", lower_case_cprefix = "clutter_x11_")]
+namespace ClutterX11 {
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h", type_id = "clutter_x11_texture_pixmap_get_type ()")]
+	public class TexturePixmap : Clutter.Texture, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
+		public TexturePixmap ();
+		public void set_automatic (bool setting);
+		public void set_pixmap (X.Pixmap pixmap);
+		public void set_window (X.Window window, bool automatic);
+		public void sync_window ();
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
+		public TexturePixmap.with_pixmap (X.Pixmap pixmap);
+		[CCode (has_construct_function = false, type = "ClutterActor*")]
+		public TexturePixmap.with_window (X.Window window);
+		[NoAccessorMethod]
+		public bool automatic_updates { get; set; }
+		[NoAccessorMethod]
+		public bool destroyed { get; }
+		[NoAccessorMethod]
+		public ulong pixmap { get; set; }
+		[NoAccessorMethod]
+		public uint pixmap_depth { get; }
+		[NoAccessorMethod]
+		public uint pixmap_height { get; }
+		[NoAccessorMethod]
+		public uint pixmap_width { get; }
+		[NoAccessorMethod]
+		public ulong window { get; set; }
+		[NoAccessorMethod]
+		public bool window_mapped { get; }
+		[NoAccessorMethod]
+		public bool window_override_redirect { get; }
+		[NoAccessorMethod]
+		public bool window_redirect_automatic { get; set; }
+		[NoAccessorMethod]
+		public int window_x { get; }
+		[NoAccessorMethod]
+		public int window_y { get; }
+		public signal void queue_damage_redraw (int x, int y, int width, int height);
+		[HasEmitter]
+		public virtual signal void update_area (int x, int y, int width, int height);
+	}
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h", cprefix = "CLUTTER_X11_FILTER_", has_type_id = false)]
+	public enum FilterReturn {
+		CONTINUE,
+		TRANSLATE,
+		REMOVE
+	}
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h", cprefix = "CLUTTER_X11_XINPUT_", has_type_id = false)]
+	public enum XInputEventTypes {
+		KEY_PRESS_EVENT,
+		KEY_RELEASE_EVENT,
+		BUTTON_PRESS_EVENT,
+		BUTTON_RELEASE_EVENT,
+		MOTION_NOTIFY_EVENT,
+		LAST_EVENT
+	}
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h", instance_pos = 2.9)]
+	public delegate ClutterX11.FilterReturn FilterFunc (X.Event xev, Clutter.Event cev);
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static void add_filter (ClutterX11.FilterFunc func);
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static void disable_event_retrieval ();
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	[Deprecated (since = "1.14")]
+	public static void enable_xinput ();
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static int event_get_key_group (Clutter.Event event);
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static uint event_sequence_get_touch_detail (Clutter.EventSequence sequence);
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static X.Time get_current_event_time ();
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static unowned X.Display get_default_display ();
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static int get_default_screen ();
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	[Deprecated (since = "1.2")]
+	public static unowned GLib.SList<Clutter.InputDevice> get_input_devices ();
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static X.Window get_root_window ();
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static unowned Clutter.Stage get_stage_from_window (X.Window win);
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	[Deprecated (since = "1.2")]
+	public static X.VisualInfo? get_stage_visual (Clutter.Stage stage);
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static X.Window get_stage_window (Clutter.Stage stage);
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static bool get_use_argb_visual ();
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static X.VisualInfo? get_visual_info ();
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static ClutterX11.FilterReturn handle_event (X.Event xevent);
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static bool has_composite_extension ();
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static bool has_event_retrieval ();
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static bool has_xinput ();
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static void remove_filter (ClutterX11.FilterFunc func);
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static void set_display (X.Display xdpy);
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static bool set_stage_foreign (Clutter.Stage stage, X.Window xwindow);
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static void set_use_argb_visual (bool use_argb);
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static void trap_x_errors ();
+	[CCode (cheader_filename = "clutter/x11/clutter-x11.h")]
+	public static int untrap_x_errors ();
+}
diff --git a/vapi/metadata/ClutterGdk-1.0.metadata b/vapi/metadata/ClutterGdk-1.0.metadata
new file mode 100644
index 000000000..24363f1cf
--- /dev/null
+++ b/vapi/metadata/ClutterGdk-1.0.metadata
@@ -0,0 +1 @@
+* skip=false
diff --git a/vapi/metadata/ClutterX11-1.0.metadata b/vapi/metadata/ClutterX11-1.0.metadata
new file mode 100644
index 000000000..24bb92493
--- /dev/null
+++ b/vapi/metadata/ClutterX11-1.0.metadata
@@ -0,0 +1,6 @@
+* skip=false
+
+XInputDevice skip
+
+FilterFunc type="ClutterX11.FilterReturn"
+handle_event type="ClutterX11.FilterReturn"
diff --git a/vapi/x11.vapi b/vapi/x11.vapi
index 2141215da..aaa3fea7e 100644
--- a/vapi/x11.vapi
+++ b/vapi/x11.vapi
@@ -419,6 +419,7 @@ namespace X {
 	public struct VisualID {
 	}
 
+	[GIR (name = "XVisualInfo")]
 	[CCode (cname = "XVisualInfo", has_type_id = false)]
 	public struct VisualInfo {
 		public unowned X.Visual visual;