support uchar[] regenerated set cheader_filename fix GdkCursor and

2007-02-28  Jürg Billeter  <j@bitron.ch>

	* vapigen/valagidlparser.vala: support uchar[]
	* packages/atk/atk.gidl, packages/gtk+-2.0/gtk+-2.0.gidl,
	  packages/pango/pango.gidl: regenerated
	* packages/atk/atk.metadata: set cheader_filename
	* packages/gdk-2.0/gdk-2.0.metadata: fix GdkCursor and GdkWindowAttr

svn path=/trunk/; revision=205

diff --git a/vapigen/ChangeLog b/vapigen/ChangeLog
index c3bbe8bd21933b0677f2a1cea6e05721aee89d5e..11ed35f37e06a8c41270a93b432e45ab405ea965 100644 (file)
--- a/vapigen/ChangeLog
+++ b/vapigen/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-28  Jürg Billeter  <j@bitron.ch>
+
+       * vapigen/valagidlparser.vala: support uchar[]
+       * packages/atk/atk.gidl, packages/gtk+-2.0/gtk+-2.0.gidl,
+         packages/pango/pango.gidl: regenerated
+       * packages/atk/atk.metadata: set cheader_filename
+       * packages/gdk-2.0/gdk-2.0.metadata: fix GdkCursor and GdkWindowAttr
+
 2006-11-02  Jürg Billeter  <j@bitron.ch>
 
        * vapigen/valagidlparser.vala: don't ignore Gtk.Allocation, set cname

diff --git a/vapigen/packages/atk/atk.gidl b/vapigen/packages/atk/atk.gidl
index be02b9a5b05d21527541522ccf425485bff7c2aa..c710115fc099844ec2aa53025ee7a891fb2e7d34 100644 (file)
--- a/vapigen/packages/atk/atk.gidl
+++ b/vapigen/packages/atk/atk.gidl
@@ -2207,6 +2207,35 @@
         </parameters>
       </method>
     </object>
+    <object get-type="" name="AtkMisc" parent="GObject" type-name="AtkMisc">
+      <vfunc name="threads_enter">
+        <return-type type="void"/>
+        <parameters>
+          <parameter name="misc" type="AtkMisc*"/>
+        </parameters>
+      </vfunc>
+      <vfunc name="threads_leave">
+        <return-type type="void"/>
+        <parameters>
+          <parameter name="misc" type="AtkMisc*"/>
+        </parameters>
+      </vfunc>
+      <method name="get_instance" symbol="atk_misc_get_instance">
+        <return-type type="const-AtkMisc*"/>
+      </method>
+      <method name="threads_enter" symbol="atk_misc_threads_enter">
+        <return-type type="void"/>
+        <parameters>
+          <parameter name="misc" type="AtkMisc*"/>
+        </parameters>
+      </method>
+      <method name="threads_leave" symbol="atk_misc_threads_leave">
+        <return-type type="void"/>
+        <parameters>
+          <parameter name="misc" type="AtkMisc*"/>
+        </parameters>
+      </method>
+    </object>
     <object get-type="" name="AtkNoOpObject" parent="AtkObject" type-name="AtkNoOpObject">
       <implements>
         <interface name="AtkComponent"/>

diff --git a/vapigen/packages/atk/atk.metadata b/vapigen/packages/atk/atk.metadata
new file mode 100644 (file)
index 0000000..eb28f14
--- /dev/null
+++ b/vapigen/packages/atk/atk.metadata
@@ -0,0 +1,2 @@
+Atk cheader_filename="atk/atk.h"
+

diff --git a/vapigen/packages/gdk-2.0/gdk-2.0.metadata b/vapigen/packages/gdk-2.0/gdk-2.0.metadata
index 39e9f61e3bb3e678ffe709f8457cb47455028665..fcf1c2e1445fd8621cfdf873d8e52a2a20921cf4 100644 (file)
--- a/vapigen/packages/gdk-2.0/gdk-2.0.metadata
+++ b/vapigen/packages/gdk-2.0/gdk-2.0.metadata
@@ -1,3 +1,6 @@
 Gdk cheader_filename="gdk/gdk.h"
 GdkAtom is_value_type="1"
 GdkColor is_value_type="1"
+GdkCursor is_value_type="0"
+GdkWindowAttr is_value_type="1"
+

diff --git a/vapigen/packages/gtk+-2.0/gtk+-2.0.gidl b/vapigen/packages/gtk+-2.0/gtk+-2.0.gidl
index c69d413b9a0f0988a26ec8fbac77935a8c6ee9fe..97c2e2401d4d74cec1f1041ee22d8ea12a4edcdd 100644 (file)
--- a/vapigen/packages/gtk+-2.0/gtk+-2.0.gidl
+++ b/vapigen/packages/gtk+-2.0/gtk+-2.0.gidl
@@ -7244,7 +7244,7 @@
     </object>
     <object get-type="" name="GtkFileChooserButton" parent="GtkHBox" type-name="GtkFileChooserButton">
       <field name="priv" type="GtkFileChooserButtonPrivate*"/>
-      <property construct-only="1" name="dialog" type="GtkFileChooserDialog" writable="1"/>
+      <property construct-only="1" name="dialog" type="GtkFileChooser" writable="1"/>
       <property name="focus-on-click" readable="1" type="gboolean" writable="1"/>
       <property name="title" readable="1" type="gchar*" writable="1"/>
       <property name="width-chars" readable="1" type="gint" writable="1"/>
@@ -10826,7 +10826,7 @@
         </parameters>
       </signal>
       <signal name="change_current_page" when="LAST">
-        <return-type type="void"/>
+        <return-type type="gboolean"/>
         <parameters>
           <parameter name="notebook" type="GtkNotebook*"/>
           <parameter name="offset" type="gint"/>
@@ -10840,7 +10840,7 @@
         </parameters>
       </signal>
       <signal name="reorder_tab" when="LAST">
-        <return-type type="void"/>
+        <return-type type="gboolean"/>
         <parameters>
           <parameter name="notebook" type="GtkNotebook*"/>
           <parameter name="direction" type="GtkDirectionType"/>
@@ -14426,7 +14426,7 @@
       <property name="window-placement-set" readable="1" type="gboolean" writable="1"/>
       <property name="shadow-type" readable="1" type="GtkShadowType" writable="1"/>
       <signal name="scroll_child" when="LAST">
-        <return-type type="void"/>
+        <return-type type="gboolean"/>
         <parameters>
           <parameter name="scrolled_window" type="GtkScrolledWindow*"/>
           <parameter name="scroll" type="GtkScrollType"/>

diff --git a/vapigen/packages/pango/pango.gidl b/vapigen/packages/pango/pango.gidl
index 7ef9626a41c5f928452df6c783e6e1de8361fc20..25716baddd2f0a577714efab87170a134738ba0b 100644 (file)
--- a/vapigen/packages/pango/pango.gidl
+++ b/vapigen/packages/pango/pango.gidl
@@ -34,6 +34,8 @@
       <member name="PANGO_ATTR_UNDERLINE_COLOR" value=""/>
       <member name="PANGO_ATTR_STRIKETHROUGH_COLOR" value=""/>
       <member name="PANGO_ATTR_ABSOLUTE_SIZE" value=""/>
+      <member name="PANGO_ATTR_GRAVITY" value=""/>
+      <member name="PANGO_ATTR_GRAVITY_HINT" value=""/>
     </enum>
     <enum get-type="pango_coverage_level_get_type" name="PangoCoverageLevel" type="enum" type-name="PangoCoverageLevel">
       <member name="PANGO_COVERAGE_NONE" value=""/>
@@ -63,6 +65,19 @@
       <member name="PANGO_FONT_MASK_WEIGHT" value=""/>
       <member name="PANGO_FONT_MASK_STRETCH" value=""/>
       <member name="PANGO_FONT_MASK_SIZE" value=""/>
+      <member name="PANGO_FONT_MASK_GRAVITY" value=""/>
+    </enum>
+    <enum get-type="pango_gravity_get_type" name="PangoGravity" type="enum" type-name="PangoGravity">
+      <member name="PANGO_GRAVITY_SOUTH" value=""/>
+      <member name="PANGO_GRAVITY_EAST" value=""/>
+      <member name="PANGO_GRAVITY_NORTH" value=""/>
+      <member name="PANGO_GRAVITY_WEST" value=""/>
+      <member name="PANGO_GRAVITY_AUTO" value=""/>
+    </enum>
+    <enum get-type="pango_gravity_hint_get_type" name="PangoGravityHint" type="enum" type-name="PangoGravityHint">
+      <member name="PANGO_GRAVITY_HINT_NATURAL" value=""/>
+      <member name="PANGO_GRAVITY_HINT_STRONG" value=""/>
+      <member name="PANGO_GRAVITY_HINT_LINE" value=""/>
     </enum>
     <enum get-type="pango_render_part_get_type" name="PangoRenderPart" type="enum" type-name="PangoRenderPart">
       <member name="PANGO_RENDER_PART_FOREGROUND" value=""/>
@@ -212,6 +227,12 @@
           <parameter name="context" type="PangoContext*"/>
         </parameters>
       </method>
+      <method name="get_base_gravity" symbol="pango_context_get_base_gravity">
+        <return-type type="PangoGravity"/>
+        <parameters>
+          <parameter name="context" type="PangoContext*"/>
+        </parameters>
+      </method>
       <method name="get_font_description" symbol="pango_context_get_font_description">
         <return-type type="PangoFontDescription*"/>
         <parameters>
@@ -224,6 +245,18 @@
           <parameter name="context" type="PangoContext*"/>
         </parameters>
       </method>
+      <method name="get_gravity" symbol="pango_context_get_gravity">
+        <return-type type="PangoGravity"/>
+        <parameters>
+          <parameter name="context" type="PangoContext*"/>
+        </parameters>
+      </method>
+      <method name="get_gravity_hint" symbol="pango_context_get_gravity_hint">
+        <return-type type="PangoGravityHint"/>
+        <parameters>
+          <parameter name="context" type="PangoContext*"/>
+        </parameters>
+      </method>
       <method name="get_language" symbol="pango_context_get_language">
         <return-type type="PangoLanguage*"/>
         <parameters>
@@ -277,6 +310,13 @@
           <parameter name="direction" type="PangoDirection"/>
         </parameters>
       </method>
+      <method name="set_base_gravity" symbol="pango_context_set_base_gravity">
+        <return-type type="void"/>
+        <parameters>
+          <parameter name="context" type="PangoContext*"/>
+          <parameter name="gravity" type="PangoGravity"/>
+        </parameters>
+      </method>
       <method name="set_font_description" symbol="pango_context_set_font_description">
         <return-type type="void"/>
         <parameters>
@@ -284,6 +324,13 @@
           <parameter name="desc" type="const-PangoFontDescription*"/>
         </parameters>
       </method>
+      <method name="set_gravity_hint" symbol="pango_context_set_gravity_hint">
+        <return-type type="void"/>
+        <parameters>
+          <parameter name="context" type="PangoContext*"/>
+          <parameter name="hint" type="PangoGravityHint"/>
+        </parameters>
+      </method>
       <method name="set_language" symbol="pango_context_set_language">
         <return-type type="void"/>
         <parameters>
@@ -563,12 +610,25 @@
           <parameter name="layout" type="PangoLayout*"/>
         </parameters>
       </method>
+      <method name="get_line_readonly" symbol="pango_layout_get_line_readonly">
+        <return-type type="PangoLayoutLine*"/>
+        <parameters>
+          <parameter name="layout" type="PangoLayout*"/>
+          <parameter name="line" type="int"/>
+        </parameters>
+      </method>
       <method name="get_lines" symbol="pango_layout_get_lines">
         <return-type type="GSList*"/>
         <parameters>
           <parameter name="layout" type="PangoLayout*"/>
         </parameters>
       </method>
+      <method name="get_lines_readonly" symbol="pango_layout_get_lines_readonly">
+        <return-type type="GSList*"/>
+        <parameters>
+          <parameter name="layout" type="PangoLayout*"/>
+        </parameters>
+      </method>
       <method name="get_log_attrs" symbol="pango_layout_get_log_attrs">
         <return-type type="void"/>
         <parameters>
@@ -628,6 +688,12 @@
       <method name="get_type" symbol="pango_layout_get_type">
         <return-type type="GType"/>
       </method>
+      <method name="get_unknown_glyphs_count" symbol="pango_layout_get_unknown_glyphs_count">
+        <return-type type="int"/>
+        <parameters>
+          <parameter name="layout" type="PangoLayout*"/>
+        </parameters>
+      </method>
       <method name="get_width" symbol="pango_layout_get_width">
         <return-type type="int"/>
         <parameters>
@@ -658,6 +724,18 @@
           <parameter name="pos" type="PangoRectangle*"/>
         </parameters>
       </method>
+      <method name="is_ellipsized" symbol="pango_layout_is_ellipsized">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter name="layout" type="PangoLayout*"/>
+        </parameters>
+      </method>
+      <method name="is_wrapped" symbol="pango_layout_is_wrapped">
+        <return-type type="gboolean"/>
+        <parameters>
+          <parameter name="layout" type="PangoLayout*"/>
+        </parameters>
+      </method>
       <method name="move_cursor_visually" symbol="pango_layout_move_cursor_visually">
         <return-type type="void"/>
         <parameters>
@@ -1019,6 +1097,8 @@
       <field name="lang_engine" readable="1" type="PangoEngineLang*" writable="1"/>
       <field name="font" readable="1" type="PangoFont*" writable="1"/>
       <field name="level" readable="1" type="guint8" writable="1"/>
+      <field name="gravity" readable="1" type="guint8" writable="1"/>
+      <field name="flags" readable="1" type="guint8" writable="1"/>
       <field name="language" readable="1" type="PangoLanguage*" writable="1"/>
       <field name="extra_attrs" readable="1" type="GSList*" writable="1"/>
     </struct>
@@ -1273,6 +1353,12 @@
           <parameter name="spec" type="const-char*"/>
         </parameters>
       </method>
+      <method name="to_string" symbol="pango_color_to_string">
+        <return-type type="gchar*"/>
+        <parameters>
+          <parameter name="color" type="const-PangoColor*"/>
+        </parameters>
+      </method>
     </boxed>
     <struct get-type="" name="PangoCoverage" opaque="true" type-name="PangoCoverage">
       <method name="copy" symbol="pango_coverage_copy">
@@ -1382,6 +1468,12 @@
           <parameter name="desc" type="const-PangoFontDescription*"/>
         </parameters>
       </method>
+      <method name="get_gravity" symbol="pango_font_description_get_gravity">
+        <return-type type="PangoGravity"/>
+        <parameters>
+          <parameter name="desc" type="const-PangoFontDescription*"/>
+        </parameters>
+      </method>
       <method name="get_set_fields" symbol="pango_font_description_get_set_fields">
         <return-type type="PangoFontMask"/>
         <parameters>
@@ -1473,6 +1565,13 @@
           <parameter name="family" type="const-char*"/>
         </parameters>
       </method>
+      <method name="set_gravity" symbol="pango_font_description_set_gravity">
+        <return-type type="void"/>
+        <parameters>
+          <parameter name="desc" type="PangoFontDescription*"/>
+          <parameter name="gravity" type="PangoGravity"/>
+        </parameters>
+      </method>
       <method name="set_size" symbol="pango_font_description_set_size">
         <return-type type="void"/>
         <parameters>
@@ -1771,6 +1870,9 @@
           <parameter name="language" type="const-char*"/>
         </parameters>
       </method>
+      <method name="get_default" symbol="pango_language_get_default">
+        <return-type type="PangoLanguage*"/>
+      </method>
       <method name="get_sample_string" symbol="pango_language_get_sample_string">
         <return-type type="const-char*"/>
         <parameters>
@@ -1857,6 +1959,12 @@
           <parameter name="logical_rect" type="PangoRectangle*"/>
         </parameters>
       </method>
+      <method name="get_line_readonly" symbol="pango_layout_iter_get_line_readonly">
+        <return-type type="PangoLayoutLine*"/>
+        <parameters>
+          <parameter name="iter" type="PangoLayoutIter*"/>
+        </parameters>
+      </method>
       <method name="get_line_yrange" symbol="pango_layout_iter_get_line_yrange">
         <return-type type="void"/>
         <parameters>
@@ -1879,6 +1987,12 @@
           <parameter name="logical_rect" type="PangoRectangle*"/>
         </parameters>
       </method>
+      <method name="get_run_readonly" symbol="pango_layout_iter_get_run_readonly">
+        <return-type type="PangoLayoutRun*"/>
+        <parameters>
+          <parameter name="iter" type="PangoLayoutIter*"/>
+        </parameters>
+      </method>
       <method name="get_type" symbol="pango_layout_iter_get_type">
         <return-type type="GType"/>
       </method>
@@ -2041,6 +2155,36 @@
           <parameter name="scale_y" type="double"/>
         </parameters>
       </method>
+      <method name="transform_distance" symbol="pango_matrix_transform_distance">
+        <return-type type="void"/>
+        <parameters>
+          <parameter name="matrix" type="const-PangoMatrix*"/>
+          <parameter name="dx" type="double*"/>
+          <parameter name="dy" type="double*"/>
+        </parameters>
+      </method>
+      <method name="transform_pixel_rectangle" symbol="pango_matrix_transform_pixel_rectangle">
+        <return-type type="void"/>
+        <parameters>
+          <parameter name="matrix" type="const-PangoMatrix*"/>
+          <parameter name="rect" type="PangoRectangle*"/>
+        </parameters>
+      </method>
+      <method name="transform_point" symbol="pango_matrix_transform_point">
+        <return-type type="void"/>
+        <parameters>
+          <parameter name="matrix" type="const-PangoMatrix*"/>
+          <parameter name="x" type="double*"/>
+          <parameter name="y" type="double*"/>
+        </parameters>
+      </method>
+      <method name="transform_rectangle" symbol="pango_matrix_transform_rectangle">
+        <return-type type="void"/>
+        <parameters>
+          <parameter name="matrix" type="const-PangoMatrix*"/>
+          <parameter name="rect" type="PangoRectangle*"/>
+        </parameters>
+      </method>
       <method name="translate" symbol="pango_matrix_translate">
         <return-type type="void"/>
         <parameters>
@@ -2218,6 +2362,18 @@
           <parameter name="blue" type="guint16"/>
         </parameters>
       </method>
+      <method name="gravity_hint_new" symbol="pango_attr_gravity_hint_new">
+        <return-type type="PangoAttribute*"/>
+        <parameters>
+          <parameter name="hint" type="PangoGravityHint"/>
+        </parameters>
+      </method>
+      <method name="gravity_new" symbol="pango_attr_gravity_new">
+        <return-type type="PangoAttribute*"/>
+        <parameters>
+          <parameter name="gravity" type="PangoGravity"/>
+        </parameters>
+      </method>
       <method name="letter_spacing_new" symbol="pango_attr_letter_spacing_new">
         <return-type type="PangoAttribute*"/>
         <parameters>
@@ -2295,6 +2451,13 @@
         </parameters>
       </method>
     </struct>
+    <function name="extents_to_pixels" symbol="pango_extents_to_pixels">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="ink_rect" type="PangoRectangle*"/>
+        <parameter name="logical_rect" type="PangoRectangle*"/>
+      </parameters>
+    </function>
     <function name="find_base_dir" symbol="pango_find_base_dir">
       <return-type type="PangoDirection"/>
       <parameters>
@@ -2329,6 +2492,26 @@
         <parameter name="mirrored_ch" type="gunichar*"/>
       </parameters>
     </function>
+    <function name="gravity_get_for_matrix" symbol="pango_gravity_get_for_matrix">
+      <return-type type="PangoGravity"/>
+      <parameters>
+        <parameter name="matrix" type="const-PangoMatrix*"/>
+      </parameters>
+    </function>
+    <function name="gravity_get_for_script" symbol="pango_gravity_get_for_script">
+      <return-type type="PangoGravity"/>
+      <parameters>
+        <parameter name="script" type="PangoScript"/>
+        <parameter name="base_gravity" type="PangoGravity"/>
+        <parameter name="hint" type="PangoGravityHint"/>
+      </parameters>
+    </function>
+    <function name="gravity_to_rotation" symbol="pango_gravity_to_rotation">
+      <return-type type="double"/>
+      <parameters>
+        <parameter name="gravity" type="PangoGravity"/>
+      </parameters>
+    </function>
     <function name="is_zero_width" symbol="pango_is_zero_width">
       <return-type type="gboolean"/>
       <parameters>
@@ -2347,6 +2530,16 @@
         <parameter name="cached_iter" type="PangoAttrIterator*"/>
       </parameters>
     </function>
+    <function name="parse_enum" symbol="pango_parse_enum">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter name="type" type="GType"/>
+        <parameter name="str" type="const-char*"/>
+        <parameter name="value" type="int*"/>
+        <parameter name="warn" type="gboolean"/>
+        <parameter name="possible_values" type="char**"/>
+      </parameters>
+    </function>
     <function name="parse_markup" symbol="pango_parse_markup">
       <return-type type="gboolean"/>
       <parameters>
@@ -2468,5 +2661,32 @@
         <parameter name="ch" type="gunichar"/>
       </parameters>
     </function>
+    <struct name="PangoUnits">
+      <method name="from_double" symbol="pango_units_from_double">
+        <return-type type="int"/>
+        <parameters>
+          <parameter name="d" type="double"/>
+        </parameters>
+      </method>
+      <method name="to_double" symbol="pango_units_to_double">
+        <return-type type="double"/>
+        <parameters>
+          <parameter name="i" type="int"/>
+        </parameters>
+      </method>
+    </struct>
+    <struct name="PangoVersion">
+      <method name="check" symbol="pango_version_check">
+        <return-type type="const-char*"/>
+        <parameters>
+          <parameter name="required_major" type="int"/>
+          <parameter name="required_minor" type="int"/>
+          <parameter name="required_micro" type="int"/>
+        </parameters>
+      </method>
+      <method name="string" symbol="pango_version_string">
+        <return-type type="const-char*"/>
+      </method>
+    </struct>
   </namespace>
 </api>

diff --git a/vapigen/vapigen/valagidlparser.vala b/vapigen/vapigen/valagidlparser.vala
index fc55e0cef4f97798712d9672dc73c99f5fd40774..b2c534b7a6b9fcba832d1a747fc4321a00e9df10 100644 (file)
--- a/vapigen/vapigen/valagidlparser.vala
+++ b/vapigen/vapigen/valagidlparser.vala
@@ -497,6 +497,9 @@ public class Vala.GIdlParser : CodeVisitor {
                                type.type_name = "char";
                        } else if (n == "guchar" || n == "guint8") {
                                type.type_name = "uchar";
+                               if (type_node.is_pointer) {
+                                       type.array_rank = 1;
+                               }
                        } else if (n == "gushort") {
                                type.type_name = "ushort";
                        } else if (n == "gshort") {