[vala] gdk-x11-2.0, gdk-x11-3.0: Update using 2.24.20, 3.9.8
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] gdk-x11-2.0, gdk-x11-3.0: Update using 2.24.20, 3.9.8
- Date: Sat, 27 Jul 2013 12:52:14 +0000 (UTC)
commit f3adafcaa9ff7930328adad39cb5a6e7a521a183
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Sat Jul 27 14:50:40 2013 +0200
gdk-x11-2.0, gdk-x11-3.0: Update using 2.24.20, 3.9.8
vapi/Makefile.am | 2 +-
vapi/gdk-x11-2.0.vapi | 18 ++++-
vapi/gdk-x11-3.0.vapi | 6 ++
vapi/packages/gdk-x11-2.0/gdk-x11-2.0-custom.vala | 18 ++++
vapi/packages/gdk-x11-2.0/gdk-x11-2.0.gi | 90 ++++++++++++++-------
vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi | 43 ++++++++++
6 files changed, 144 insertions(+), 33 deletions(-)
---
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 61fdb3e..05646aa 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -452,7 +452,7 @@ gdk-pixbuf-2.0:
$(GENVAPI) --library $(srcdir)/gdk-pixbuf-2.0 --pkg gio-2.0 --metadatadir $(METADATADIR)
$(METADATADIR)/GdkPixbuf-2.0-custom.vala $(GIRDIR)/GdkPixbuf-2.0.gir
gdk-x11-2.0:
- $(GENVAPI) --library $(srcdir)/gdk-x11-2.0 $(PACKAGESDIR)/gdk-x11-2.0/gdk-x11-2.0.gi
+ $(GENVAPI) --library $(srcdir)/gdk-x11-2.0 $(PACKAGESDIR)/gdk-x11-2.0/gdk-x11-2.0-custom.vala
$(PACKAGESDIR)/gdk-x11-2.0/gdk-x11-2.0.gi
gdk-x11-3.0:
$(GENVAPI) --library $(srcdir)/gdk-x11-3.0 $(PACKAGESDIR)/gdk-x11-3.0/gdk-x11-3.0.gi
diff --git a/vapi/gdk-x11-2.0.vapi b/vapi/gdk-x11-2.0.vapi
index 686cdd4..83678e8 100644
--- a/vapi/gdk-x11-2.0.vapi
+++ b/vapi/gdk-x11-2.0.vapi
@@ -29,12 +29,22 @@ namespace Gdk {
[CCode (cheader_filename = "gdk/gdkx.h")]
public static void x11_display_set_cursor_theme (Gdk.Display display, string theme, int size);
[CCode (cheader_filename = "gdk/gdkx.h")]
+ public static int x11_display_string_to_compound_text (Gdk.Display display, string str, out Gdk.Atom
encoding, int format, uchar[] ctext, int length);
+ [CCode (cheader_filename = "gdk/gdkx.h")]
+ public static int x11_display_text_property_to_text_list (Gdk.Display display, Gdk.Atom encoding, int
format, uchar[] text, int length, string list);
+ [CCode (cheader_filename = "gdk/gdkx.h")]
public static void x11_display_ungrab (Gdk.Display display);
[CCode (cheader_filename = "gdk/gdkx.h")]
+ public static bool x11_display_utf8_to_compound_text (Gdk.Display display, string str, out Gdk.Atom
encoding, int format, uchar[] ctext, int length);
+ [CCode (cheader_filename = "gdk/gdkx.h")]
public static unowned X.Display x11_drawable_get_xdisplay (Gdk.Drawable drawable);
[CCode (cheader_filename = "gdk/gdkx.h")]
public static X.ID x11_drawable_get_xid (Gdk.Drawable drawable);
[CCode (cheader_filename = "gdk/gdkx.h")]
+ public static void x11_free_compound_text (uchar[] ctext);
+ [CCode (cheader_filename = "gdk/gdkx.h")]
+ public static void x11_free_text_list (string list);
+ [CCode (cheader_filename = "gdk/gdkx.h")]
public static unowned X.Display x11_gc_get_xdisplay (Gdk.GC gc);
[CCode (cheader_filename = "gdk/gdkx.h")]
public static X.GC x11_gc_get_xgc (Gdk.GC gc);
@@ -59,7 +69,7 @@ namespace Gdk {
[CCode (cheader_filename = "gdk/gdkx.h")]
public static unowned X.Display x11_image_get_xdisplay (Gdk.Image image);
[CCode (cheader_filename = "gdk/gdkx.h")]
- public static void* x11_image_get_ximage (Gdk.Image image);
+ public static unowned X.Image x11_image_get_ximage (Gdk.Image image);
[CCode (cheader_filename = "gdk/gdkx.h")]
public static unowned Gdk.Display x11_lookup_xdisplay (X.Display xdisplay);
[CCode (cheader_filename = "gdk/gdkx.h", cname = "gdk_net_wm_supports")]
@@ -81,14 +91,20 @@ namespace Gdk {
[CCode (cheader_filename = "gdk/gdkx.h")]
public static bool x11_screen_supports_net_wm_hint (Gdk.Screen screen, Gdk.Atom property);
[CCode (cheader_filename = "gdk/gdkx.h")]
+ public static void x11_set_sm_client_id (string sm_client_id);
+ [CCode (cheader_filename = "gdk/gdkx.h")]
public static void x11_ungrab_server ();
[CCode (cheader_filename = "gdk/gdkx.h", cname = "gdkx_visual_get")]
public static unowned Gdk.Visual x11_visual_get (X.VisualID xvisualid);
[CCode (cheader_filename = "gdk/gdkx.h")]
public static unowned X.Visual x11_visual_get_xvisual (Gdk.Visual visual);
[CCode (cheader_filename = "gdk/gdkx.h")]
+ public static unowned Gdk.Window x11_window_foreign_new_for_display (Gdk.Display display, X.Window
window);
+ [CCode (cheader_filename = "gdk/gdkx.h")]
public static unowned Gdk.Drawable x11_window_get_drawable_impl (Gdk.Window window);
[CCode (cheader_filename = "gdk/gdkx.h")]
+ public static unowned Gdk.Window x11_window_lookup_for_display (Gdk.Display display, X.Window window);
+ [CCode (cheader_filename = "gdk/gdkx.h")]
public static void x11_window_move_to_current_desktop (Gdk.Window window);
[CCode (cheader_filename = "gdk/gdkx.h")]
public static void x11_window_set_user_time (Gdk.Window window, uint32 timestamp);
diff --git a/vapi/gdk-x11-3.0.vapi b/vapi/gdk-x11-3.0.vapi
index 443dcee..065715c 100644
--- a/vapi/gdk-x11-3.0.vapi
+++ b/vapi/gdk-x11-3.0.vapi
@@ -66,6 +66,8 @@ namespace Gdk {
public class X11Keymap : Gdk.Keymap {
[CCode (has_construct_function = false)]
protected X11Keymap ();
+ public static int get_group_for_state (Gdk.Keymap keymap, uint state);
+ public static bool key_is_modifier (Gdk.Keymap keymap, uint keycode);
}
[CCode (cheader_filename = "gdk/gdkx.h")]
[Compact]
@@ -105,7 +107,11 @@ namespace Gdk {
public static X.Window get_xid (Gdk.Window window);
public static unowned Gdk.Window lookup_for_display (Gdk.Display display, X.Window window);
public static void move_to_current_desktop (Gdk.Window window);
+ public static void set_frame_sync_enabled (Gdk.Window window, bool frame_sync_enabled);
+ public static void set_hide_titlebar_when_maximized (Gdk.Window window, bool
hide_titlebar_when_maximized);
+ public static void set_theme_variant (Gdk.Window window, string variant);
public static void set_user_time (Gdk.Window window, uint32 timestamp);
+ public static void set_utf8_property (Gdk.Window window, string name, string value);
}
[CCode (cheader_filename = "gdk/gdkx.h")]
[Compact]
diff --git a/vapi/packages/gdk-x11-2.0/gdk-x11-2.0-custom.vala
b/vapi/packages/gdk-x11-2.0/gdk-x11-2.0-custom.vala
new file mode 100644
index 0000000..d427b49
--- /dev/null
+++ b/vapi/packages/gdk-x11-2.0/gdk-x11-2.0-custom.vala
@@ -0,0 +1,18 @@
+namespace Gdk {
+ [CCode (cheader_filename = "gdk/gdkx.h")]
+ public static unowned X.Display x11_gc_get_xdisplay (Gdk.GC gc);
+
+ [CCode (cheader_filename = "gdk/gdkx.h")]
+ public static X.GC x11_gc_get_xgc (Gdk.GC gc);
+
+ [CCode (cheader_filename = "gdk/gdkx.h", cname = "gdk_net_wm_supports")]
+ public static bool x11_net_wm_supports (Gdk.Atom property);
+
+ [CCode (cheader_filename = "gdk/gdkx.h", cname = "gdkx_visual_get")]
+ public static unowned Gdk.Visual x11_visual_get (X.VisualID xvisualid);
+
+ [CCode (cheader_filename = "gdk/gdkx.h", cname = "gdk_xid_table_lookup")]
+ public static void* x11_xid_table_lookup (X.ID xid);
+ [CCode (cheader_filename = "gdk/gdkx.h", cname = "gdk_xid_table_lookup_for_display")]
+ public static void* x11_xid_table_lookup_for_display (Gdk.Display display, X.ID xid);
+}
diff --git a/vapi/packages/gdk-x11-2.0/gdk-x11-2.0.gi b/vapi/packages/gdk-x11-2.0/gdk-x11-2.0.gi
index 0dec2ec..5d08151 100644
--- a/vapi/packages/gdk-x11-2.0/gdk-x11-2.0.gi
+++ b/vapi/packages/gdk-x11-2.0/gdk-x11-2.0.gi
@@ -1,18 +1,6 @@
<?xml version="1.0"?>
<api version="1.0">
<namespace name="Gdk">
- <function name="gdkx_visual_get" symbol="gdkx_visual_get">
- <return-type type="GdkVisual*"/>
- <parameters>
- <parameter name="xvisualid" type="VisualID"/>
- </parameters>
- </function>
- <function name="net_wm_supports" symbol="gdk_net_wm_supports">
- <return-type type="gboolean"/>
- <parameters>
- <parameter name="property" type="GdkAtom"/>
- </parameters>
- </function>
<function name="x11_atom_to_xatom" symbol="gdk_x11_atom_to_xatom">
<return-type type="Atom"/>
<parameters>
@@ -96,12 +84,45 @@
<parameter name="size" type="gint"/>
</parameters>
</function>
+ <function name="x11_display_string_to_compound_text"
symbol="gdk_x11_display_string_to_compound_text">
+ <return-type type="gint"/>
+ <parameters>
+ <parameter name="display" type="GdkDisplay*"/>
+ <parameter name="str" type="gchar*"/>
+ <parameter name="encoding" type="GdkAtom*"/>
+ <parameter name="format" type="gint*"/>
+ <parameter name="ctext" type="guchar**"/>
+ <parameter name="length" type="gint*"/>
+ </parameters>
+ </function>
+ <function name="x11_display_text_property_to_text_list"
symbol="gdk_x11_display_text_property_to_text_list">
+ <return-type type="gint"/>
+ <parameters>
+ <parameter name="display" type="GdkDisplay*"/>
+ <parameter name="encoding" type="GdkAtom"/>
+ <parameter name="format" type="gint"/>
+ <parameter name="text" type="guchar*"/>
+ <parameter name="length" type="gint"/>
+ <parameter name="list" type="gchar***"/>
+ </parameters>
+ </function>
<function name="x11_display_ungrab" symbol="gdk_x11_display_ungrab">
<return-type type="void"/>
<parameters>
<parameter name="display" type="GdkDisplay*"/>
</parameters>
</function>
+ <function name="x11_display_utf8_to_compound_text"
symbol="gdk_x11_display_utf8_to_compound_text">
+ <return-type type="gboolean"/>
+ <parameters>
+ <parameter name="display" type="GdkDisplay*"/>
+ <parameter name="str" type="gchar*"/>
+ <parameter name="encoding" type="GdkAtom*"/>
+ <parameter name="format" type="gint*"/>
+ <parameter name="ctext" type="guchar**"/>
+ <parameter name="length" type="gint*"/>
+ </parameters>
+ </function>
<function name="x11_drawable_get_xdisplay" symbol="gdk_x11_drawable_get_xdisplay">
<return-type type="Display*"/>
<parameters>
@@ -114,16 +135,16 @@
<parameter name="drawable" type="GdkDrawable*"/>
</parameters>
</function>
- <function name="x11_gc_get_xdisplay" symbol="gdk_x11_gc_get_xdisplay">
- <return-type type="Display*"/>
+ <function name="x11_free_compound_text" symbol="gdk_x11_free_compound_text">
+ <return-type type="void"/>
<parameters>
- <parameter name="gc" type="GdkGC*"/>
+ <parameter name="ctext" type="guchar*"/>
</parameters>
</function>
- <function name="x11_gc_get_xgc" symbol="gdk_x11_gc_get_xgc">
- <return-type type="GC"/>
+ <function name="x11_free_text_list" symbol="gdk_x11_free_text_list">
+ <return-type type="void"/>
<parameters>
- <parameter name="gc" type="GdkGC*"/>
+ <parameter name="list" type="gchar**"/>
</parameters>
</function>
<function name="x11_get_default_root_xwindow" symbol="gdk_x11_get_default_root_xwindow">
@@ -241,6 +262,12 @@
<parameter name="property" type="GdkAtom"/>
</parameters>
</function>
+ <function name="x11_set_sm_client_id" symbol="gdk_x11_set_sm_client_id">
+ <return-type type="void"/>
+ <parameters>
+ <parameter name="sm_client_id" type="gchar*"/>
+ </parameters>
+ </function>
<function name="x11_ungrab_server" symbol="gdk_x11_ungrab_server">
<return-type type="void"/>
</function>
@@ -250,12 +277,26 @@
<parameter name="visual" type="GdkVisual*"/>
</parameters>
</function>
+ <function name="x11_window_foreign_new_for_display"
symbol="gdk_x11_window_foreign_new_for_display">
+ <return-type type="GdkWindow*"/>
+ <parameters>
+ <parameter name="display" type="GdkDisplay*"/>
+ <parameter name="window" type="Window"/>
+ </parameters>
+ </function>
<function name="x11_window_get_drawable_impl" symbol="gdk_x11_window_get_drawable_impl">
<return-type type="GdkDrawable*"/>
<parameters>
<parameter name="window" type="GdkWindow*"/>
</parameters>
</function>
+ <function name="x11_window_lookup_for_display" symbol="gdk_x11_window_lookup_for_display">
+ <return-type type="GdkWindow*"/>
+ <parameters>
+ <parameter name="display" type="GdkDisplay*"/>
+ <parameter name="window" type="Window"/>
+ </parameters>
+ </function>
<function name="x11_window_move_to_current_desktop"
symbol="gdk_x11_window_move_to_current_desktop">
<return-type type="void"/>
<parameters>
@@ -282,18 +323,5 @@
<parameter name="xatom" type="Atom"/>
</parameters>
</function>
- <function name="xid_table_lookup" symbol="gdk_xid_table_lookup">
- <return-type type="gpointer"/>
- <parameters>
- <parameter name="xid" type="XID"/>
- </parameters>
- </function>
- <function name="xid_table_lookup_for_display" symbol="gdk_xid_table_lookup_for_display">
- <return-type type="gpointer"/>
- <parameters>
- <parameter name="display" type="GdkDisplay*"/>
- <parameter name="xid" type="XID"/>
- </parameters>
- </function>
</namespace>
</api>
diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi
index 72f77c1..fe75805 100644
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi
+++ b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi
@@ -253,6 +253,20 @@
<object name="GdkX11DragContext" parent="GdkDragContext" type-name="GdkX11DragContext"
get-type="gdk_x11_drag_context_get_type">
</object>
<object name="GdkX11Keymap" parent="GdkKeymap" type-name="GdkX11Keymap"
get-type="gdk_x11_keymap_get_type">
+ <method name="get_group_for_state" symbol="gdk_x11_keymap_get_group_for_state">
+ <return-type type="gint"/>
+ <parameters>
+ <parameter name="keymap" type="GdkKeymap*"/>
+ <parameter name="state" type="guint"/>
+ </parameters>
+ </method>
+ <method name="key_is_modifier" symbol="gdk_x11_keymap_key_is_modifier">
+ <return-type type="gboolean"/>
+ <parameters>
+ <parameter name="keymap" type="GdkKeymap*"/>
+ <parameter name="keycode" type="guint"/>
+ </parameters>
+ </method>
</object>
<object name="GdkX11Screen" parent="GdkScreen" type-name="GdkX11Screen"
get-type="gdk_x11_screen_get_type">
<method name="get_monitor_output" symbol="gdk_x11_screen_get_monitor_output">
@@ -336,6 +350,27 @@
<parameter name="window" type="GdkWindow*"/>
</parameters>
</method>
+ <method name="set_frame_sync_enabled" symbol="gdk_x11_window_set_frame_sync_enabled">
+ <return-type type="void"/>
+ <parameters>
+ <parameter name="window" type="GdkWindow*"/>
+ <parameter name="frame_sync_enabled" type="gboolean"/>
+ </parameters>
+ </method>
+ <method name="set_hide_titlebar_when_maximized"
symbol="gdk_x11_window_set_hide_titlebar_when_maximized">
+ <return-type type="void"/>
+ <parameters>
+ <parameter name="window" type="GdkWindow*"/>
+ <parameter name="hide_titlebar_when_maximized" type="gboolean"/>
+ </parameters>
+ </method>
+ <method name="set_theme_variant" symbol="gdk_x11_window_set_theme_variant">
+ <return-type type="void"/>
+ <parameters>
+ <parameter name="window" type="GdkWindow*"/>
+ <parameter name="variant" type="char*"/>
+ </parameters>
+ </method>
<method name="set_user_time" symbol="gdk_x11_window_set_user_time">
<return-type type="void"/>
<parameters>
@@ -343,6 +378,14 @@
<parameter name="timestamp" type="guint32"/>
</parameters>
</method>
+ <method name="set_utf8_property" symbol="gdk_x11_window_set_utf8_property">
+ <return-type type="void"/>
+ <parameters>
+ <parameter name="window" type="GdkWindow*"/>
+ <parameter name="name" type="gchar*"/>
+ <parameter name="value" type="gchar*"/>
+ </parameters>
+ </method>
</object>
</namespace>
</api>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
