From: Evan Nemerson <evan@coeus-group.com>
Date: Mon, 8 Feb 2010 20:08:21 +0000 (-0800)
Subject: gdk-2.0: update to 2.18.6
X-Git-Tag: 0.8.0~278
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ec7b1afab5fd7c98cda53520c46eeec884fb672;p=thirdparty%2Fvala.git

gdk-2.0: update to 2.18.6

Fixes bug 609293.
---

diff --git a/vapi/gdk-2.0.vapi b/vapi/gdk-2.0.vapi
index efe8e7e81..332b11eb0 100644
--- a/vapi/gdk-2.0.vapi
+++ b/vapi/gdk-2.0.vapi
@@ -90,7 +90,12 @@ namespace Gdk {
 		public weak Gdk.Device core_pointer;
 		public uint double_click_distance;
 		public uint double_click_time;
+		public uint ignore_core_events;
+		public weak Gdk.KeyboardGrabInfo keyboard_grab;
+		public uint32 last_event_time;
+		public weak GLib.List pointer_grabs;
 		public weak Gdk.DisplayPointerHooks pointer_hooks;
+		public weak Gdk.PointerWindowInfo pointer_info;
 		public weak GLib.List queued_events;
 		public weak GLib.List queued_tail;
 		public void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func);
@@ -170,6 +175,8 @@ namespace Gdk {
 	public class Drawable : GLib.Object {
 		public unowned Gdk.Image copy_to_image (Gdk.Image image, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
 		[NoWrapper]
+		public virtual unowned Cairo.Surface create_cairo_surface (int width, int height);
+		[NoWrapper]
 		public virtual unowned Gdk.GC create_gc (Gdk.GCValues values, Gdk.GCValuesMask mask);
 		[CCode (cname = "gdk_draw_arc")]
 		public virtual void draw_arc (Gdk.GC gc, bool filled, int x, int y, int width, int height, int angle1, int angle2);
@@ -208,10 +215,14 @@ namespace Gdk {
 		public virtual unowned Gdk.Image get_image (int x, int y, int width, int height);
 		public virtual unowned Gdk.Screen get_screen ();
 		public virtual void get_size (out int width, out int height);
+		[NoWrapper]
+		public virtual unowned Gdk.Drawable get_source_drawable ();
 		public virtual unowned Gdk.Region get_visible_region ();
 		public virtual unowned Gdk.Visual get_visual ();
 		[NoWrapper]
 		public virtual unowned Cairo.Surface ref_cairo_surface ();
+		[NoWrapper]
+		public virtual void set_cairo_clip (Cairo.Context cr);
 		public virtual void set_colormap (Gdk.Colormap colormap);
 	}
 	[Compact]
@@ -244,7 +255,6 @@ namespace Gdk {
 		public static unowned Gdk.Event @get ();
 		public bool get_axis (Gdk.AxisUse axis_use, out double value);
 		public bool get_coords (out double x_win, out double y_win);
-		public static unowned Gdk.Event get_graphics_expose (Gdk.Window window);
 		public bool get_root_coords (out double x_root, out double y_root);
 		public unowned Gdk.Screen get_screen ();
 		public bool get_state (out Gdk.ModifierType state);
@@ -326,6 +336,16 @@ namespace Gdk {
 		public void put_pixel (int x, int y, uint32 pixel);
 		public void set_colormap (Gdk.Colormap colormap);
 	}
+	[Compact]
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class KeyboardGrabInfo {
+		public weak Gdk.Window native_window;
+		public bool owner_events;
+		public ulong serial;
+		public uint32 time;
+		public weak Gdk.Window window;
+		public static bool libgtk_only (Gdk.Display display, out unowned Gdk.Window grab_window, bool owner_events);
+	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Keymap : GLib.Object {
 		public weak Gdk.Display display;
@@ -376,6 +396,17 @@ namespace Gdk {
 		public weak GLib.Callback window_at_pointer;
 	}
 	[Compact]
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public class PointerWindowInfo {
+		public uint32 button;
+		public ulong motion_hint_serial;
+		public uint32 state;
+		public weak Gdk.Window toplevel_under_pointer;
+		public double toplevel_x;
+		public double toplevel_y;
+		public weak Gdk.Window window_under_pointer;
+	}
+	[Compact]
 	[CCode (copy_function = "gdk_region_copy", free_function = "gdk_region_destroy", cheader_filename = "gdk/gdk.h")]
 	public class Region {
 		[CCode (has_construct_function = false)]
@@ -389,6 +420,7 @@ namespace Gdk {
 		public void offset (int dx, int dy);
 		public bool point_in (int x, int y);
 		public static Gdk.Region polygon (Gdk.Point[] points, Gdk.FillRule fill_rule);
+		public bool rect_equal (Gdk.Rectangle rectangle);
 		public Gdk.OverlapType rect_in (Gdk.Rectangle rectangle);
 		public static Gdk.Region rectangle (Gdk.Rectangle rectangle);
 		public void shrink (int dx, int dy);
@@ -405,6 +437,8 @@ namespace Gdk {
 		public weak Gdk.GC[] exposure_gcs;
 		[CCode (array_length = false)]
 		public weak Gdk.GC[] normal_gcs;
+		[CCode (array_length = false)]
+		public weak Gdk.GC[] subwindow_gcs;
 		public void broadcast_client_message (Gdk.Event event);
 		public unowned Gdk.Window get_active_window ();
 		public static unowned Gdk.Screen get_default ();
@@ -493,17 +527,21 @@ namespace Gdk {
 		public static void constrain_size (Gdk.Geometry geometry, uint flags, int width, int height, out int new_width, out int new_height);
 		public void deiconify ();
 		public void destroy ();
-		public void destroy_notify ();
 		public void enable_synchronized_configure ();
 		public void end_paint ();
+		public bool ensure_native ();
+		public void flush ();
 		public void focus (uint32 timestamp);
 		public static unowned Gdk.Window foreign_new (Gdk.NativeWindow anid);
 		public static unowned Gdk.Window foreign_new_for_display (Gdk.Display display, Gdk.NativeWindow anid);
 		public void freeze_toplevel_updates_libgtk_only ();
 		public void freeze_updates ();
 		public void fullscreen ();
+		public void geometry_changed ();
 		public unowned GLib.List get_children ();
+		public unowned Gdk.Cursor? get_cursor ();
 		public bool get_decorations (out Gdk.WMDecoration decorations);
+		public bool get_deskrelative_origin (out int x, out int y);
 		public Gdk.EventMask get_events ();
 		public void get_frame_extents (out Gdk.Rectangle rect);
 		public void get_geometry (out int x, out int y, out int width, out int height, out int depth);
@@ -513,6 +551,7 @@ namespace Gdk {
 		public unowned Gdk.Window get_parent ();
 		public unowned Gdk.Window get_pointer (out int x, out int y, out Gdk.ModifierType mask);
 		public void get_position (out int x, out int y);
+		public void get_root_coords (int x, int y, int root_x, int root_y);
 		public void get_root_origin (out int x, out int y);
 		public Gdk.WindowState get_state ();
 		public unowned Gdk.Window get_toplevel ();
@@ -527,6 +566,7 @@ namespace Gdk {
 		public void invalidate_maybe_recurse (Gdk.Region region, GLib.Callback child_func);
 		public void invalidate_rect (Gdk.Rectangle? rect, bool invalidate_children);
 		public void invalidate_region (Gdk.Region region, bool invalidate_children);
+		public bool is_destroyed ();
 		public bool is_viewable ();
 		public bool is_visible ();
 		public static unowned Gdk.Window lookup (Gdk.NativeWindow anid);
@@ -547,6 +587,7 @@ namespace Gdk {
 		public void remove_redirection ();
 		public void reparent (Gdk.Window new_parent, int x, int y);
 		public void resize (int width, int height);
+		public void restack (Gdk.Window sibling, bool above);
 		public void scroll (int dx, int dy);
 		public void set_accept_focus (bool accept_focus);
 		public void set_back_pixmap (Gdk.Pixmap? pixmap, bool parent_relative);
@@ -591,6 +632,10 @@ namespace Gdk {
 		public void unmaximize ();
 		public void unstick ();
 		public void withdraw ();
+		public Gdk.Cursor cursor { get; set; }
+		public virtual signal void from_embedder (double p0, double p1, void* p2, void* p3);
+		public virtual signal unowned Gdk.Window pick_embedded_child (double p0, double p1);
+		public virtual signal void to_embedder (double p0, double p1, void* p2, void* p3);
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	[SimpleType]
@@ -1172,7 +1217,8 @@ namespace Gdk {
 		SETTING,
 		OWNER_CHANGE,
 		GRAB_BROKEN,
-		DAMAGE
+		DAMAGE,
+		EVENT_LAST
 	}
 	[CCode (cprefix = "GDK_EXTENSION_EVENTS_", cheader_filename = "gdk/gdk.h")]
 	public enum ExtensionMode {
@@ -1485,7 +1531,8 @@ namespace Gdk {
 		CHILD,
 		DIALOG,
 		TEMP,
-		FOREIGN
+		FOREIGN,
+		OFFSCREEN
 	}
 	[CCode (cprefix = "GDK_WINDOW_TYPE_HINT_", cheader_filename = "gdk/gdk.h")]
 	public enum WindowTypeHint {
@@ -1539,6 +1586,8 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void cairo_region (Cairo.Context cr, Gdk.Region region);
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static void cairo_reset_clip (Cairo.Context cr, Gdk.Drawable drawable);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void cairo_set_source_color (Cairo.Context cr, Gdk.Color color);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void cairo_set_source_pixbuf (Cairo.Context cr, Gdk.Pixbuf pixbuf, double pixbuf_x, double pixbuf_y);
@@ -1661,8 +1710,6 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static Gdk.GrabStatus keyboard_grab (Gdk.Window window, bool owner_events, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static bool keyboard_grab_info_libgtk_only (Gdk.Display display, out unowned Gdk.Window grab_window, bool owner_events);
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void keyboard_ungrab (uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void keyval_convert_case (uint symbol, uint lower, uint upper);
@@ -1687,6 +1734,12 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void notify_startup_complete_with_id (string startup_id);
 	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static unowned Gdk.Window? offscreen_window_get_embedder (Gdk.Window window);
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static unowned Gdk.Pixmap? offscreen_window_get_pixmap (Gdk.Window window);
+	[CCode (cheader_filename = "gdk/gdk.h")]
+	public static void offscreen_window_set_embedder (Gdk.Window window, Gdk.Window embedder);
+	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static unowned Pango.Context pango_context_get ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static unowned Pango.Context pango_context_get_for_screen (Gdk.Screen screen);
@@ -1753,7 +1806,7 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool selection_owner_set_for_display (Gdk.Display display, Gdk.Window owner, Gdk.Atom selection, uint32 time_, bool send_event);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static bool selection_property_get (Gdk.Window requestor, uchar[] data, Gdk.Atom prop_type, int prop_format);
+	public static int selection_property_get (Gdk.Window requestor, uchar[] data, Gdk.Atom prop_type, int prop_format);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void selection_send_notify (Gdk.NativeWindow requestor, Gdk.Atom selection, Gdk.Atom target, Gdk.Atom property, uint32 time_);
 	[CCode (cheader_filename = "gdk/gdk.h")]
@@ -1783,8 +1836,6 @@ namespace Gdk {
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static int string_to_compound_text_for_display (Gdk.Display display, string str, Gdk.Atom encoding, int format, uchar[] ctext, int length);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void synthesize_window_state (Gdk.Window window, Gdk.WindowState unset_flags, Gdk.WindowState set_flags);
-	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void test_render_sync (Gdk.Window window);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool test_simulate_button (Gdk.Window window, int x, int y, uint button, Gdk.ModifierType modifiers, Gdk.EventType button_pressrelease);
diff --git a/vapi/packages/gdk-2.0/gdk-2.0.excludes b/vapi/packages/gdk-2.0/gdk-2.0.excludes
index e44260e8f..9ca941ac4 100644
--- a/vapi/packages/gdk-2.0/gdk-2.0.excludes
+++ b/vapi/packages/gdk-2.0/gdk-2.0.excludes
@@ -1,3 +1,6 @@
 gdkalias.h
 gdkkeysyms.h
 gdkx.h
+gdkdirectfb.h
+gdkprivate.h
+gdkprivate-directfb.h
diff --git a/vapi/packages/gdk-2.0/gdk-2.0.gi b/vapi/packages/gdk-2.0/gdk-2.0.gi
index e2f5c7780..ed82bd46b 100644
--- a/vapi/packages/gdk-2.0/gdk-2.0.gi
+++ b/vapi/packages/gdk-2.0/gdk-2.0.gi
@@ -38,6 +38,13 @@
 				<parameter name="region" type="GdkRegion*"/>
 			</parameters>
 		</function>
+		<function name="cairo_reset_clip" symbol="gdk_cairo_reset_clip">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="cr" type="cairo_t*"/>
+				<parameter name="drawable" type="GdkDrawable*"/>
+			</parameters>
+		</function>
 		<function name="cairo_set_source_color" symbol="gdk_cairo_set_source_color">
 			<return-type type="void"/>
 			<parameters>
@@ -587,14 +594,6 @@
 				<parameter name="time_" type="guint32"/>
 			</parameters>
 		</function>
-		<function name="keyboard_grab_info_libgtk_only" symbol="gdk_keyboard_grab_info_libgtk_only">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="grab_window" type="GdkWindow**"/>
-				<parameter name="owner_events" type="gboolean*"/>
-			</parameters>
-		</function>
 		<function name="keyboard_ungrab" symbol="gdk_keyboard_ungrab">
 			<return-type type="void"/>
 			<parameters>
@@ -663,6 +662,25 @@
 				<parameter name="startup_id" type="gchar*"/>
 			</parameters>
 		</function>
+		<function name="offscreen_window_get_embedder" symbol="gdk_offscreen_window_get_embedder">
+			<return-type type="GdkWindow*"/>
+			<parameters>
+				<parameter name="window" type="GdkWindow*"/>
+			</parameters>
+		</function>
+		<function name="offscreen_window_get_pixmap" symbol="gdk_offscreen_window_get_pixmap">
+			<return-type type="GdkPixmap*"/>
+			<parameters>
+				<parameter name="window" type="GdkWindow*"/>
+			</parameters>
+		</function>
+		<function name="offscreen_window_set_embedder" symbol="gdk_offscreen_window_set_embedder">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="window" type="GdkWindow*"/>
+				<parameter name="embedder" type="GdkWindow*"/>
+			</parameters>
+		</function>
 		<function name="pango_context_get" symbol="gdk_pango_context_get">
 			<return-type type="PangoContext*"/>
 		</function>
@@ -921,7 +939,7 @@
 			</parameters>
 		</function>
 		<function name="selection_property_get" symbol="gdk_selection_property_get">
-			<return-type type="gboolean"/>
+			<return-type type="gint"/>
 			<parameters>
 				<parameter name="requestor" type="GdkWindow*"/>
 				<parameter name="data" type="guchar**"/>
@@ -1050,14 +1068,6 @@
 				<parameter name="length" type="gint*"/>
 			</parameters>
 		</function>
-		<function name="synthesize_window_state" symbol="gdk_synthesize_window_state">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="window" type="GdkWindow*"/>
-				<parameter name="unset_flags" type="GdkWindowState"/>
-				<parameter name="set_flags" type="GdkWindowState"/>
-			</parameters>
-		</function>
 		<function name="test_render_sync" symbol="gdk_test_render_sync">
 			<return-type type="void"/>
 			<parameters>
@@ -1523,6 +1533,21 @@
 			<field name="max_aspect" type="gdouble"/>
 			<field name="win_gravity" type="GdkGravity"/>
 		</struct>
+		<struct name="GdkKeyboardGrabInfo">
+			<method name="libgtk_only" symbol="gdk_keyboard_grab_info_libgtk_only">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="display" type="GdkDisplay*"/>
+					<parameter name="grab_window" type="GdkWindow**"/>
+					<parameter name="owner_events" type="gboolean*"/>
+				</parameters>
+			</method>
+			<field name="window" type="GdkWindow*"/>
+			<field name="native_window" type="GdkWindow*"/>
+			<field name="serial" type="gulong"/>
+			<field name="owner_events" type="gboolean"/>
+			<field name="time" type="guint32"/>
+		</struct>
 		<struct name="GdkKeymapKey">
 			<field name="keycode" type="guint"/>
 			<field name="group" type="gint"/>
@@ -1576,6 +1601,15 @@
 			<field name="get_pointer" type="GCallback"/>
 			<field name="window_at_pointer" type="GCallback"/>
 		</struct>
+		<struct name="GdkPointerWindowInfo">
+			<field name="toplevel_under_pointer" type="GdkWindow*"/>
+			<field name="window_under_pointer" type="GdkWindow*"/>
+			<field name="toplevel_x" type="gdouble"/>
+			<field name="toplevel_y" type="gdouble"/>
+			<field name="state" type="guint32"/>
+			<field name="button" type="guint32"/>
+			<field name="motion_hint_serial" type="gulong"/>
+		</struct>
 		<struct name="GdkRegion">
 			<method name="copy" symbol="gdk_region_copy">
 				<return-type type="GdkRegion*"/>
@@ -1651,6 +1685,13 @@
 					<parameter name="fill_rule" type="GdkFillRule"/>
 				</parameters>
 			</method>
+			<method name="rect_equal" symbol="gdk_region_rect_equal">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="region" type="GdkRegion*"/>
+					<parameter name="rectangle" type="GdkRectangle*"/>
+				</parameters>
+			</method>
 			<method name="rect_in" symbol="gdk_region_rect_in">
 				<return-type type="GdkOverlapType"/>
 				<parameters>
@@ -1775,35 +1816,6 @@
 			<field name="type_hint" type="GdkWindowTypeHint"/>
 		</struct>
 		<struct name="GdkWindowObject">
-			<field name="parent_instance" type="GdkDrawable"/>
-			<field name="impl" type="GdkDrawable*"/>
-			<field name="parent" type="GdkWindowObject*"/>
-			<field name="user_data" type="gpointer"/>
-			<field name="x" type="gint"/>
-			<field name="y" type="gint"/>
-			<field name="extension_events" type="gint"/>
-			<field name="filters" type="GList*"/>
-			<field name="children" type="GList*"/>
-			<field name="bg_color" type="GdkColor"/>
-			<field name="bg_pixmap" type="GdkPixmap*"/>
-			<field name="paint_stack" type="GSList*"/>
-			<field name="update_area" type="GdkRegion*"/>
-			<field name="update_freeze_count" type="guint"/>
-			<field name="window_type" type="guint8"/>
-			<field name="depth" type="guint8"/>
-			<field name="resize_count" type="guint8"/>
-			<field name="state" type="GdkWindowState"/>
-			<field name="guffaw_gravity" type="guint"/>
-			<field name="input_only" type="guint"/>
-			<field name="modal_hint" type="guint"/>
-			<field name="composited" type="guint"/>
-			<field name="destroyed" type="guint"/>
-			<field name="accept_focus" type="guint"/>
-			<field name="focus_on_map" type="guint"/>
-			<field name="shaped" type="guint"/>
-			<field name="event_mask" type="GdkEventMask"/>
-			<field name="update_and_descendants_freeze_count" type="guint"/>
-			<field name="redirect" type="GdkWindowRedirect*"/>
 		</struct>
 		<struct name="GdkWindowObjectClass">
 			<field name="parent_class" type="GdkDrawableClass"/>
@@ -1969,12 +1981,6 @@
 					<parameter name="y_win" type="gdouble*"/>
 				</parameters>
 			</method>
-			<method name="get_graphics_expose" symbol="gdk_event_get_graphics_expose">
-				<return-type type="GdkEvent*"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-				</parameters>
-			</method>
 			<method name="get_root_coords" symbol="gdk_event_get_root_coords">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -2305,6 +2311,7 @@
 			<member name="GDK_OWNER_CHANGE" value="34"/>
 			<member name="GDK_GRAB_BROKEN" value="35"/>
 			<member name="GDK_DAMAGE" value="36"/>
+			<member name="GDK_EVENT_LAST" value="37"/>
 		</enum>
 		<enum name="GdkExtensionMode" type-name="GdkExtensionMode" get-type="gdk_extension_mode_get_type">
 			<member name="GDK_EXTENSION_EVENTS_NONE" value="0"/>
@@ -2481,6 +2488,7 @@
 			<member name="GDK_WINDOW_DIALOG" value="3"/>
 			<member name="GDK_WINDOW_TEMP" value="4"/>
 			<member name="GDK_WINDOW_FOREIGN" value="5"/>
+			<member name="GDK_WINDOW_OFFSCREEN" value="6"/>
 		</enum>
 		<enum name="GdkWindowTypeHint" type-name="GdkWindowTypeHint" get-type="gdk_window_type_hint_get_type">
 			<member name="GDK_WINDOW_TYPE_HINT_NORMAL" value="0"/>
@@ -3111,9 +3119,14 @@
 			<field name="core_pointer" type="GdkDevice*"/>
 			<field name="pointer_hooks" type="GdkDisplayPointerHooks*"/>
 			<field name="closed" type="guint"/>
+			<field name="ignore_core_events" type="guint"/>
 			<field name="double_click_distance" type="guint"/>
 			<field name="button_x" type="gint[]"/>
 			<field name="button_y" type="gint[]"/>
+			<field name="pointer_grabs" type="GList*"/>
+			<field name="keyboard_grab" type="GdkKeyboardGrabInfo"/>
+			<field name="pointer_info" type="GdkPointerWindowInfo"/>
+			<field name="last_event_time" type="guint32"/>
 		</object>
 		<object name="GdkDisplayManager" parent="GObject" type-name="GdkDisplayManager" get-type="gdk_display_manager_get_type">
 			<method name="get" symbol="gdk_display_manager_get">
@@ -3243,6 +3256,14 @@
 					<parameter name="colormap" type="GdkColormap*"/>
 				</parameters>
 			</method>
+			<vfunc name="create_cairo_surface">
+				<return-type type="cairo_surface_t*"/>
+				<parameters>
+					<parameter name="drawable" type="GdkDrawable*"/>
+					<parameter name="width" type="int"/>
+					<parameter name="height" type="int"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="create_gc">
 				<return-type type="GdkGC*"/>
 				<parameters>
@@ -3279,6 +3300,21 @@
 					<parameter name="height" type="gint"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="draw_drawable_with_src">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="drawable" type="GdkDrawable*"/>
+					<parameter name="gc" type="GdkGC*"/>
+					<parameter name="src" type="GdkDrawable*"/>
+					<parameter name="xsrc" type="gint"/>
+					<parameter name="ysrc" type="gint"/>
+					<parameter name="xdest" type="gint"/>
+					<parameter name="ydest" type="gint"/>
+					<parameter name="width" type="gint"/>
+					<parameter name="height" type="gint"/>
+					<parameter name="original_src" type="GdkDrawable*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="draw_glyphs">
 				<return-type type="void"/>
 				<parameters>
@@ -3469,6 +3505,12 @@
 					<parameter name="height" type="gint*"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="get_source_drawable">
+				<return-type type="GdkDrawable*"/>
+				<parameters>
+					<parameter name="drawable" type="GdkDrawable*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="get_visible_region">
 				<return-type type="GdkRegion*"/>
 				<parameters>
@@ -3487,6 +3529,13 @@
 					<parameter name="drawable" type="GdkDrawable*"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="set_cairo_clip">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="drawable" type="GdkDrawable*"/>
+					<parameter name="cr" type="cairo_t*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="set_colormap">
 				<return-type type="void"/>
 				<parameters>
@@ -4254,6 +4303,7 @@
 			<field name="closed" type="guint"/>
 			<field name="normal_gcs" type="GdkGC*[]"/>
 			<field name="exposure_gcs" type="GdkGC*[]"/>
+			<field name="subwindow_gcs" type="GdkGC*[]"/>
 			<field name="font_options" type="cairo_font_options_t*"/>
 			<field name="resolution" type="double"/>
 		</object>
@@ -4422,19 +4472,25 @@
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
-			<method name="destroy_notify" symbol="gdk_window_destroy_notify">
+			<method name="enable_synchronized_configure" symbol="gdk_window_enable_synchronized_configure">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
-			<method name="enable_synchronized_configure" symbol="gdk_window_enable_synchronized_configure">
+			<method name="end_paint" symbol="gdk_window_end_paint">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
-			<method name="end_paint" symbol="gdk_window_end_paint">
+			<method name="ensure_native" symbol="gdk_window_ensure_native">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
+			<method name="flush" symbol="gdk_window_flush">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
@@ -4478,12 +4534,24 @@
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
+			<method name="geometry_changed" symbol="gdk_window_geometry_changed">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
 			<method name="get_children" symbol="gdk_window_get_children">
 				<return-type type="GList*"/>
 				<parameters>
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
+			<method name="get_cursor" symbol="gdk_window_get_cursor">
+				<return-type type="GdkCursor*"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
 			<method name="get_decorations" symbol="gdk_window_get_decorations">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -4491,6 +4559,14 @@
 					<parameter name="decorations" type="GdkWMDecoration*"/>
 				</parameters>
 			</method>
+			<method name="get_deskrelative_origin" symbol="gdk_window_get_deskrelative_origin">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="x" type="gint*"/>
+					<parameter name="y" type="gint*"/>
+				</parameters>
+			</method>
 			<method name="get_events" symbol="gdk_window_get_events">
 				<return-type type="GdkEventMask"/>
 				<parameters>
@@ -4561,6 +4637,16 @@
 					<parameter name="y" type="gint*"/>
 				</parameters>
 			</method>
+			<method name="get_root_coords" symbol="gdk_window_get_root_coords">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="x" type="gint"/>
+					<parameter name="y" type="gint"/>
+					<parameter name="root_x" type="gint*"/>
+					<parameter name="root_y" type="gint*"/>
+				</parameters>
+			</method>
 			<method name="get_root_origin" symbol="gdk_window_get_root_origin">
 				<return-type type="void"/>
 				<parameters>
@@ -4661,6 +4747,12 @@
 					<parameter name="invalidate_children" type="gboolean"/>
 				</parameters>
 			</method>
+			<method name="is_destroyed" symbol="gdk_window_is_destroyed">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+				</parameters>
+			</method>
 			<method name="is_viewable" symbol="gdk_window_is_viewable">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -4804,6 +4896,14 @@
 					<parameter name="height" type="gint"/>
 				</parameters>
 			</method>
+			<method name="restack" symbol="gdk_window_restack">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="window" type="GdkWindow*"/>
+					<parameter name="sibling" type="GdkWindow*"/>
+					<parameter name="above" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="scroll" symbol="gdk_window_scroll">
 				<return-type type="void"/>
 				<parameters>
@@ -5109,6 +5209,35 @@
 					<parameter name="window" type="GdkWindow*"/>
 				</parameters>
 			</method>
+			<property name="cursor" type="GdkCursor*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="from-embedder" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="GdkWindow*"/>
+					<parameter name="p0" type="gdouble"/>
+					<parameter name="p1" type="gdouble"/>
+					<parameter name="p2" type="gpointer"/>
+					<parameter name="p3" type="gpointer"/>
+				</parameters>
+			</signal>
+			<signal name="pick-embedded-child" when="LAST">
+				<return-type type="GdkWindow*"/>
+				<parameters>
+					<parameter name="object" type="GdkWindow*"/>
+					<parameter name="p0" type="gdouble"/>
+					<parameter name="p1" type="gdouble"/>
+				</parameters>
+			</signal>
+			<signal name="to-embedder" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="GdkWindow*"/>
+					<parameter name="p0" type="gdouble"/>
+					<parameter name="p1" type="gdouble"/>
+					<parameter name="p2" type="gpointer"/>
+					<parameter name="p3" type="gpointer"/>
+				</parameters>
+			</signal>
 		</object>
 		<constant name="GDK_CURRENT_TIME" type="int" value="0"/>
 		<constant name="GDK_MAX_TIMECOORD_AXES" type="int" value="128"/>
diff --git a/vapi/packages/gdk-2.0/gdk-2.0.metadata b/vapi/packages/gdk-2.0/gdk-2.0.metadata
index 261ea0e14..68669dd3b 100644
--- a/vapi/packages/gdk-2.0/gdk-2.0.metadata
+++ b/vapi/packages/gdk-2.0/gdk-2.0.metadata
@@ -63,6 +63,8 @@ gdk_keymap_get_entries_for_keycode.keyvals is_array="1" is_out="1"
 gdk_keymap_get_entries_for_keyval.keys is_array="1" is_out="1"
 GdkKeymapKey is_value_type="1"
 GdkNativeWindow is_value_type="1" simple_type="1"
+gdk_offscreen_window_get_embedder nullable="1"
+gdk_offscreen_window_get_pixmap nullable="1"
 GdkPangoAttr* is_value_type="1"
 gdk_pixbuf_get_from_drawable.dest nullable="1"
 gdk_pixbuf_get_from_drawable.cmap nullable="1"
@@ -126,6 +128,7 @@ GdkWindowClass common_prefix="GDK_"
 GdkWindowObject hidden="1"
 GdkWindowObjectClass hidden="1"
 GdkWindowRedirect is_value_type="1"
+gdk_window_get_cursor nullable="1"
 gdk_window_get_geometry.x is_out="1"
 gdk_window_get_geometry.y is_out="1"
 gdk_window_get_geometry.width is_out="1"