gir-repository r31 - in trunk: . gir
- From: johan svn gnome org
- To: svn-commits-list gnome org
- Subject: gir-repository r31 - in trunk: . gir
- Date: Mon, 18 Aug 2008 20:18:43 +0000 (UTC)
Author: johan
Date: Mon Aug 18 20:18:43 2008
New Revision: 31
URL: http://svn.gnome.org/viewvc/gir-repository?rev=31&view=rev
Log:
2008-08-18 Johan Dahlin <johan gnome org>
* gir/Makefile.am:
* gir/freetype2.gir:
* gir/pango.gir:
* gir/pangocairo.gir:
* gir/pangoft2.gir:
* gir/pangox.gir:
* gir/pangoxft.gir:
* gir/xft.gir:
* gir/xlib.gir:
Regenerate. Add fontconfig.gir and xft.gir.
Pangoft2 should depend on pango, pangoxft should depend
on most other girs.
Added:
trunk/gir/fontconfig.gir
trunk/gir/xft.gir
Modified:
trunk/ChangeLog
trunk/gir/Makefile.am
trunk/gir/freetype2.gir
trunk/gir/pango.gir
trunk/gir/pangocairo.gir
trunk/gir/pangoft2.gir
trunk/gir/pangox.gir
trunk/gir/pangoxft.gir
trunk/gir/xlib.gir
Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am (original)
+++ trunk/gir/Makefile.am Mon Aug 18 20:18:43 2008
@@ -1,29 +1,12 @@
-GIRSOURCES =
+GIRSOURCES = cairo.gir fontconfig.gir freetype2.gir xft.gir xlib.gir
# pango
-PANGOFT2_LIBDIR=`pkg-config --variable=libdir pangoft2`
-pangoft2.gir:
- $(G_IR_SCANNER) -v --namespace PangoFT2 \
- --include=$(GIRDIR)/glib-2.0.gir \
- --include=$(GIRDIR)/gobject-2.0.gir \
- --include=$(srcdir)/freetype2.gir \
- --library=$(PANGOFT2_LIBDIR)/libpangoft2-1.0.so.0 \
- --output $@ \
- --pkg gobject-2.0 \
- --pkg freetype2 \
- --pkg pangoft2 \
- -I$(PANGO_INCLUDEDIR) \
- $(PANGO_INCLUDEDIR)/pango/pangoft2.h \
- $(PANGO_INCLUDEDIR)/pango/pangofc-*.h
-GIRSOURCES += pangoft2.gir
-
PANGO_INCLUDEDIR=`pkg-config --variable=includedir pango`/pango-1.0
PANGO_LIBDIR=`pkg-config --variable=libdir pango`
-pango.gir: pangoft2.gir
+pango.gir:
$(G_IR_SCANNER) -v --namespace Pango \
--include=$(GIRDIR)/glib-2.0.gir \
--include=$(GIRDIR)/gobject-2.0.gir \
- --include=$(srcdir)/pangoft2.gir \
--library=$(PANGO_LIBDIR)/libpango-1.0.so.0 \
--output $@ \
--pkg gobject-2.0 \
@@ -34,6 +17,24 @@
$(PANGO_INCLUDEDIR)/pango/pango-*.h
GIRSOURCES += pango.gir
+PANGOFT2_LIBDIR=`pkg-config --variable=libdir pangoft2`
+pangoft2.gir: pango.gir
+ $(G_IR_SCANNER) -v --namespace PangoFT2 \
+ --include=$(GIRDIR)/glib-2.0.gir \
+ --include=$(GIRDIR)/gobject-2.0.gir \
+ --include=$(srcdir)/freetype2.gir \
+ --include=$(srcdir)/pango.gir \
+ --include=$(srcdir)/fontconfig.gir \
+ --library=$(PANGOFT2_LIBDIR)/libpangoft2-1.0.so.0 \
+ --output $@ \
+ --pkg gobject-2.0 \
+ --pkg freetype2 \
+ --pkg pangoft2 \
+ -I$(PANGO_INCLUDEDIR) \
+ $(PANGO_INCLUDEDIR)/pango/pangoft2.h \
+ $(PANGO_INCLUDEDIR)/pango/pangofc-*.h
+GIRSOURCES += pangoft2.gir
+
PANGOCAIRO_LIBDIR=`pkg-config --variable=libdir pangocairo`
pangocairo.gir: cairo.gir
$(G_IR_SCANNER) -v --namespace PangoCairo \
@@ -55,7 +56,11 @@
$(G_IR_SCANNER) -v --namespace PangoXft \
--include=$(GIRDIR)/glib-2.0.gir \
--include=$(GIRDIR)/gobject-2.0.gir \
+ --include=$(srcdir)/fontconfig.gir \
+ --include=$(srcdir)/xft.gir \
+ --include=$(srcdir)/xlib.gir \
--include=$(srcdir)/pango.gir \
+ --include=$(srcdir)/pangoft2.gir \
--library=$(PANGOXFT_LIBDIR)/libpangoxft-1.0.so.0 \
--output $@ \
--pkg gobject-2.0 \
@@ -120,6 +125,7 @@
--include=$(srcdir)/cairo.gir \
--include=$(srcdir)/pango.gir \
--include=$(srcdir)/atk.gir \
+ --include=$(srcdir)/xlib.gir \
--include=$(srcdir)/gdk-pixbuf-2.0.gir \
--library=$(GDK_LIBDIR)/libgdk-x11-2.0.so.0 \
--output $@ \
Added: trunk/gir/fontconfig.gir
==============================================================================
--- (empty file)
+++ trunk/gir/fontconfig.gir Mon Aug 18 20:18:43 2008
@@ -0,0 +1,8 @@
+<repository version="1.0"
+ xmlns="http://www.gtk.org/introspection/core/1.0";
+ xmlns:c="http://www.gtk.org/introspection/c/1.0";>
+ <namespace name="fontconfig">
+ <record name="Pattern" c:type="FcPattern"/>
+ <record name="CharSet" c:type="FcCharSet"/>
+ </namespace>
+</repository>
Modified: trunk/gir/freetype2.gir
==============================================================================
--- trunk/gir/freetype2.gir (original)
+++ trunk/gir/freetype2.gir Mon Aug 18 20:18:43 2008
@@ -2,7 +2,7 @@
xmlns="http://www.gtk.org/introspection/core/1.0";
xmlns:c="http://www.gtk.org/introspection/c/1.0";>
<namespace name="Freetype">
- <record name="Bitmap" c:type="FC_Bitmap"/>
+ <record name="Bitmap" c:type="FT_Bitmap"/>
<record name="Face" c:type="FT_Face"/>
</namespace>
</repository>
Modified: trunk/gir/pango.gir
==============================================================================
--- trunk/gir/pango.gir (original)
+++ trunk/gir/pango.gir Mon Aug 18 20:18:43 2008
@@ -3,10 +3,10 @@
xmlns:c="http://www.gtk.org/introspection/c/1.0";
xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
<namespace name="Pango">
- <alias name="PangoGlyph" target="guint32"/>
- <alias name="PangoGlyphUnit" target="gint32"/>
- <alias name="PangoLayoutRun" target="GlyphItem"/>
- <record name="PangoCoverage" c:type="PangoCoverage"/>
+ <alias name="Glyph" target="guint32" c:type="PangoGlyph"/>
+ <alias name="GlyphUnit" target="gint32" c:type="PangoGlyphUnit"/>
+ <alias name="LayoutRun" target="GlyphItem" c:type="PangoLayoutRun"/>
+ <record name="Coverage" c:type="PangoCoverage"/>
<enumeration name="CoverageLevel"
c:type="PangoCoverageLevel"
glib:type-name="PangoCoverageLevel"
@@ -30,16 +30,16 @@
</enumeration>
<function name="coverage_new" c:identifier="pango_coverage_new">
<return-value>
- <type name="PangoCoverage" c:type="PangoCoverage*"/>
+ <type name="Coverage" c:type="PangoCoverage*"/>
</return-value>
</function>
<function name="coverage_ref" c:identifier="pango_coverage_ref">
<return-value>
- <type name="PangoCoverage" c:type="PangoCoverage*"/>
+ <type name="Coverage" c:type="PangoCoverage*"/>
</return-value>
<parameters>
<parameter name="coverage">
- <type name="PangoCoverage" c:type="PangoCoverage*"/>
+ <type name="Coverage" c:type="PangoCoverage*"/>
</parameter>
</parameters>
</function>
@@ -49,17 +49,17 @@
</return-value>
<parameters>
<parameter name="coverage">
- <type name="PangoCoverage" c:type="PangoCoverage*"/>
+ <type name="Coverage" c:type="PangoCoverage*"/>
</parameter>
</parameters>
</function>
<function name="coverage_copy" c:identifier="pango_coverage_copy">
<return-value>
- <type name="PangoCoverage" c:type="PangoCoverage*"/>
+ <type name="Coverage" c:type="PangoCoverage*"/>
</return-value>
<parameters>
<parameter name="coverage">
- <type name="PangoCoverage" c:type="PangoCoverage*"/>
+ <type name="Coverage" c:type="PangoCoverage*"/>
</parameter>
</parameters>
</function>
@@ -69,7 +69,7 @@
</return-value>
<parameters>
<parameter name="coverage">
- <type name="PangoCoverage" c:type="PangoCoverage*"/>
+ <type name="Coverage" c:type="PangoCoverage*"/>
</parameter>
<parameter name="index_">
<type name="int32" c:type="int"/>
@@ -82,7 +82,7 @@
</return-value>
<parameters>
<parameter name="coverage">
- <type name="PangoCoverage" c:type="PangoCoverage*"/>
+ <type name="Coverage" c:type="PangoCoverage*"/>
</parameter>
<parameter name="index_">
<type name="int32" c:type="int"/>
@@ -98,10 +98,10 @@
</return-value>
<parameters>
<parameter name="coverage">
- <type name="PangoCoverage" c:type="PangoCoverage*"/>
+ <type name="Coverage" c:type="PangoCoverage*"/>
</parameter>
<parameter name="other">
- <type name="PangoCoverage" c:type="PangoCoverage*"/>
+ <type name="Coverage" c:type="PangoCoverage*"/>
</parameter>
</parameters>
</function>
@@ -111,10 +111,10 @@
</return-value>
<parameters>
<parameter name="coverage">
- <type name="PangoCoverage" c:type="PangoCoverage*"/>
+ <type name="Coverage" c:type="PangoCoverage*"/>
</parameter>
<parameter name="bytes">
- <type name="GLib.guchar" c:type="guchar**"/>
+ <type name="GLib.uchar" c:type="guchar**"/>
</parameter>
<parameter name="n_bytes">
<type name="int" c:type="int*"/>
@@ -124,58 +124,215 @@
<function name="coverage_from_bytes"
c:identifier="pango_coverage_from_bytes">
<return-value>
- <type name="PangoCoverage" c:type="PangoCoverage*"/>
+ <type name="Coverage" c:type="PangoCoverage*"/>
</return-value>
<parameters>
<parameter name="bytes">
- <type name="GLib.guchar" c:type="guchar*"/>
+ <type name="GLib.uchar" c:type="guchar*"/>
</parameter>
<parameter name="n_bytes">
<type name="int32" c:type="int"/>
</parameter>
</parameters>
</function>
- <record name="PangoLogAttr" c:type="PangoLogAttr">
+ <record name="LogAttr" c:type="PangoLogAttr">
<field name="is_line_break">
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</field>
<field name="is_mandatory_break">
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</field>
<field name="is_char_break">
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</field>
<field name="is_white">
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</field>
<field name="is_cursor_position">
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</field>
<field name="is_word_start">
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</field>
<field name="is_word_end">
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</field>
<field name="is_sentence_boundary">
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</field>
<field name="is_sentence_start">
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</field>
<field name="is_sentence_end">
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</field>
<field name="backspace_deletes_character">
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</field>
<field name="is_expandable_space">
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</field>
</record>
- <record name="PangoEngineLang" c:type="PangoEngineLang"/>
- <record name="PangoEngineShape" c:type="PangoEngineShape"/>
- <record name="PangoRectangle" c:type="PangoRectangle">
+ <record name="EngineLang" c:type="PangoEngineLang"/>
+ <record name="EngineShape" c:type="PangoEngineShape"/>
+ <class name="Font"
+ c:type="PangoFont"
+ parent="GObject.Object"
+ glib:type-name="PangoFont"
+ glib:get-type="pango_font_get_type">
+ <constructor name="map_load_font"
+ c:identifier="pango_font_map_load_font">
+ <return-value>
+ <type name="Font" c:type="PangoFont*"/>
+ </return-value>
+ <parameters>
+ <parameter name="fontmap">
+ <type name="FontMap" c:type="PangoFontMap*"/>
+ </parameter>
+ <parameter name="context">
+ <type name="Context" c:type="PangoContext*"/>
+ </parameter>
+ <parameter name="desc">
+ <type name="FontDescription" c:type="PangoFontDescription*"/>
+ </parameter>
+ </parameters>
+ </constructor>
+ <method name="describe" c:identifier="pango_font_describe">
+ <return-value>
+ <type name="FontDescription" c:type="PangoFontDescription*"/>
+ </return-value>
+ <parameters>
+ <parameter name="font">
+ <type name="Font" c:type="PangoFont*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="describe_with_absolute_size"
+ c:identifier="pango_font_describe_with_absolute_size">
+ <return-value>
+ <type name="FontDescription" c:type="PangoFontDescription*"/>
+ </return-value>
+ <parameters>
+ <parameter name="font">
+ <type name="Font" c:type="PangoFont*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="get_coverage" c:identifier="pango_font_get_coverage">
+ <return-value>
+ <type name="Coverage" c:type="PangoCoverage*"/>
+ </return-value>
+ <parameters>
+ <parameter name="font">
+ <type name="Font" c:type="PangoFont*"/>
+ </parameter>
+ <parameter name="language">
+ <type name="Language" c:type="PangoLanguage*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="find_shaper" c:identifier="pango_font_find_shaper">
+ <return-value>
+ <type name="EngineShape" c:type="PangoEngineShape*"/>
+ </return-value>
+ <parameters>
+ <parameter name="font">
+ <type name="Font" c:type="PangoFont*"/>
+ </parameter>
+ <parameter name="language">
+ <type name="Language" c:type="PangoLanguage*"/>
+ </parameter>
+ <parameter name="ch">
+ <type name="uint32" c:type="guint32"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="get_metrics" c:identifier="pango_font_get_metrics">
+ <return-value>
+ <type name="FontMetrics" c:type="PangoFontMetrics*"/>
+ </return-value>
+ <parameters>
+ <parameter name="font">
+ <type name="Font" c:type="PangoFont*"/>
+ </parameter>
+ <parameter name="language">
+ <type name="Language" c:type="PangoLanguage*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="get_glyph_extents"
+ c:identifier="pango_font_get_glyph_extents">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ <parameter name="font">
+ <type name="Font" c:type="PangoFont*"/>
+ </parameter>
+ <parameter name="glyph">
+ <type name="Glyph" c:type="PangoGlyph"/>
+ </parameter>
+ <parameter name="ink_rect">
+ <type name="Rectangle" c:type="PangoRectangle*"/>
+ </parameter>
+ <parameter name="logical_rect">
+ <type name="Rectangle" c:type="PangoRectangle*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="get_font_map" c:identifier="pango_font_get_font_map">
+ <return-value>
+ <type name="FontMap" c:type="PangoFontMap*"/>
+ </return-value>
+ <parameters>
+ <parameter name="font">
+ <type name="Font" c:type="PangoFont*"/>
+ </parameter>
+ </parameters>
+ </method>
+ </class>
+ <class name="FontMap"
+ c:type="PangoFontMap"
+ parent="GObject.Object"
+ glib:type-name="PangoFontMap"
+ glib:get-type="pango_font_map_get_type">
+ <method name="load_fontset" c:identifier="pango_font_map_load_fontset">
+ <return-value>
+ <type name="Fontset" c:type="PangoFontset*"/>
+ </return-value>
+ <parameters>
+ <parameter name="fontmap">
+ <type name="FontMap" c:type="PangoFontMap*"/>
+ </parameter>
+ <parameter name="context">
+ <type name="Context" c:type="PangoContext*"/>
+ </parameter>
+ <parameter name="desc">
+ <type name="FontDescription" c:type="PangoFontDescription*"/>
+ </parameter>
+ <parameter name="language">
+ <type name="Language" c:type="PangoLanguage*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="list_families" c:identifier="pango_font_map_list_families">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ <parameter name="fontmap">
+ <type name="FontMap" c:type="PangoFontMap*"/>
+ </parameter>
+ <parameter name="families">
+ <type name="FontFamily" c:type="PangoFontFamily***"/>
+ </parameter>
+ <parameter name="n_families">
+ <type name="int" c:type="int*"/>
+ </parameter>
+ </parameters>
+ </method>
+ </class>
+ <record name="Rectangle" c:type="PangoRectangle">
<field name="x">
<type name="int32" c:type="int"/>
</field>
@@ -215,10 +372,10 @@
</return-value>
<parameters>
<parameter name="inclusive">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
<parameter name="nearest">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
</parameters>
</function>
@@ -261,7 +418,7 @@
</return-value>
<parameters>
<parameter name="ch">
- <type name="GLib.gunichar" c:type="gunichar"/>
+ <type name="GLib.unichar" c:type="gunichar"/>
</parameter>
</parameters>
</function>
@@ -274,7 +431,7 @@
<type name="string" c:type="gchar*"/>
</parameter>
<parameter name="length">
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</parameter>
</parameters>
</function>
@@ -284,10 +441,10 @@
</return-value>
<parameters>
<parameter name="ch">
- <type name="GLib.gunichar" c:type="gunichar"/>
+ <type name="GLib.unichar" c:type="gunichar"/>
</parameter>
<parameter name="mirrored_ch">
- <type name="GLib.gunichar" c:type="gunichar*"/>
+ <type name="GLib.unichar" c:type="gunichar*"/>
</parameter>
</parameters>
</function>
@@ -459,7 +616,7 @@
<type name="Matrix" c:type="PangoMatrix*"/>
</parameter>
<parameter name="rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
</parameters>
</method>
@@ -473,7 +630,7 @@
<type name="Matrix" c:type="PangoMatrix*"/>
</parameter>
<parameter name="rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
</parameters>
</method>
@@ -549,7 +706,7 @@
</parameters>
</method>
</glib:boxed>
- <record name="PangoScriptIter" c:type="PangoScriptIter"/>
+ <record name="ScriptIter" c:type="PangoScriptIter"/>
<enumeration name="Script"
c:type="PangoScript"
glib:type-name="PangoScript"
@@ -878,13 +1035,13 @@
</return-value>
<parameters>
<parameter name="ch">
- <type name="GLib.gunichar" c:type="gunichar"/>
+ <type name="GLib.unichar" c:type="gunichar"/>
</parameter>
</parameters>
</function>
<function name="script_iter_new" c:identifier="pango_script_iter_new">
<return-value>
- <type name="PangoScriptIter" c:type="PangoScriptIter*"/>
+ <type name="ScriptIter" c:type="PangoScriptIter*"/>
</return-value>
<parameters>
<parameter name="text">
@@ -902,7 +1059,7 @@
</return-value>
<parameters>
<parameter name="iter">
- <type name="PangoScriptIter" c:type="PangoScriptIter*"/>
+ <type name="ScriptIter" c:type="PangoScriptIter*"/>
</parameter>
<parameter name="start">
<type name="char" c:type="char**"/>
@@ -921,7 +1078,7 @@
</return-value>
<parameters>
<parameter name="iter">
- <type name="PangoScriptIter" c:type="PangoScriptIter*"/>
+ <type name="ScriptIter" c:type="PangoScriptIter*"/>
</parameter>
</parameters>
</function>
@@ -931,7 +1088,7 @@
</return-value>
<parameters>
<parameter name="iter">
- <type name="PangoScriptIter" c:type="PangoScriptIter*"/>
+ <type name="ScriptIter" c:type="PangoScriptIter*"/>
</parameter>
</parameters>
</function>
@@ -985,143 +1142,6 @@
</parameter>
</parameters>
</function>
- <enumeration name="Style"
- c:type="PangoStyle"
- glib:type-name="PangoStyle"
- glib:get-type="pango_style_get_type">
- <member name="normal"
- value="0"
- c:identifier="PANGO_STYLE_NORMAL"
- glib:nick="normal"/>
- <member name="oblique"
- value="1"
- c:identifier="PANGO_STYLE_OBLIQUE"
- glib:nick="oblique"/>
- <member name="italic"
- value="2"
- c:identifier="PANGO_STYLE_ITALIC"
- glib:nick="italic"/>
- </enumeration>
- <enumeration name="Variant"
- c:type="PangoVariant"
- glib:type-name="PangoVariant"
- glib:get-type="pango_variant_get_type">
- <member name="normal"
- value="0"
- c:identifier="PANGO_VARIANT_NORMAL"
- glib:nick="normal"/>
- <member name="small-caps"
- value="1"
- c:identifier="PANGO_VARIANT_SMALL_CAPS"
- glib:nick="small-caps"/>
- </enumeration>
- <enumeration name="Weight"
- c:type="PangoWeight"
- glib:type-name="PangoWeight"
- glib:get-type="pango_weight_get_type">
- <member name="ultralight"
- value="200"
- c:identifier="PANGO_WEIGHT_ULTRALIGHT"
- glib:nick="ultralight"/>
- <member name="light"
- value="300"
- c:identifier="PANGO_WEIGHT_LIGHT"
- glib:nick="light"/>
- <member name="normal"
- value="400"
- c:identifier="PANGO_WEIGHT_NORMAL"
- glib:nick="normal"/>
- <member name="semibold"
- value="600"
- c:identifier="PANGO_WEIGHT_SEMIBOLD"
- glib:nick="semibold"/>
- <member name="bold"
- value="700"
- c:identifier="PANGO_WEIGHT_BOLD"
- glib:nick="bold"/>
- <member name="ultrabold"
- value="800"
- c:identifier="PANGO_WEIGHT_ULTRABOLD"
- glib:nick="ultrabold"/>
- <member name="heavy"
- value="900"
- c:identifier="PANGO_WEIGHT_HEAVY"
- glib:nick="heavy"/>
- </enumeration>
- <enumeration name="Stretch"
- c:type="PangoStretch"
- glib:type-name="PangoStretch"
- glib:get-type="pango_stretch_get_type">
- <member name="ultra-condensed"
- value="0"
- c:identifier="PANGO_STRETCH_ULTRA_CONDENSED"
- glib:nick="ultra-condensed"/>
- <member name="extra-condensed"
- value="1"
- c:identifier="PANGO_STRETCH_EXTRA_CONDENSED"
- glib:nick="extra-condensed"/>
- <member name="condensed"
- value="2"
- c:identifier="PANGO_STRETCH_CONDENSED"
- glib:nick="condensed"/>
- <member name="semi-condensed"
- value="3"
- c:identifier="PANGO_STRETCH_SEMI_CONDENSED"
- glib:nick="semi-condensed"/>
- <member name="normal"
- value="4"
- c:identifier="PANGO_STRETCH_NORMAL"
- glib:nick="normal"/>
- <member name="semi-expanded"
- value="5"
- c:identifier="PANGO_STRETCH_SEMI_EXPANDED"
- glib:nick="semi-expanded"/>
- <member name="expanded"
- value="6"
- c:identifier="PANGO_STRETCH_EXPANDED"
- glib:nick="expanded"/>
- <member name="extra-expanded"
- value="7"
- c:identifier="PANGO_STRETCH_EXTRA_EXPANDED"
- glib:nick="extra-expanded"/>
- <member name="ultra-expanded"
- value="8"
- c:identifier="PANGO_STRETCH_ULTRA_EXPANDED"
- glib:nick="ultra-expanded"/>
- </enumeration>
- <bitfield name="FontMask"
- c:type="PangoFontMask"
- glib:type-name="PangoFontMask"
- glib:get-type="pango_font_mask_get_type">
- <member name="family"
- value="1"
- c:identifier="PANGO_FONT_MASK_FAMILY"
- glib:nick="family"/>
- <member name="style"
- value="2"
- c:identifier="PANGO_FONT_MASK_STYLE"
- glib:nick="style"/>
- <member name="variant"
- value="4"
- c:identifier="PANGO_FONT_MASK_VARIANT"
- glib:nick="variant"/>
- <member name="weight"
- value="8"
- c:identifier="PANGO_FONT_MASK_WEIGHT"
- glib:nick="weight"/>
- <member name="stretch"
- value="16"
- c:identifier="PANGO_FONT_MASK_STRETCH"
- glib:nick="stretch"/>
- <member name="size"
- value="32"
- c:identifier="PANGO_FONT_MASK_SIZE"
- glib:nick="size"/>
- <member name="gravity"
- value="64"
- c:identifier="PANGO_FONT_MASK_GRAVITY"
- glib:nick="gravity"/>
- </bitfield>
<glib:boxed c:type="FontDescription"
glib:name="FontDescription"
glib:type-name="PangoFontDescription"
@@ -1165,7 +1185,7 @@
</constructor>
<method name="hash" c:identifier="pango_font_description_hash">
<return-value>
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</return-value>
<parameters>
<parameter name="desc">
@@ -1342,13 +1362,13 @@
<type name="FontDescription" c:type="PangoFontDescription*"/>
</parameter>
<parameter name="size">
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</parameter>
</parameters>
</method>
<method name="get_size" c:identifier="pango_font_description_get_size">
<return-value>
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</return-value>
<parameters>
<parameter name="desc">
@@ -1503,20 +1523,6 @@
</parameters>
</method>
</glib:boxed>
- <function name="font_descriptions_free"
- c:identifier="pango_font_descriptions_free">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="descs">
- <type name="FontDescription" c:type="PangoFontDescription**"/>
- </parameter>
- <parameter name="n_descs">
- <type name="int32" c:type="int"/>
- </parameter>
- </parameters>
- </function>
<glib:boxed c:type="FontMetrics"
glib:name="FontMetrics"
glib:type-name="PangoFontMetrics"
@@ -1628,6 +1634,157 @@
</parameters>
</method>
</glib:boxed>
+ <enumeration name="Style"
+ c:type="PangoStyle"
+ glib:type-name="PangoStyle"
+ glib:get-type="pango_style_get_type">
+ <member name="normal"
+ value="0"
+ c:identifier="PANGO_STYLE_NORMAL"
+ glib:nick="normal"/>
+ <member name="oblique"
+ value="1"
+ c:identifier="PANGO_STYLE_OBLIQUE"
+ glib:nick="oblique"/>
+ <member name="italic"
+ value="2"
+ c:identifier="PANGO_STYLE_ITALIC"
+ glib:nick="italic"/>
+ </enumeration>
+ <enumeration name="Variant"
+ c:type="PangoVariant"
+ glib:type-name="PangoVariant"
+ glib:get-type="pango_variant_get_type">
+ <member name="normal"
+ value="0"
+ c:identifier="PANGO_VARIANT_NORMAL"
+ glib:nick="normal"/>
+ <member name="small-caps"
+ value="1"
+ c:identifier="PANGO_VARIANT_SMALL_CAPS"
+ glib:nick="small-caps"/>
+ </enumeration>
+ <enumeration name="Weight"
+ c:type="PangoWeight"
+ glib:type-name="PangoWeight"
+ glib:get-type="pango_weight_get_type">
+ <member name="ultralight"
+ value="200"
+ c:identifier="PANGO_WEIGHT_ULTRALIGHT"
+ glib:nick="ultralight"/>
+ <member name="light"
+ value="300"
+ c:identifier="PANGO_WEIGHT_LIGHT"
+ glib:nick="light"/>
+ <member name="normal"
+ value="400"
+ c:identifier="PANGO_WEIGHT_NORMAL"
+ glib:nick="normal"/>
+ <member name="semibold"
+ value="600"
+ c:identifier="PANGO_WEIGHT_SEMIBOLD"
+ glib:nick="semibold"/>
+ <member name="bold"
+ value="700"
+ c:identifier="PANGO_WEIGHT_BOLD"
+ glib:nick="bold"/>
+ <member name="ultrabold"
+ value="800"
+ c:identifier="PANGO_WEIGHT_ULTRABOLD"
+ glib:nick="ultrabold"/>
+ <member name="heavy"
+ value="900"
+ c:identifier="PANGO_WEIGHT_HEAVY"
+ glib:nick="heavy"/>
+ </enumeration>
+ <enumeration name="Stretch"
+ c:type="PangoStretch"
+ glib:type-name="PangoStretch"
+ glib:get-type="pango_stretch_get_type">
+ <member name="ultra-condensed"
+ value="0"
+ c:identifier="PANGO_STRETCH_ULTRA_CONDENSED"
+ glib:nick="ultra-condensed"/>
+ <member name="extra-condensed"
+ value="1"
+ c:identifier="PANGO_STRETCH_EXTRA_CONDENSED"
+ glib:nick="extra-condensed"/>
+ <member name="condensed"
+ value="2"
+ c:identifier="PANGO_STRETCH_CONDENSED"
+ glib:nick="condensed"/>
+ <member name="semi-condensed"
+ value="3"
+ c:identifier="PANGO_STRETCH_SEMI_CONDENSED"
+ glib:nick="semi-condensed"/>
+ <member name="normal"
+ value="4"
+ c:identifier="PANGO_STRETCH_NORMAL"
+ glib:nick="normal"/>
+ <member name="semi-expanded"
+ value="5"
+ c:identifier="PANGO_STRETCH_SEMI_EXPANDED"
+ glib:nick="semi-expanded"/>
+ <member name="expanded"
+ value="6"
+ c:identifier="PANGO_STRETCH_EXPANDED"
+ glib:nick="expanded"/>
+ <member name="extra-expanded"
+ value="7"
+ c:identifier="PANGO_STRETCH_EXTRA_EXPANDED"
+ glib:nick="extra-expanded"/>
+ <member name="ultra-expanded"
+ value="8"
+ c:identifier="PANGO_STRETCH_ULTRA_EXPANDED"
+ glib:nick="ultra-expanded"/>
+ </enumeration>
+ <bitfield name="FontMask"
+ c:type="PangoFontMask"
+ glib:type-name="PangoFontMask"
+ glib:get-type="pango_font_mask_get_type">
+ <member name="family"
+ value="1"
+ c:identifier="PANGO_FONT_MASK_FAMILY"
+ glib:nick="family"/>
+ <member name="style"
+ value="2"
+ c:identifier="PANGO_FONT_MASK_STYLE"
+ glib:nick="style"/>
+ <member name="variant"
+ value="4"
+ c:identifier="PANGO_FONT_MASK_VARIANT"
+ glib:nick="variant"/>
+ <member name="weight"
+ value="8"
+ c:identifier="PANGO_FONT_MASK_WEIGHT"
+ glib:nick="weight"/>
+ <member name="stretch"
+ value="16"
+ c:identifier="PANGO_FONT_MASK_STRETCH"
+ glib:nick="stretch"/>
+ <member name="size"
+ value="32"
+ c:identifier="PANGO_FONT_MASK_SIZE"
+ glib:nick="size"/>
+ <member name="gravity"
+ value="64"
+ c:identifier="PANGO_FONT_MASK_GRAVITY"
+ glib:nick="gravity"/>
+ </bitfield>
+ <function name="font_descriptions_free"
+ c:identifier="pango_font_descriptions_free">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ <parameter name="descs">
+ <type name="FontDescription" c:type="PangoFontDescription**"/>
+ </parameter>
+ <parameter name="n_descs">
+ <type name="int32" c:type="int"/>
+ </parameter>
+ </parameters>
+ </function>
<class name="FontFamily"
c:type="PangoFontFamily"
parent="GObject.Object"
@@ -1725,122 +1882,6 @@
</parameters>
</method>
</class>
- <class name="Font"
- c:type="PangoFont"
- parent="GObject.Object"
- glib:type-name="PangoFont"
- glib:get-type="pango_font_get_type">
- <constructor name="map_load_font"
- c:identifier="pango_font_map_load_font">
- <return-value>
- <type name="Font" c:type="PangoFont*"/>
- </return-value>
- <parameters>
- <parameter name="fontmap">
- <type name="FontMap" c:type="PangoFontMap*"/>
- </parameter>
- <parameter name="context">
- <type name="Context" c:type="PangoContext*"/>
- </parameter>
- <parameter name="desc">
- <type name="FontDescription" c:type="PangoFontDescription*"/>
- </parameter>
- </parameters>
- </constructor>
- <method name="describe" c:identifier="pango_font_describe">
- <return-value>
- <type name="FontDescription" c:type="PangoFontDescription*"/>
- </return-value>
- <parameters>
- <parameter name="font">
- <type name="Font" c:type="PangoFont*"/>
- </parameter>
- </parameters>
- </method>
- <method name="describe_with_absolute_size"
- c:identifier="pango_font_describe_with_absolute_size">
- <return-value>
- <type name="FontDescription" c:type="PangoFontDescription*"/>
- </return-value>
- <parameters>
- <parameter name="font">
- <type name="Font" c:type="PangoFont*"/>
- </parameter>
- </parameters>
- </method>
- <method name="get_coverage" c:identifier="pango_font_get_coverage">
- <return-value>
- <type name="PangoCoverage" c:type="PangoCoverage*"/>
- </return-value>
- <parameters>
- <parameter name="font">
- <type name="Font" c:type="PangoFont*"/>
- </parameter>
- <parameter name="language">
- <type name="Language" c:type="PangoLanguage*"/>
- </parameter>
- </parameters>
- </method>
- <method name="find_shaper" c:identifier="pango_font_find_shaper">
- <return-value>
- <type name="PangoEngineShape" c:type="PangoEngineShape*"/>
- </return-value>
- <parameters>
- <parameter name="font">
- <type name="Font" c:type="PangoFont*"/>
- </parameter>
- <parameter name="language">
- <type name="Language" c:type="PangoLanguage*"/>
- </parameter>
- <parameter name="ch">
- <type name="uint32" c:type="guint32"/>
- </parameter>
- </parameters>
- </method>
- <method name="get_metrics" c:identifier="pango_font_get_metrics">
- <return-value>
- <type name="FontMetrics" c:type="PangoFontMetrics*"/>
- </return-value>
- <parameters>
- <parameter name="font">
- <type name="Font" c:type="PangoFont*"/>
- </parameter>
- <parameter name="language">
- <type name="Language" c:type="PangoLanguage*"/>
- </parameter>
- </parameters>
- </method>
- <method name="get_glyph_extents"
- c:identifier="pango_font_get_glyph_extents">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="font">
- <type name="Font" c:type="PangoFont*"/>
- </parameter>
- <parameter name="glyph">
- <type name="PangoGlyph" c:type="PangoGlyph"/>
- </parameter>
- <parameter name="ink_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
- </parameter>
- <parameter name="logical_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
- </parameter>
- </parameters>
- </method>
- <method name="get_font_map" c:identifier="pango_font_get_font_map">
- <return-value>
- <type name="FontMap" c:type="PangoFontMap*"/>
- </return-value>
- <parameters>
- <parameter name="font">
- <type name="Font" c:type="PangoFont*"/>
- </parameter>
- </parameters>
- </method>
- </class>
<glib:boxed c:type="Color"
glib:name="Color"
glib:type-name="PangoColor"
@@ -1889,135 +1930,260 @@
</parameters>
</method>
</glib:boxed>
- <record name="PangoAttribute" c:type="PangoAttribute">
+ <record name="Attribute" c:type="PangoAttribute">
<field name="klass">
- <type name="PangoAttrClass" c:type="PangoAttrClass*"/>
+ <type name="AttrClass" c:type="PangoAttrClass*"/>
</field>
<field name="start_index">
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</field>
<field name="end_index">
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</field>
</record>
- <record name="PangoAttrClass" c:type="PangoAttrClass">
+ <record name="AttrClass" c:type="PangoAttrClass">
<field name="type">
<type name="AttrType" c:type="PangoAttrType"/>
</field>
- <callback name="copy">
+ <callback name="copy" c:type="copy">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="attr">
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</parameter>
</parameters>
</callback>
- <callback name="destroy">
+ <callback name="destroy" c:type="destroy">
<return-value>
<type name="none" c:type="void"/>
</return-value>
<parameters>
<parameter name="attr">
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</parameter>
</parameters>
</callback>
- <callback name="equal">
+ <callback name="equal" c:type="equal">
<return-value>
<type name="boolean" c:type="gboolean"/>
</return-value>
<parameters>
<parameter name="attr1">
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</parameter>
<parameter name="attr2">
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</parameter>
</parameters>
</callback>
</record>
- <record name="PangoAttrString" c:type="PangoAttrString">
+ <record name="AttrString" c:type="PangoAttrString">
<field name="attr">
- <type name="PangoAttribute" c:type="PangoAttribute"/>
+ <type name="Attribute" c:type="PangoAttribute"/>
</field>
<field name="value">
<type name="string" c:type="char*"/>
</field>
</record>
- <record name="PangoAttrLanguage" c:type="PangoAttrLanguage">
+ <record name="AttrLanguage" c:type="PangoAttrLanguage">
<field name="attr">
- <type name="PangoAttribute" c:type="PangoAttribute"/>
+ <type name="Attribute" c:type="PangoAttribute"/>
</field>
<field name="value">
<type name="Language" c:type="PangoLanguage*"/>
</field>
</record>
- <record name="PangoAttrInt" c:type="PangoAttrInt">
+ <record name="AttrInt" c:type="PangoAttrInt">
<field name="attr">
- <type name="PangoAttribute" c:type="PangoAttribute"/>
+ <type name="Attribute" c:type="PangoAttribute"/>
</field>
<field name="value">
<type name="int32" c:type="int"/>
</field>
</record>
- <record name="PangoAttrSize" c:type="PangoAttrSize">
+ <record name="AttrSize" c:type="PangoAttrSize">
<field name="attr">
- <type name="PangoAttribute" c:type="PangoAttribute"/>
+ <type name="Attribute" c:type="PangoAttribute"/>
</field>
<field name="size">
<type name="int32" c:type="int"/>
</field>
<field name="absolute">
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</field>
</record>
- <record name="PangoAttrFloat" c:type="PangoAttrFloat">
+ <record name="AttrFloat" c:type="PangoAttrFloat">
<field name="attr">
- <type name="PangoAttribute" c:type="PangoAttribute"/>
+ <type name="Attribute" c:type="PangoAttribute"/>
</field>
<field name="value">
<type name="double" c:type="double"/>
</field>
</record>
- <record name="PangoAttrColor" c:type="PangoAttrColor">
+ <record name="AttrColor" c:type="PangoAttrColor">
<field name="attr">
- <type name="PangoAttribute" c:type="PangoAttribute"/>
+ <type name="Attribute" c:type="PangoAttribute"/>
</field>
<field name="color">
<type name="Color" c:type="PangoColor"/>
</field>
</record>
- <record name="PangoAttrFontDesc" c:type="PangoAttrFontDesc">
+ <record name="AttrFontDesc" c:type="PangoAttrFontDesc">
<field name="attr">
- <type name="PangoAttribute" c:type="PangoAttribute"/>
+ <type name="Attribute" c:type="PangoAttribute"/>
</field>
<field name="desc">
<type name="FontDescription" c:type="PangoFontDescription*"/>
</field>
</record>
- <record name="PangoAttrShape" c:type="PangoAttrShape">
+ <record name="AttrShape" c:type="PangoAttrShape">
<field name="attr">
- <type name="PangoAttribute" c:type="PangoAttribute"/>
+ <type name="Attribute" c:type="PangoAttribute"/>
</field>
<field name="ink_rect">
- <type name="PangoRectangle" c:type="PangoRectangle"/>
+ <type name="Rectangle" c:type="PangoRectangle"/>
</field>
<field name="logical_rect">
- <type name="PangoRectangle" c:type="PangoRectangle"/>
+ <type name="Rectangle" c:type="PangoRectangle"/>
</field>
<field name="data">
<type name="any" c:type="gpointer"/>
</field>
<field name="copy_func">
- <type name="PangoAttrDataCopyFunc" c:type="PangoAttrDataCopyFunc"/>
+ <type name="AttrDataCopyFunc" c:type="PangoAttrDataCopyFunc"/>
</field>
<field name="destroy_func">
- <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+ <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
</field>
</record>
- <record name="PangoAttrIterator" c:type="PangoAttrIterator"/>
+ <glib:boxed c:type="AttrList"
+ glib:name="AttrList"
+ glib:type-name="PangoAttrList"
+ glib:get-type="pango_attr_list_get_type">
+ <constructor name="new" c:identifier="pango_attr_list_new">
+ <return-value>
+ <type name="AttrList" c:type="PangoAttrList*"/>
+ </return-value>
+ </constructor>
+ <constructor name="ref" c:identifier="pango_attr_list_ref">
+ <return-value>
+ <type name="AttrList" c:type="PangoAttrList*"/>
+ </return-value>
+ <parameters>
+ <parameter name="list">
+ <type name="AttrList" c:type="PangoAttrList*"/>
+ </parameter>
+ </parameters>
+ </constructor>
+ <constructor name="copy" c:identifier="pango_attr_list_copy">
+ <return-value>
+ <type name="AttrList" c:type="PangoAttrList*"/>
+ </return-value>
+ <parameters>
+ <parameter name="list">
+ <type name="AttrList" c:type="PangoAttrList*"/>
+ </parameter>
+ </parameters>
+ </constructor>
+ <constructor name="filter" c:identifier="pango_attr_list_filter">
+ <return-value>
+ <type name="AttrList" c:type="PangoAttrList*"/>
+ </return-value>
+ <parameters>
+ <parameter name="list">
+ <type name="AttrList" c:type="PangoAttrList*"/>
+ </parameter>
+ <parameter name="func">
+ <type name="AttrFilterFunc" c:type="PangoAttrFilterFunc"/>
+ </parameter>
+ <parameter name="data">
+ <type name="any" c:type="gpointer"/>
+ </parameter>
+ </parameters>
+ </constructor>
+ <method name="unref" c:identifier="pango_attr_list_unref">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ <parameter name="list">
+ <type name="AttrList" c:type="PangoAttrList*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="insert" c:identifier="pango_attr_list_insert">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ <parameter name="list">
+ <type name="AttrList" c:type="PangoAttrList*"/>
+ </parameter>
+ <parameter name="attr">
+ <type name="Attribute" c:type="PangoAttribute*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="insert_before"
+ c:identifier="pango_attr_list_insert_before">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ <parameter name="list">
+ <type name="AttrList" c:type="PangoAttrList*"/>
+ </parameter>
+ <parameter name="attr">
+ <type name="Attribute" c:type="PangoAttribute*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="change" c:identifier="pango_attr_list_change">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ <parameter name="list">
+ <type name="AttrList" c:type="PangoAttrList*"/>
+ </parameter>
+ <parameter name="attr">
+ <type name="Attribute" c:type="PangoAttribute*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="splice" c:identifier="pango_attr_list_splice">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ <parameter name="list">
+ <type name="AttrList" c:type="PangoAttrList*"/>
+ </parameter>
+ <parameter name="other">
+ <type name="AttrList" c:type="PangoAttrList*"/>
+ </parameter>
+ <parameter name="pos">
+ <type name="int" c:type="gint"/>
+ </parameter>
+ <parameter name="len">
+ <type name="int" c:type="gint"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="get_iterator" c:identifier="pango_attr_list_get_iterator">
+ <return-value>
+ <type name="AttrIterator" c:type="PangoAttrIterator*"/>
+ </return-value>
+ <parameters>
+ <parameter name="list">
+ <type name="AttrList" c:type="PangoAttrList*"/>
+ </parameter>
+ </parameters>
+ </method>
+ </glib:boxed>
+ <record name="AttrIterator" c:type="PangoAttrIterator"/>
<enumeration name="AttrType"
c:type="PangoAttrType"
glib:type-name="PangoAttrType"
@@ -2140,20 +2306,20 @@
c:identifier="PANGO_UNDERLINE_ERROR"
glib:nick="error"/>
</enumeration>
- <callback name="PangoAttrFilterFunc">
+ <callback name="AttrFilterFunc" c:type="PangoAttrFilterFunc">
<return-value>
<type name="boolean" c:type="gboolean"/>
</return-value>
<parameters>
<parameter name="attribute">
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</parameter>
<parameter name="data">
<type name="any" c:type="gpointer"/>
</parameter>
</parameters>
</callback>
- <callback name="PangoAttrDataCopyFunc">
+ <callback name="AttrDataCopyFunc" c:type="PangoAttrDataCopyFunc">
<return-value>
<type name="any" c:type="gpointer"/>
</return-value>
@@ -2180,20 +2346,20 @@
</return-value>
<parameters>
<parameter name="attr">
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</parameter>
<parameter name="klass">
- <type name="PangoAttrClass" c:type="PangoAttrClass*"/>
+ <type name="AttrClass" c:type="PangoAttrClass*"/>
</parameter>
</parameters>
</function>
<function name="attribute_copy" c:identifier="pango_attribute_copy">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="attr">
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</parameter>
</parameters>
</function>
@@ -2203,7 +2369,7 @@
</return-value>
<parameters>
<parameter name="attr">
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</parameter>
</parameters>
</function>
@@ -2213,16 +2379,16 @@
</return-value>
<parameters>
<parameter name="attr1">
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</parameter>
<parameter name="attr2">
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</parameter>
</parameters>
</function>
<function name="attr_language_new" c:identifier="pango_attr_language_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="language">
@@ -2232,7 +2398,7 @@
</function>
<function name="attr_family_new" c:identifier="pango_attr_family_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="family">
@@ -2243,7 +2409,7 @@
<function name="attr_foreground_new"
c:identifier="pango_attr_foreground_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="red">
@@ -2260,7 +2426,7 @@
<function name="attr_background_new"
c:identifier="pango_attr_background_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="red">
@@ -2276,7 +2442,7 @@
</function>
<function name="attr_size_new" c:identifier="pango_attr_size_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="size">
@@ -2287,7 +2453,7 @@
<function name="attr_size_new_absolute"
c:identifier="pango_attr_size_new_absolute">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="size">
@@ -2297,7 +2463,7 @@
</function>
<function name="attr_style_new" c:identifier="pango_attr_style_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="style">
@@ -2307,7 +2473,7 @@
</function>
<function name="attr_weight_new" c:identifier="pango_attr_weight_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="weight">
@@ -2317,7 +2483,7 @@
</function>
<function name="attr_variant_new" c:identifier="pango_attr_variant_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="variant">
@@ -2327,7 +2493,7 @@
</function>
<function name="attr_stretch_new" c:identifier="pango_attr_stretch_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="stretch">
@@ -2338,7 +2504,7 @@
<function name="attr_font_desc_new"
c:identifier="pango_attr_font_desc_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="desc">
@@ -2349,7 +2515,7 @@
<function name="attr_underline_new"
c:identifier="pango_attr_underline_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="underline">
@@ -2360,7 +2526,7 @@
<function name="attr_underline_color_new"
c:identifier="pango_attr_underline_color_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="red">
@@ -2377,7 +2543,7 @@
<function name="attr_strikethrough_new"
c:identifier="pango_attr_strikethrough_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="strikethrough">
@@ -2388,7 +2554,7 @@
<function name="attr_strikethrough_color_new"
c:identifier="pango_attr_strikethrough_color_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="red">
@@ -2404,7 +2570,7 @@
</function>
<function name="attr_rise_new" c:identifier="pango_attr_rise_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="rise">
@@ -2414,7 +2580,7 @@
</function>
<function name="attr_scale_new" c:identifier="pango_attr_scale_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="scale_factor">
@@ -2424,7 +2590,7 @@
</function>
<function name="attr_fallback_new" c:identifier="pango_attr_fallback_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="enable_fallback">
@@ -2435,7 +2601,7 @@
<function name="attr_letter_spacing_new"
c:identifier="pango_attr_letter_spacing_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="letter_spacing">
@@ -2445,43 +2611,43 @@
</function>
<function name="attr_shape_new" c:identifier="pango_attr_shape_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="ink_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
<parameter name="logical_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
</parameters>
</function>
<function name="attr_shape_new_with_data"
c:identifier="pango_attr_shape_new_with_data">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="ink_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
<parameter name="logical_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
<parameter name="data">
<type name="any" c:type="gpointer"/>
</parameter>
<parameter name="copy_func">
- <type name="PangoAttrDataCopyFunc" c:type="PangoAttrDataCopyFunc"/>
+ <type name="AttrDataCopyFunc" c:type="PangoAttrDataCopyFunc"/>
</parameter>
<parameter name="destroy_func">
- <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+ <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
</parameter>
</parameters>
</function>
<function name="attr_gravity_new" c:identifier="pango_attr_gravity_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="gravity">
@@ -2492,7 +2658,7 @@
<function name="attr_gravity_hint_new"
c:identifier="pango_attr_gravity_hint_new">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="hint">
@@ -2500,131 +2666,6 @@
</parameter>
</parameters>
</function>
- <glib:boxed c:type="AttrList"
- glib:name="AttrList"
- glib:type-name="PangoAttrList"
- glib:get-type="pango_attr_list_get_type">
- <constructor name="new" c:identifier="pango_attr_list_new">
- <return-value>
- <type name="AttrList" c:type="PangoAttrList*"/>
- </return-value>
- </constructor>
- <constructor name="ref" c:identifier="pango_attr_list_ref">
- <return-value>
- <type name="AttrList" c:type="PangoAttrList*"/>
- </return-value>
- <parameters>
- <parameter name="list">
- <type name="AttrList" c:type="PangoAttrList*"/>
- </parameter>
- </parameters>
- </constructor>
- <constructor name="copy" c:identifier="pango_attr_list_copy">
- <return-value>
- <type name="AttrList" c:type="PangoAttrList*"/>
- </return-value>
- <parameters>
- <parameter name="list">
- <type name="AttrList" c:type="PangoAttrList*"/>
- </parameter>
- </parameters>
- </constructor>
- <constructor name="filter" c:identifier="pango_attr_list_filter">
- <return-value>
- <type name="AttrList" c:type="PangoAttrList*"/>
- </return-value>
- <parameters>
- <parameter name="list">
- <type name="AttrList" c:type="PangoAttrList*"/>
- </parameter>
- <parameter name="func">
- <type name="PangoAttrFilterFunc" c:type="PangoAttrFilterFunc"/>
- </parameter>
- <parameter name="data">
- <type name="any" c:type="gpointer"/>
- </parameter>
- </parameters>
- </constructor>
- <method name="unref" c:identifier="pango_attr_list_unref">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="list">
- <type name="AttrList" c:type="PangoAttrList*"/>
- </parameter>
- </parameters>
- </method>
- <method name="insert" c:identifier="pango_attr_list_insert">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="list">
- <type name="AttrList" c:type="PangoAttrList*"/>
- </parameter>
- <parameter name="attr">
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
- </parameter>
- </parameters>
- </method>
- <method name="insert_before"
- c:identifier="pango_attr_list_insert_before">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="list">
- <type name="AttrList" c:type="PangoAttrList*"/>
- </parameter>
- <parameter name="attr">
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
- </parameter>
- </parameters>
- </method>
- <method name="change" c:identifier="pango_attr_list_change">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="list">
- <type name="AttrList" c:type="PangoAttrList*"/>
- </parameter>
- <parameter name="attr">
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
- </parameter>
- </parameters>
- </method>
- <method name="splice" c:identifier="pango_attr_list_splice">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="list">
- <type name="AttrList" c:type="PangoAttrList*"/>
- </parameter>
- <parameter name="other">
- <type name="AttrList" c:type="PangoAttrList*"/>
- </parameter>
- <parameter name="pos">
- <type name="int32" c:type="gint"/>
- </parameter>
- <parameter name="len">
- <type name="int32" c:type="gint"/>
- </parameter>
- </parameters>
- </method>
- <method name="get_iterator" c:identifier="pango_attr_list_get_iterator">
- <return-value>
- <type name="PangoAttrIterator" c:type="PangoAttrIterator*"/>
- </return-value>
- <parameters>
- <parameter name="list">
- <type name="AttrList" c:type="PangoAttrList*"/>
- </parameter>
- </parameters>
- </method>
- </glib:boxed>
<function name="attr_iterator_range"
c:identifier="pango_attr_iterator_range">
<return-value>
@@ -2632,13 +2673,13 @@
</return-value>
<parameters>
<parameter name="iterator">
- <type name="PangoAttrIterator" c:type="PangoAttrIterator*"/>
+ <type name="AttrIterator" c:type="PangoAttrIterator*"/>
</parameter>
<parameter name="start">
- <type name="GLib.gint" c:type="gint*"/>
+ <type name="GLib.int" c:type="gint*"/>
</parameter>
<parameter name="end">
- <type name="GLib.gint" c:type="gint*"/>
+ <type name="GLib.int" c:type="gint*"/>
</parameter>
</parameters>
</function>
@@ -2649,18 +2690,18 @@
</return-value>
<parameters>
<parameter name="iterator">
- <type name="PangoAttrIterator" c:type="PangoAttrIterator*"/>
+ <type name="AttrIterator" c:type="PangoAttrIterator*"/>
</parameter>
</parameters>
</function>
<function name="attr_iterator_copy"
c:identifier="pango_attr_iterator_copy">
<return-value>
- <type name="PangoAttrIterator" c:type="PangoAttrIterator*"/>
+ <type name="AttrIterator" c:type="PangoAttrIterator*"/>
</return-value>
<parameters>
<parameter name="iterator">
- <type name="PangoAttrIterator" c:type="PangoAttrIterator*"/>
+ <type name="AttrIterator" c:type="PangoAttrIterator*"/>
</parameter>
</parameters>
</function>
@@ -2671,17 +2712,17 @@
</return-value>
<parameters>
<parameter name="iterator">
- <type name="PangoAttrIterator" c:type="PangoAttrIterator*"/>
+ <type name="AttrIterator" c:type="PangoAttrIterator*"/>
</parameter>
</parameters>
</function>
<function name="attr_iterator_get" c:identifier="pango_attr_iterator_get">
<return-value>
- <type name="PangoAttribute" c:type="PangoAttribute*"/>
+ <type name="Attribute" c:type="PangoAttribute*"/>
</return-value>
<parameters>
<parameter name="iterator">
- <type name="PangoAttrIterator" c:type="PangoAttrIterator*"/>
+ <type name="AttrIterator" c:type="PangoAttrIterator*"/>
</parameter>
<parameter name="type">
<type name="AttrType" c:type="PangoAttrType"/>
@@ -2695,7 +2736,7 @@
</return-value>
<parameters>
<parameter name="iterator">
- <type name="PangoAttrIterator" c:type="PangoAttrIterator*"/>
+ <type name="AttrIterator" c:type="PangoAttrIterator*"/>
</parameter>
<parameter name="desc">
<type name="FontDescription" c:type="PangoFontDescription*"/>
@@ -2704,18 +2745,18 @@
<type name="Language" c:type="PangoLanguage**"/>
</parameter>
<parameter name="extra_attrs">
- <type name="GLib.GSList" c:type="GSList**"/>
+ <type name="GLib.SList" c:type="GSList**"/>
</parameter>
</parameters>
</function>
<function name="attr_iterator_get_attrs"
c:identifier="pango_attr_iterator_get_attrs">
<return-value>
- <type name="GLib.GSList" c:type="GSList*"/>
+ <type name="GLib.SList" c:type="GSList*"/>
</return-value>
<parameters>
<parameter name="iterator">
- <type name="PangoAttrIterator" c:type="PangoAttrIterator*"/>
+ <type name="AttrIterator" c:type="PangoAttrIterator*"/>
</parameter>
</parameters>
</function>
@@ -2731,7 +2772,7 @@
<type name="int32" c:type="int"/>
</parameter>
<parameter name="accel_marker">
- <type name="GLib.gunichar" c:type="gunichar"/>
+ <type name="GLib.unichar" c:type="gunichar"/>
</parameter>
<parameter name="attr_list">
<type name="AttrList" c:type="PangoAttrList**"/>
@@ -2740,19 +2781,19 @@
<type name="char" c:type="char**"/>
</parameter>
<parameter name="accel_char">
- <type name="GLib.gunichar" c:type="gunichar*"/>
+ <type name="GLib.unichar" c:type="gunichar*"/>
</parameter>
<parameter name="error">
- <type name="GLib.GError" c:type="GError**"/>
+ <type name="GLib.Error" c:type="GError**"/>
</parameter>
</parameters>
</function>
- <record name="PangoAnalysis" c:type="PangoAnalysis">
+ <record name="Analysis" c:type="PangoAnalysis">
<field name="shape_engine">
- <type name="PangoEngineShape" c:type="PangoEngineShape*"/>
+ <type name="EngineShape" c:type="PangoEngineShape*"/>
</field>
<field name="lang_engine">
- <type name="PangoEngineLang" c:type="PangoEngineLang*"/>
+ <type name="EngineLang" c:type="PangoEngineLang*"/>
</field>
<field name="font">
<type name="Font" c:type="PangoFont*"/>
@@ -2773,7 +2814,7 @@
<type name="Language" c:type="PangoLanguage*"/>
</field>
<field name="extra_attrs">
- <type name="GLib.GSList" c:type="GSList*"/>
+ <type name="GLib.SList" c:type="GSList*"/>
</field>
</record>
<glib:boxed c:type="Item"
@@ -2834,10 +2875,10 @@
<type name="int32" c:type="int"/>
</parameter>
<parameter name="analysis">
- <type name="PangoAnalysis" c:type="PangoAnalysis*"/>
+ <type name="Analysis" c:type="PangoAnalysis*"/>
</parameter>
<parameter name="attrs">
- <type name="PangoLogAttr" c:type="PangoLogAttr*"/>
+ <type name="LogAttr" c:type="PangoLogAttr*"/>
</parameter>
<parameter name="attrs_len">
<type name="int32" c:type="int"/>
@@ -2854,13 +2895,13 @@
<type name="string" c:type="gchar*"/>
</parameter>
<parameter name="length">
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</parameter>
<parameter name="paragraph_delimiter_index">
- <type name="GLib.gint" c:type="gint*"/>
+ <type name="GLib.int" c:type="gint*"/>
</parameter>
<parameter name="next_paragraph_start">
- <type name="GLib.gint" c:type="gint*"/>
+ <type name="GLib.int" c:type="gint*"/>
</parameter>
</parameters>
</function>
@@ -2882,7 +2923,7 @@
<type name="Language" c:type="PangoLanguage*"/>
</parameter>
<parameter name="log_attrs">
- <type name="PangoLogAttr" c:type="PangoLogAttr*"/>
+ <type name="LogAttr" c:type="PangoLogAttr*"/>
</parameter>
<parameter name="attrs_len">
<type name="int32" c:type="int"/>
@@ -2903,7 +2944,7 @@
<type name="Fontset" c:type="PangoFontset*"/>
</parameter>
<parameter name="wc">
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</parameter>
</parameters>
</method>
@@ -2926,8 +2967,7 @@
<type name="Fontset" c:type="PangoFontset*"/>
</parameter>
<parameter name="func">
- <type name="PangoFontsetForeachFunc"
- c:type="PangoFontsetForeachFunc"/>
+ <type name="FontsetForeachFunc" c:type="PangoFontsetForeachFunc"/>
</parameter>
<parameter name="data">
<type name="any" c:type="gpointer"/>
@@ -2935,8 +2975,7 @@
</parameters>
</method>
</class>
- <record name="PangoFontset" c:type="PangoFontset"/>
- <callback name="PangoFontsetForeachFunc">
+ <callback name="FontsetForeachFunc" c:type="PangoFontsetForeachFunc">
<return-value>
<type name="boolean" c:type="gboolean"/>
</return-value>
@@ -2952,47 +2991,6 @@
</parameter>
</parameters>
</callback>
- <class name="FontMap"
- c:type="PangoFontMap"
- parent="GObject.Object"
- glib:type-name="PangoFontMap"
- glib:get-type="pango_font_map_get_type">
- <method name="load_fontset" c:identifier="pango_font_map_load_fontset">
- <return-value>
- <type name="Fontset" c:type="PangoFontset*"/>
- </return-value>
- <parameters>
- <parameter name="fontmap">
- <type name="FontMap" c:type="PangoFontMap*"/>
- </parameter>
- <parameter name="context">
- <type name="Context" c:type="PangoContext*"/>
- </parameter>
- <parameter name="desc">
- <type name="FontDescription" c:type="PangoFontDescription*"/>
- </parameter>
- <parameter name="language">
- <type name="Language" c:type="PangoLanguage*"/>
- </parameter>
- </parameters>
- </method>
- <method name="list_families" c:identifier="pango_font_map_list_families">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="fontmap">
- <type name="FontMap" c:type="PangoFontMap*"/>
- </parameter>
- <parameter name="families">
- <type name="FontFamily" c:type="PangoFontFamily***"/>
- </parameter>
- <parameter name="n_families">
- <type name="int" c:type="int*"/>
- </parameter>
- </parameters>
- </method>
- </class>
<class name="Context"
c:type="PangoContext"
parent="GObject.Object"
@@ -3226,7 +3224,7 @@
</class>
<function name="itemize" c:identifier="pango_itemize">
<return-value>
- <type name="GLib.GList" c:type="GList*"/>
+ <type name="GLib.List" c:type="GList*"/>
</return-value>
<parameters>
<parameter name="context">
@@ -3245,14 +3243,14 @@
<type name="AttrList" c:type="PangoAttrList*"/>
</parameter>
<parameter name="cached_iter">
- <type name="PangoAttrIterator" c:type="PangoAttrIterator*"/>
+ <type name="AttrIterator" c:type="PangoAttrIterator*"/>
</parameter>
</parameters>
</function>
<function name="itemize_with_base_dir"
c:identifier="pango_itemize_with_base_dir">
<return-value>
- <type name="GLib.GList" c:type="GList*"/>
+ <type name="GLib.List" c:type="GList*"/>
</return-value>
<parameters>
<parameter name="context">
@@ -3274,56 +3272,37 @@
<type name="AttrList" c:type="PangoAttrList*"/>
</parameter>
<parameter name="cached_iter">
- <type name="PangoAttrIterator" c:type="PangoAttrIterator*"/>
+ <type name="AttrIterator" c:type="PangoAttrIterator*"/>
</parameter>
</parameters>
</function>
- <record name="PangoGlyphGeometry" c:type="PangoGlyphGeometry">
+ <record name="GlyphGeometry" c:type="PangoGlyphGeometry">
<field name="width">
- <type name="PangoGlyphUnit" c:type="PangoGlyphUnit"/>
+ <type name="GlyphUnit" c:type="PangoGlyphUnit"/>
</field>
<field name="x_offset">
- <type name="PangoGlyphUnit" c:type="PangoGlyphUnit"/>
+ <type name="GlyphUnit" c:type="PangoGlyphUnit"/>
</field>
<field name="y_offset">
- <type name="PangoGlyphUnit" c:type="PangoGlyphUnit"/>
+ <type name="GlyphUnit" c:type="PangoGlyphUnit"/>
</field>
</record>
- <record name="PangoGlyphVisAttr" c:type="PangoGlyphVisAttr">
+ <record name="GlyphVisAttr" c:type="PangoGlyphVisAttr">
<field name="is_cluster_start">
- <type name="uint32" c:type="guint"/>
+ <type name="uint" c:type="guint"/>
</field>
</record>
- <record name="PangoGlyphInfo" c:type="PangoGlyphInfo">
+ <record name="GlyphInfo" c:type="PangoGlyphInfo">
<field name="glyph">
- <type name="PangoGlyph" c:type="PangoGlyph"/>
+ <type name="Glyph" c:type="PangoGlyph"/>
</field>
<field name="geometry">
- <type name="PangoGlyphGeometry" c:type="PangoGlyphGeometry"/>
+ <type name="GlyphGeometry" c:type="PangoGlyphGeometry"/>
</field>
<field name="attr">
- <type name="PangoGlyphVisAttr" c:type="PangoGlyphVisAttr"/>
+ <type name="GlyphVisAttr" c:type="PangoGlyphVisAttr"/>
</field>
</record>
- <function name="glyph_string_new" c:identifier="pango_glyph_string_new">
- <return-value>
- <type name="GlyphString" c:type="PangoGlyphString*"/>
- </return-value>
- </function>
- <function name="glyph_string_set_size"
- c:identifier="pango_glyph_string_set_size">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="string">
- <type name="GlyphString" c:type="PangoGlyphString*"/>
- </parameter>
- <parameter name="new_len">
- <type name="int32" c:type="gint"/>
- </parameter>
- </parameters>
- </function>
<glib:boxed c:type="GlyphString"
glib:name="GlyphString"
glib:type-name="PangoGlyphString"
@@ -3360,10 +3339,10 @@
<type name="Font" c:type="PangoFont*"/>
</parameter>
<parameter name="ink_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
<parameter name="logical_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
</parameters>
</method>
@@ -3396,10 +3375,10 @@
<type name="Font" c:type="PangoFont*"/>
</parameter>
<parameter name="ink_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
<parameter name="logical_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
</parameters>
</method>
@@ -3441,7 +3420,7 @@
<type name="int32" c:type="int"/>
</parameter>
<parameter name="analysis">
- <type name="PangoAnalysis" c:type="PangoAnalysis*"/>
+ <type name="Analysis" c:type="PangoAnalysis*"/>
</parameter>
<parameter name="index_">
<type name="int32" c:type="int"/>
@@ -3469,7 +3448,7 @@
<type name="int32" c:type="int"/>
</parameter>
<parameter name="analysis">
- <type name="PangoAnalysis" c:type="PangoAnalysis*"/>
+ <type name="Analysis" c:type="PangoAnalysis*"/>
</parameter>
<parameter name="x_pos">
<type name="int32" c:type="int"/>
@@ -3483,6 +3462,25 @@
</parameters>
</method>
</glib:boxed>
+ <function name="glyph_string_new" c:identifier="pango_glyph_string_new">
+ <return-value>
+ <type name="GlyphString" c:type="PangoGlyphString*"/>
+ </return-value>
+ </function>
+ <function name="glyph_string_set_size"
+ c:identifier="pango_glyph_string_set_size">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ <parameter name="string">
+ <type name="GlyphString" c:type="PangoGlyphString*"/>
+ </parameter>
+ <parameter name="new_len">
+ <type name="int" c:type="gint"/>
+ </parameter>
+ </parameters>
+ </function>
<function name="shape" c:identifier="pango_shape">
<return-value>
<type name="none" c:type="void"/>
@@ -3492,10 +3490,10 @@
<type name="string" c:type="gchar*"/>
</parameter>
<parameter name="length">
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</parameter>
<parameter name="analysis">
- <type name="PangoAnalysis" c:type="PangoAnalysis*"/>
+ <type name="Analysis" c:type="PangoAnalysis*"/>
</parameter>
<parameter name="glyphs">
<type name="GlyphString" c:type="PangoGlyphString*"/>
@@ -3504,11 +3502,11 @@
</function>
<function name="reorder_items" c:identifier="pango_reorder_items">
<return-value>
- <type name="GLib.GList" c:type="GList*"/>
+ <type name="GLib.List" c:type="GList*"/>
</return-value>
<parameters>
<parameter name="logical_items">
- <type name="GLib.GList" c:type="GList*"/>
+ <type name="GLib.List" c:type="GList*"/>
</parameter>
</parameters>
</function>
@@ -3639,7 +3637,7 @@
</method>
<method name="apply_attrs" c:identifier="pango_glyph_item_apply_attrs">
<return-value>
- <type name="GLib.GSList" c:type="GSList*"/>
+ <type name="GLib.SList" c:type="GSList*"/>
</return-value>
<parameters>
<parameter name="glyph_item">
@@ -3665,7 +3663,7 @@
<type name="string" c:type="char*"/>
</parameter>
<parameter name="log_attrs">
- <type name="PangoLogAttr" c:type="PangoLogAttr*"/>
+ <type name="LogAttr" c:type="PangoLogAttr*"/>
</parameter>
<parameter name="letter_spacing">
<type name="int32" c:type="int"/>
@@ -3673,39 +3671,6 @@
</parameters>
</method>
</glib:boxed>
- <function name="tab_array_new" c:identifier="pango_tab_array_new">
- <return-value>
- <type name="TabArray" c:type="PangoTabArray*"/>
- </return-value>
- <parameters>
- <parameter name="initial_size">
- <type name="int32" c:type="gint"/>
- </parameter>
- <parameter name="positions_in_pixels">
- <type name="boolean" c:type="gboolean"/>
- </parameter>
- </parameters>
- </function>
- <function name="tab_array_new_with_positions"
- c:identifier="pango_tab_array_new_with_positions">
- <return-value>
- <type name="TabArray" c:type="PangoTabArray*"/>
- </return-value>
- <parameters>
- <parameter name="size">
- <type name="int32" c:type="gint"/>
- </parameter>
- <parameter name="positions_in_pixels">
- <type name="boolean" c:type="gboolean"/>
- </parameter>
- <parameter name="first_alignment">
- <type name="TabAlign" c:type="PangoTabAlign"/>
- </parameter>
- <parameter name="first_position">
- <type name="int32" c:type="gint"/>
- </parameter>
- </parameters>
- </function>
<glib:boxed c:type="TabArray"
glib:name="TabArray"
glib:type-name="PangoTabArray"
@@ -3732,7 +3697,7 @@
</method>
<method name="get_size" c:identifier="pango_tab_array_get_size">
<return-value>
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</return-value>
<parameters>
<parameter name="tab_array">
@@ -3749,7 +3714,7 @@
<type name="TabArray" c:type="PangoTabArray*"/>
</parameter>
<parameter name="new_size">
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</parameter>
</parameters>
</method>
@@ -3762,13 +3727,13 @@
<type name="TabArray" c:type="PangoTabArray*"/>
</parameter>
<parameter name="tab_index">
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</parameter>
<parameter name="alignment">
<type name="TabAlign" c:type="PangoTabAlign"/>
</parameter>
<parameter name="location">
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</parameter>
</parameters>
</method>
@@ -3781,13 +3746,13 @@
<type name="TabArray" c:type="PangoTabArray*"/>
</parameter>
<parameter name="tab_index">
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</parameter>
<parameter name="alignment">
<type name="TabAlign" c:type="PangoTabAlign*"/>
</parameter>
<parameter name="location">
- <type name="GLib.gint" c:type="gint*"/>
+ <type name="GLib.int" c:type="gint*"/>
</parameter>
</parameters>
</method>
@@ -3803,7 +3768,7 @@
<type name="TabAlign" c:type="PangoTabAlign**"/>
</parameter>
<parameter name="locations">
- <type name="GLib.gint" c:type="gint**"/>
+ <type name="GLib.int" c:type="gint**"/>
</parameter>
</parameters>
</method>
@@ -3819,6 +3784,39 @@
</parameters>
</method>
</glib:boxed>
+ <function name="tab_array_new" c:identifier="pango_tab_array_new">
+ <return-value>
+ <type name="TabArray" c:type="PangoTabArray*"/>
+ </return-value>
+ <parameters>
+ <parameter name="initial_size">
+ <type name="int" c:type="gint"/>
+ </parameter>
+ <parameter name="positions_in_pixels">
+ <type name="boolean" c:type="gboolean"/>
+ </parameter>
+ </parameters>
+ </function>
+ <function name="tab_array_new_with_positions"
+ c:identifier="pango_tab_array_new_with_positions">
+ <return-value>
+ <type name="TabArray" c:type="PangoTabArray*"/>
+ </return-value>
+ <parameters>
+ <parameter name="size">
+ <type name="int" c:type="gint"/>
+ </parameter>
+ <parameter name="positions_in_pixels">
+ <type name="boolean" c:type="gboolean"/>
+ </parameter>
+ <parameter name="first_alignment">
+ <type name="TabAlign" c:type="PangoTabAlign"/>
+ </parameter>
+ <parameter name="first_position">
+ <type name="int" c:type="gint"/>
+ </parameter>
+ </parameters>
+ </function>
<class name="Layout"
c:type="PangoLayout"
parent="GObject.Object"
@@ -3946,10 +3944,10 @@
<type name="int32" c:type="int"/>
</parameter>
<parameter name="accel_marker">
- <type name="GLib.gunichar" c:type="gunichar"/>
+ <type name="GLib.unichar" c:type="gunichar"/>
</parameter>
<parameter name="accel_char">
- <type name="GLib.gunichar" c:type="gunichar*"/>
+ <type name="GLib.unichar" c:type="gunichar*"/>
</parameter>
</parameters>
</method>
@@ -4284,10 +4282,10 @@
<type name="Layout" c:type="PangoLayout*"/>
</parameter>
<parameter name="attrs">
- <type name="PangoLogAttr" c:type="PangoLogAttr**"/>
+ <type name="LogAttr" c:type="PangoLogAttr**"/>
</parameter>
<parameter name="n_attrs">
- <type name="GLib.gint" c:type="gint*"/>
+ <type name="GLib.int" c:type="gint*"/>
</parameter>
</parameters>
</method>
@@ -4303,7 +4301,7 @@
<type name="int32" c:type="int"/>
</parameter>
<parameter name="pos">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
</parameters>
</method>
@@ -4342,10 +4340,10 @@
<type name="int32" c:type="int"/>
</parameter>
<parameter name="strong_pos">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
<parameter name="weak_pos">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
</parameters>
</method>
@@ -4409,10 +4407,10 @@
<type name="Layout" c:type="PangoLayout*"/>
</parameter>
<parameter name="ink_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
<parameter name="logical_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
</parameters>
</method>
@@ -4426,10 +4424,10 @@
<type name="Layout" c:type="PangoLayout*"/>
</parameter>
<parameter name="ink_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
<parameter name="logical_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
</parameters>
</method>
@@ -4504,7 +4502,7 @@
</method>
<method name="get_lines" c:identifier="pango_layout_get_lines">
<return-value>
- <type name="GLib.GSList" c:type="GSList*"/>
+ <type name="GLib.SList" c:type="GSList*"/>
</return-value>
<parameters>
<parameter name="layout">
@@ -4515,7 +4513,7 @@
<method name="get_lines_readonly"
c:identifier="pango_layout_get_lines_readonly">
<return-value>
- <type name="GLib.GSList" c:type="GSList*"/>
+ <type name="GLib.SList" c:type="GSList*"/>
</return-value>
<parameters>
<parameter name="layout">
@@ -4628,10 +4626,10 @@
<type name="LayoutLine" c:type="PangoLayoutLine*"/>
</parameter>
<parameter name="ink_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
<parameter name="logical_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
</parameters>
</method>
@@ -4645,10 +4643,10 @@
<type name="LayoutLine" c:type="PangoLayoutLine*"/>
</parameter>
<parameter name="ink_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
<parameter name="logical_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
</parameters>
</method>
@@ -4689,7 +4687,7 @@
</method>
<method name="get_run" c:identifier="pango_layout_iter_get_run">
<return-value>
- <type name="PangoLayoutRun" c:type="PangoLayoutRun*"/>
+ <type name="LayoutRun" c:type="PangoLayoutRun*"/>
</return-value>
<parameters>
<parameter name="iter">
@@ -4700,7 +4698,7 @@
<method name="get_run_readonly"
c:identifier="pango_layout_iter_get_run_readonly">
<return-value>
- <type name="PangoLayoutRun" c:type="PangoLayoutRun*"/>
+ <type name="LayoutRun" c:type="PangoLayoutRun*"/>
</return-value>
<parameters>
<parameter name="iter">
@@ -4791,7 +4789,7 @@
<type name="LayoutIter" c:type="PangoLayoutIter*"/>
</parameter>
<parameter name="logical_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
</parameters>
</method>
@@ -4805,10 +4803,10 @@
<type name="LayoutIter" c:type="PangoLayoutIter*"/>
</parameter>
<parameter name="ink_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
<parameter name="logical_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
</parameters>
</method>
@@ -4822,10 +4820,10 @@
<type name="LayoutIter" c:type="PangoLayoutIter*"/>
</parameter>
<parameter name="ink_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
<parameter name="logical_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
</parameters>
</method>
@@ -4839,10 +4837,10 @@
<type name="LayoutIter" c:type="PangoLayoutIter*"/>
</parameter>
<parameter name="ink_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
<parameter name="logical_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
</parameters>
</method>
@@ -4873,10 +4871,10 @@
<type name="LayoutIter" c:type="PangoLayoutIter*"/>
</parameter>
<parameter name="ink_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
<parameter name="logical_rect">
- <type name="PangoRectangle" c:type="PangoRectangle*"/>
+ <type name="Rectangle" c:type="PangoRectangle*"/>
</parameter>
</parameters>
</method>
@@ -4892,7 +4890,6 @@
</parameters>
</method>
</glib:boxed>
- <record name="PangoRendererPrivate" c:type="PangoRendererPrivate"/>
<class name="Renderer"
c:type="PangoRenderer"
parent="GObject.Object"
@@ -5052,7 +5049,7 @@
<type name="Font" c:type="PangoFont*"/>
</parameter>
<parameter name="glyph">
- <type name="PangoGlyph" c:type="PangoGlyph"/>
+ <type name="Glyph" c:type="PangoGlyph"/>
</parameter>
<parameter name="x">
<type name="double" c:type="double"/>
@@ -5168,7 +5165,7 @@
</parameter>
</parameters>
</method>
- <callback name="draw_glyphs">
+ <callback name="draw_glyphs" c:type="draw_glyphs">
<return-value>
<type name="none" c:type="void"/>
</return-value>
@@ -5190,7 +5187,7 @@
</parameter>
</parameters>
</callback>
- <callback name="draw_rectangle">
+ <callback name="draw_rectangle" c:type="draw_rectangle">
<return-value>
<type name="none" c:type="void"/>
</return-value>
@@ -5215,7 +5212,7 @@
</parameter>
</parameters>
</callback>
- <callback name="draw_error_underline">
+ <callback name="draw_error_underline" c:type="draw_error_underline">
<return-value>
<type name="none" c:type="void"/>
</return-value>
@@ -5237,7 +5234,7 @@
</parameter>
</parameters>
</callback>
- <callback name="draw_shape">
+ <callback name="draw_shape" c:type="draw_shape">
<return-value>
<type name="none" c:type="void"/>
</return-value>
@@ -5246,7 +5243,7 @@
<type name="Renderer" c:type="PangoRenderer*"/>
</parameter>
<parameter name="attr">
- <type name="PangoAttrShape" c:type="PangoAttrShape*"/>
+ <type name="AttrShape" c:type="PangoAttrShape*"/>
</parameter>
<parameter name="x">
<type name="int32" c:type="int"/>
@@ -5256,7 +5253,7 @@
</parameter>
</parameters>
</callback>
- <callback name="draw_trapezoid">
+ <callback name="draw_trapezoid" c:type="draw_trapezoid">
<return-value>
<type name="none" c:type="void"/>
</return-value>
@@ -5287,7 +5284,7 @@
</parameter>
</parameters>
</callback>
- <callback name="draw_glyph">
+ <callback name="draw_glyph" c:type="draw_glyph">
<return-value>
<type name="none" c:type="void"/>
</return-value>
@@ -5299,7 +5296,7 @@
<type name="Font" c:type="PangoFont*"/>
</parameter>
<parameter name="glyph">
- <type name="PangoGlyph" c:type="PangoGlyph"/>
+ <type name="Glyph" c:type="PangoGlyph"/>
</parameter>
<parameter name="x">
<type name="double" c:type="double"/>
@@ -5309,7 +5306,7 @@
</parameter>
</parameters>
</callback>
- <callback name="part_changed">
+ <callback name="part_changed" c:type="part_changed">
<return-value>
<type name="none" c:type="void"/>
</return-value>
@@ -5322,7 +5319,7 @@
</parameter>
</parameters>
</callback>
- <callback name="begin">
+ <callback name="begin" c:type="begin">
<return-value>
<type name="none" c:type="void"/>
</return-value>
@@ -5332,7 +5329,7 @@
</parameter>
</parameters>
</callback>
- <callback name="end">
+ <callback name="end" c:type="end">
<return-value>
<type name="none" c:type="void"/>
</return-value>
@@ -5342,7 +5339,7 @@
</parameter>
</parameters>
</callback>
- <callback name="prepare_run">
+ <callback name="prepare_run" c:type="prepare_run">
<return-value>
<type name="none" c:type="void"/>
</return-value>
@@ -5351,31 +5348,32 @@
<type name="Renderer" c:type="PangoRenderer*"/>
</parameter>
<parameter name="run">
- <type name="PangoLayoutRun" c:type="PangoLayoutRun*"/>
+ <type name="LayoutRun" c:type="PangoLayoutRun*"/>
</parameter>
</parameters>
</callback>
- <callback name="_pango_reserved1">
+ <callback name="pango_reserved1" c:type="_pango_reserved1">
<return-value>
<type name="none" c:type="void"/>
</return-value>
</callback>
- <callback name="_pango_reserved2">
+ <callback name="pango_reserved2" c:type="_pango_reserved2">
<return-value>
<type name="none" c:type="void"/>
</return-value>
</callback>
- <callback name="_pango_reserved3">
+ <callback name="pango_reserved3" c:type="_pango_reserved3">
<return-value>
<type name="none" c:type="void"/>
</return-value>
</callback>
- <callback name="_pango_reserved4">
+ <callback name="pango_reserved4" c:type="_pango_reserved4">
<return-value>
<type name="none" c:type="void"/>
</return-value>
</callback>
</class>
+ <record name="RendererPrivate" c:type="PangoRendererPrivate"/>
<function name="split_file_list" c:identifier="pango_split_file_list">
<return-value>
<type name="char" c:type="char**"/>
@@ -5415,7 +5413,7 @@
<type name="char" c:type="char**"/>
</parameter>
<parameter name="out">
- <type name="GLib.GString" c:type="GString*"/>
+ <type name="GLib.String" c:type="GString*"/>
</parameter>
</parameters>
</function>
@@ -5428,7 +5426,7 @@
<type name="char" c:type="char**"/>
</parameter>
<parameter name="out">
- <type name="GLib.GString" c:type="GString*"/>
+ <type name="GLib.String" c:type="GString*"/>
</parameter>
</parameters>
</function>
@@ -5451,7 +5449,7 @@
</return-value>
<parameters>
<parameter name="type">
- <type name="GObject.GType" c:type="GType"/>
+ <type name="GObject.Type" c:type="GType"/>
</parameter>
<parameter name="str">
<type name="string" c:type="char*"/>
@@ -5568,7 +5566,7 @@
</return-value>
<parameters>
<parameter name="ch">
- <type name="GLib.gunichar" c:type="gunichar"/>
+ <type name="GLib.unichar" c:type="gunichar"/>
</parameter>
</parameters>
</function>
Modified: trunk/gir/pangocairo.gir
==============================================================================
--- trunk/gir/pangocairo.gir (original)
+++ trunk/gir/pangocairo.gir Mon Aug 18 20:18:43 2008
@@ -3,9 +3,17 @@
xmlns:c="http://www.gtk.org/introspection/c/1.0";
xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
<namespace name="PangoCairo">
- <record name="PangoCairoFont" c:type="PangoCairoFont"/>
- <record name="PangoCairoFontMap" c:type="PangoCairoFontMap"/>
- <callback name="PangoCairoShapeRendererFunc">
+ <interface name="Font"
+ c:type="PangoCairoFont"
+ glib:type-name="PangoCairoFont"
+ glib:get-type="pango_cairo_font_get_type">
+ </interface>
+ <interface name="FontMap"
+ c:type="PangoCairoFontMap"
+ glib:type-name="PangoCairoFontMap"
+ glib:get-type="pango_cairo_font_map_get_type">
+ </interface>
+ <callback name="ShapeRendererFunc" c:type="PangoCairoShapeRendererFunc">
<return-value>
<type name="none" c:type="void"/>
</return-value>
@@ -14,7 +22,7 @@
<type name="cairo.cairo_t" c:type="cairo_t*"/>
</parameter>
<parameter name="attr">
- <type name="Pango.PangoAttrShape" c:type="PangoAttrShape*"/>
+ <type name="Pango.AttrShape" c:type="PangoAttrShape*"/>
</parameter>
<parameter name="do_path">
<type name="boolean" c:type="gboolean"/>
@@ -24,11 +32,6 @@
</parameter>
</parameters>
</callback>
- <interface name="FontMap"
- c:type="PangoCairoFontMap"
- glib:type-name="PangoCairoFontMap"
- glib:get-type="pango_cairo_font_map_get_type">
- </interface>
<function name="pango_cairo_font_map_new"
c:identifier="pango_cairo_font_map_new">
<return-value>
@@ -99,11 +102,6 @@
</parameter>
</parameters>
</function>
- <interface name="Font"
- c:type="PangoCairoFont"
- glib:type-name="PangoCairoFont"
- glib:get-type="pango_cairo_font_get_type">
- </interface>
<function name="pango_cairo_font_get_scaled_font"
c:identifier="pango_cairo_font_get_scaled_font">
<return-value>
@@ -191,22 +189,20 @@
<type name="Pango.Context" c:type="PangoContext*"/>
</parameter>
<parameter name="func">
- <type name="PangoCairoShapeRendererFunc"
- c:type="PangoCairoShapeRendererFunc"/>
+ <type name="ShapeRendererFunc" c:type="PangoCairoShapeRendererFunc"/>
</parameter>
<parameter name="data">
<type name="any" c:type="gpointer"/>
</parameter>
<parameter name="dnotify">
- <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+ <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
</parameter>
</parameters>
</function>
<function name="pango_cairo_context_get_shape_renderer"
c:identifier="pango_cairo_context_get_shape_renderer">
<return-value>
- <type name="PangoCairoShapeRendererFunc"
- c:type="PangoCairoShapeRendererFunc"/>
+ <type name="ShapeRendererFunc" c:type="PangoCairoShapeRendererFunc"/>
</return-value>
<parameters>
<parameter name="context">
Modified: trunk/gir/pangoft2.gir
==============================================================================
--- trunk/gir/pangoft2.gir (original)
+++ trunk/gir/pangoft2.gir Mon Aug 18 20:18:43 2008
@@ -3,35 +3,107 @@
xmlns:c="http://www.gtk.org/introspection/c/1.0";
xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
<namespace name="PangoFT2">
- <function name="pango_fc_font_lock_face"
- c:identifier="pango_fc_font_lock_face">
- <return-value>
- <type name="FT_Face" c:type="FT_Face"/>
- </return-value>
- <parameters>
- <parameter name="font">
- <type name="PangoFcFont" c:type="PangoFcFont*"/>
- </parameter>
- </parameters>
- </function>
- <function name="pango_fc_font_unlock_face"
- c:identifier="pango_fc_font_unlock_face">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="font">
- <type name="PangoFcFont" c:type="PangoFcFont*"/>
- </parameter>
- </parameters>
- </function>
- <callback name="PangoFT2SubstituteFunc">
+ <class name="PangoFcFont"
+ c:type="PangoFcFont"
+ parent="Pango.Font"
+ glib:type-name="PangoFcFont"
+ glib:get-type="pango_fc_font_get_type">
+ <method name="lock_face" c:identifier="pango_fc_font_lock_face">
+ <return-value>
+ <type name="Freetype.Face" c:type="FT_Face"/>
+ </return-value>
+ <parameters>
+ <parameter name="font">
+ <type name="PangoFcFont" c:type="PangoFcFont*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="unlock_face" c:identifier="pango_fc_font_unlock_face">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ <parameter name="font">
+ <type name="PangoFcFont" c:type="PangoFcFont*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <property name="pattern">
+ <type name="any" c:type="gpointer"/>
+ </property>
+ </class>
+ <class name="FontMap"
+ c:type="PangoFT2FontMap"
+ parent="PangoFcFontMap"
+ glib:type-name="PangoFT2FontMap"
+ glib:get-type="pango_ft2_font_map_get_type">
+ <method name="set_resolution"
+ c:identifier="pango_ft2_font_map_set_resolution">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ <parameter name="fontmap">
+ <type name="FontMap" c:type="PangoFT2FontMap*"/>
+ </parameter>
+ <parameter name="dpi_x">
+ <type name="double" c:type="double"/>
+ </parameter>
+ <parameter name="dpi_y">
+ <type name="double" c:type="double"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="set_default_substitute"
+ c:identifier="pango_ft2_font_map_set_default_substitute">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ <parameter name="fontmap">
+ <type name="FontMap" c:type="PangoFT2FontMap*"/>
+ </parameter>
+ <parameter name="func">
+ <type name="SubstituteFunc" c:type="PangoFT2SubstituteFunc"/>
+ </parameter>
+ <parameter name="data">
+ <type name="any" c:type="gpointer"/>
+ </parameter>
+ <parameter name="notify">
+ <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="substitute_changed"
+ c:identifier="pango_ft2_font_map_substitute_changed">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ <parameter name="fontmap">
+ <type name="FontMap" c:type="PangoFT2FontMap*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="create_context"
+ c:identifier="pango_ft2_font_map_create_context">
+ <return-value>
+ <type name="Pango.Context" c:type="PangoContext*"/>
+ </return-value>
+ <parameters>
+ <parameter name="fontmap">
+ <type name="FontMap" c:type="PangoFT2FontMap*"/>
+ </parameter>
+ </parameters>
+ </method>
+ </class>
+ <callback name="SubstituteFunc" c:type="PangoFT2SubstituteFunc">
<return-value>
<type name="none" c:type="void"/>
</return-value>
<parameters>
<parameter name="pattern">
- <type name="FcPattern" c:type="FcPattern*"/>
+ <type name="fontconfig.Pattern" c:type="FcPattern*"/>
</parameter>
<parameter name="data">
<type name="any" c:type="gpointer"/>
@@ -44,19 +116,19 @@
</return-value>
<parameters>
<parameter name="bitmap">
- <type name="FT_Bitmap" c:type="FT_Bitmap*"/>
+ <type name="Freetype.Bitmap" c:type="FT_Bitmap*"/>
</parameter>
<parameter name="font">
- <type name="PangoFont" c:type="PangoFont*"/>
+ <type name="Pango.Font" c:type="PangoFont*"/>
</parameter>
<parameter name="glyphs">
- <type name="PangoGlyphString" c:type="PangoGlyphString*"/>
+ <type name="Pango.GlyphString" c:type="PangoGlyphString*"/>
</parameter>
<parameter name="x">
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</parameter>
<parameter name="y">
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</parameter>
</parameters>
</function>
@@ -67,16 +139,16 @@
</return-value>
<parameters>
<parameter name="bitmap">
- <type name="FT_Bitmap" c:type="FT_Bitmap*"/>
+ <type name="Freetype.Bitmap" c:type="FT_Bitmap*"/>
</parameter>
<parameter name="matrix">
- <type name="PangoMatrix" c:type="PangoMatrix*"/>
+ <type name="Pango.Matrix" c:type="PangoMatrix*"/>
</parameter>
<parameter name="font">
- <type name="PangoFont" c:type="PangoFont*"/>
+ <type name="Pango.Font" c:type="PangoFont*"/>
</parameter>
<parameter name="glyphs">
- <type name="PangoGlyphString" c:type="PangoGlyphString*"/>
+ <type name="Pango.GlyphString" c:type="PangoGlyphString*"/>
</parameter>
<parameter name="x">
<type name="int32" c:type="int"/>
@@ -93,10 +165,10 @@
</return-value>
<parameters>
<parameter name="bitmap">
- <type name="FT_Bitmap" c:type="FT_Bitmap*"/>
+ <type name="Freetype.Bitmap" c:type="FT_Bitmap*"/>
</parameter>
<parameter name="line">
- <type name="PangoLayoutLine" c:type="PangoLayoutLine*"/>
+ <type name="Pango.LayoutLine" c:type="PangoLayoutLine*"/>
</parameter>
<parameter name="x">
<type name="int32" c:type="int"/>
@@ -113,10 +185,10 @@
</return-value>
<parameters>
<parameter name="bitmap">
- <type name="FT_Bitmap" c:type="FT_Bitmap*"/>
+ <type name="Freetype.Bitmap" c:type="FT_Bitmap*"/>
</parameter>
<parameter name="line">
- <type name="PangoLayoutLine" c:type="PangoLayoutLine*"/>
+ <type name="Pango.LayoutLine" c:type="PangoLayoutLine*"/>
</parameter>
<parameter name="x">
<type name="int32" c:type="int"/>
@@ -133,10 +205,10 @@
</return-value>
<parameters>
<parameter name="bitmap">
- <type name="FT_Bitmap" c:type="FT_Bitmap*"/>
+ <type name="Freetype.Bitmap" c:type="FT_Bitmap*"/>
</parameter>
<parameter name="layout">
- <type name="PangoLayout" c:type="PangoLayout*"/>
+ <type name="Pango.Layout" c:type="PangoLayout*"/>
</parameter>
<parameter name="x">
<type name="int32" c:type="int"/>
@@ -153,10 +225,10 @@
</return-value>
<parameters>
<parameter name="bitmap">
- <type name="FT_Bitmap" c:type="FT_Bitmap*"/>
+ <type name="Freetype.Bitmap" c:type="FT_Bitmap*"/>
</parameter>
<parameter name="layout">
- <type name="PangoLayout" c:type="PangoLayout*"/>
+ <type name="Pango.Layout" c:type="PangoLayout*"/>
</parameter>
<parameter name="x">
<type name="int32" c:type="int"/>
@@ -166,82 +238,16 @@
</parameter>
</parameters>
</function>
- <class name="FontMap"
- c:type="PangoFT2FontMap"
- parent="PangoFcFontMap"
- glib:type-name="PangoFT2FontMap"
- glib:get-type="pango_ft2_font_map_get_type">
- <method name="set_resolution"
- c:identifier="pango_ft2_font_map_set_resolution">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="fontmap">
- <type name="FontMap" c:type="PangoFT2FontMap*"/>
- </parameter>
- <parameter name="dpi_x">
- <type name="double" c:type="double"/>
- </parameter>
- <parameter name="dpi_y">
- <type name="double" c:type="double"/>
- </parameter>
- </parameters>
- </method>
- <method name="set_default_substitute"
- c:identifier="pango_ft2_font_map_set_default_substitute">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="fontmap">
- <type name="FontMap" c:type="PangoFT2FontMap*"/>
- </parameter>
- <parameter name="func">
- <type name="PangoFT2SubstituteFunc"
- c:type="PangoFT2SubstituteFunc"/>
- </parameter>
- <parameter name="data">
- <type name="any" c:type="gpointer"/>
- </parameter>
- <parameter name="notify">
- <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
- </parameter>
- </parameters>
- </method>
- <method name="substitute_changed"
- c:identifier="pango_ft2_font_map_substitute_changed">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="fontmap">
- <type name="FontMap" c:type="PangoFT2FontMap*"/>
- </parameter>
- </parameters>
- </method>
- <method name="create_context"
- c:identifier="pango_ft2_font_map_create_context">
- <return-value>
- <type name="PangoContext" c:type="PangoContext*"/>
- </return-value>
- <parameters>
- <parameter name="fontmap">
- <type name="FontMap" c:type="PangoFT2FontMap*"/>
- </parameter>
- </parameters>
- </method>
- </class>
<function name="pango_ft2_font_map_new"
c:identifier="pango_ft2_font_map_new">
<return-value>
- <type name="PangoFontMap" c:type="PangoFontMap*"/>
+ <type name="Pango.FontMap" c:type="PangoFontMap*"/>
</return-value>
</function>
<function name="pango_ft2_get_context"
c:identifier="pango_ft2_get_context">
<return-value>
- <type name="PangoContext" c:type="PangoContext*"/>
+ <type name="Pango.Context" c:type="PangoContext*"/>
</return-value>
<parameters>
<parameter name="dpi_x">
@@ -255,7 +261,7 @@
<function name="pango_ft2_font_map_for_display"
c:identifier="pango_ft2_font_map_for_display">
<return-value>
- <type name="PangoFontMap" c:type="PangoFontMap*"/>
+ <type name="Pango.FontMap" c:type="PangoFontMap*"/>
</return-value>
</function>
<function name="pango_ft2_shutdown_display"
@@ -267,11 +273,11 @@
<function name="pango_ft2_get_unknown_glyph"
c:identifier="pango_ft2_get_unknown_glyph">
<return-value>
- <type name="PangoGlyph" c:type="PangoGlyph"/>
+ <type name="Pango.Glyph" c:type="PangoGlyph"/>
</return-value>
<parameters>
<parameter name="font">
- <type name="PangoFont" c:type="PangoFont*"/>
+ <type name="Pango.Font" c:type="PangoFont*"/>
</parameter>
</parameters>
</function>
@@ -282,114 +288,174 @@
</return-value>
<parameters>
<parameter name="font">
- <type name="PangoFont" c:type="PangoFont*"/>
+ <type name="Pango.Font" c:type="PangoFont*"/>
</parameter>
<parameter name="left">
- <type name="PangoGlyph" c:type="PangoGlyph"/>
+ <type name="Pango.Glyph" c:type="PangoGlyph"/>
</parameter>
<parameter name="right">
- <type name="PangoGlyph" c:type="PangoGlyph"/>
+ <type name="Pango.Glyph" c:type="PangoGlyph"/>
</parameter>
</parameters>
</function>
<function name="pango_ft2_font_get_face"
c:identifier="pango_ft2_font_get_face">
<return-value>
- <type name="FT_Face" c:type="FT_Face"/>
+ <type name="Freetype.Face" c:type="FT_Face"/>
</return-value>
<parameters>
<parameter name="font">
- <type name="PangoFont" c:type="PangoFont*"/>
+ <type name="Pango.Font" c:type="PangoFont*"/>
</parameter>
</parameters>
</function>
<function name="pango_ft2_font_get_coverage"
c:identifier="pango_ft2_font_get_coverage">
<return-value>
- <type name="PangoCoverage" c:type="PangoCoverage*"/>
+ <type name="Pango.Coverage" c:type="PangoCoverage*"/>
</return-value>
<parameters>
<parameter name="font">
- <type name="PangoFont" c:type="PangoFont*"/>
+ <type name="Pango.Font" c:type="PangoFont*"/>
</parameter>
<parameter name="language">
- <type name="PangoLanguage" c:type="PangoLanguage*"/>
- </parameter>
- </parameters>
- </function>
- <function name="pango_fc_decoder_get_charset"
- c:identifier="pango_fc_decoder_get_charset">
- <return-value>
- <type name="FcCharSet" c:type="FcCharSet*"/>
- </return-value>
- <parameters>
- <parameter name="decoder">
- <type name="PangoFcDecoder" c:type="PangoFcDecoder*"/>
- </parameter>
- <parameter name="fcfont">
- <type name="PangoFcFont" c:type="PangoFcFont*"/>
- </parameter>
- </parameters>
- </function>
- <function name="pango_fc_decoder_get_glyph"
- c:identifier="pango_fc_decoder_get_glyph">
- <return-value>
- <type name="PangoGlyph" c:type="PangoGlyph"/>
- </return-value>
- <parameters>
- <parameter name="decoder">
- <type name="PangoFcDecoder" c:type="PangoFcDecoder*"/>
- </parameter>
- <parameter name="fcfont">
- <type name="PangoFcFont" c:type="PangoFcFont*"/>
- </parameter>
- <parameter name="wc">
- <type name="uint32" c:type="guint32"/>
+ <type name="Pango.Language" c:type="PangoLanguage*"/>
</parameter>
</parameters>
</function>
+ <class name="PangoFcDecoder"
+ c:type="PangoFcDecoder"
+ parent="GObject.Object"
+ glib:type-name="PangoFcDecoder"
+ glib:get-type="pango_fc_decoder_get_type">
+ <method name="get_charset" c:identifier="pango_fc_decoder_get_charset">
+ <return-value>
+ <type name="fontconfig.CharSet" c:type="FcCharSet*"/>
+ </return-value>
+ <parameters>
+ <parameter name="decoder">
+ <type name="PangoFcDecoder" c:type="PangoFcDecoder*"/>
+ </parameter>
+ <parameter name="fcfont">
+ <type name="PangoFcFont" c:type="PangoFcFont*"/>
+ </parameter>
+ </parameters>
+ </method>
+ <method name="get_glyph" c:identifier="pango_fc_decoder_get_glyph">
+ <return-value>
+ <type name="Pango.Glyph" c:type="PangoGlyph"/>
+ </return-value>
+ <parameters>
+ <parameter name="decoder">
+ <type name="PangoFcDecoder" c:type="PangoFcDecoder*"/>
+ </parameter>
+ <parameter name="fcfont">
+ <type name="PangoFcFont" c:type="PangoFcFont*"/>
+ </parameter>
+ <parameter name="wc">
+ <type name="uint32" c:type="guint32"/>
+ </parameter>
+ </parameters>
+ </method>
+ <callback name="get_charset" c:type="get_charset">
+ <return-value>
+ <type name="fontconfig.CharSet" c:type="FcCharSet*"/>
+ </return-value>
+ <parameters>
+ <parameter name="decoder">
+ <type name="PangoFcDecoder" c:type="PangoFcDecoder*"/>
+ </parameter>
+ <parameter name="fcfont">
+ <type name="PangoFcFont" c:type="PangoFcFont*"/>
+ </parameter>
+ </parameters>
+ </callback>
+ <callback name="get_glyph" c:type="get_glyph">
+ <return-value>
+ <type name="Pango.Glyph" c:type="PangoGlyph"/>
+ </return-value>
+ <parameters>
+ <parameter name="decoder">
+ <type name="PangoFcDecoder" c:type="PangoFcDecoder*"/>
+ </parameter>
+ <parameter name="fcfont">
+ <type name="PangoFcFont" c:type="PangoFcFont*"/>
+ </parameter>
+ <parameter name="wc">
+ <type name="uint32" c:type="guint32"/>
+ </parameter>
+ </parameters>
+ </callback>
+ <callback name="pango_reserved1" c:type="_pango_reserved1">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ </callback>
+ <callback name="pango_reserved2" c:type="_pango_reserved2">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ </callback>
+ <callback name="pango_reserved3" c:type="_pango_reserved3">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ </callback>
+ <callback name="pango_reserved4" c:type="_pango_reserved4">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ </callback>
+ </class>
+ <class name="PangoFcFontMap"
+ c:type="PangoFcFontMap"
+ parent="Pango.FontMap"
+ glib:type-name="PangoFcFontMap"
+ glib:get-type="pango_fc_font_map_get_type">
+ <method name="add_decoder_find_func"
+ c:identifier="pango_fc_font_map_add_decoder_find_func">
+ <return-value>
+ <type name="none" c:type="void"/>
+ </return-value>
+ <parameters>
+ <parameter name="fcfontmap">
+ <type name="PangoFcFontMap" c:type="PangoFcFontMap*"/>
+ </parameter>
+ <parameter name="findfunc">
+ <type name="PangoFcDecoderFindFunc"
+ c:type="PangoFcDecoderFindFunc"/>
+ </parameter>
+ <parameter name="user_data">
+ <type name="any" c:type="gpointer"/>
+ </parameter>
+ <parameter name="dnotify">
+ <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+ </parameter>
+ </parameters>
+ </method>
+ </class>
<record name="PangoFcFontMapPrivate" c:type="PangoFcFontMapPrivate"/>
- <callback name="PangoFcDecoderFindFunc">
+ <callback name="PangoFcDecoderFindFunc" c:type="PangoFcDecoderFindFunc">
<return-value>
<type name="PangoFcDecoder" c:type="PangoFcDecoder*"/>
</return-value>
<parameters>
<parameter name="pattern">
- <type name="FcPattern" c:type="FcPattern*"/>
+ <type name="fontconfig.Pattern" c:type="FcPattern*"/>
</parameter>
<parameter name="user_data">
<type name="any" c:type="gpointer"/>
</parameter>
</parameters>
</callback>
- <function name="pango_fc_font_map_add_decoder_find_func"
- c:identifier="pango_fc_font_map_add_decoder_find_func">
- <return-value>
- <type name="none" c:type="void"/>
- </return-value>
- <parameters>
- <parameter name="fcfontmap">
- <type name="PangoFcFontMap" c:type="PangoFcFontMap*"/>
- </parameter>
- <parameter name="findfunc">
- <type name="PangoFcDecoderFindFunc" c:type="PangoFcDecoderFindFunc"/>
- </parameter>
- <parameter name="user_data">
- <type name="any" c:type="gpointer"/>
- </parameter>
- <parameter name="dnotify">
- <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
- </parameter>
- </parameters>
- </function>
<function name="pango_fc_font_description_from_pattern"
c:identifier="pango_fc_font_description_from_pattern">
<return-value>
- <type name="PangoFontDescription" c:type="PangoFontDescription*"/>
+ <type name="Pango.FontDescription" c:type="PangoFontDescription*"/>
</return-value>
<parameters>
<parameter name="pattern">
- <type name="FcPattern" c:type="FcPattern*"/>
+ <type name="fontconfig.Pattern" c:type="FcPattern*"/>
</parameter>
<parameter name="include_size">
<type name="boolean" c:type="gboolean"/>
Modified: trunk/gir/pangox.gir
==============================================================================
--- trunk/gir/pangox.gir (original)
+++ trunk/gir/pangox.gir Mon Aug 18 20:18:43 2008
@@ -3,8 +3,8 @@
xmlns:c="http://www.gtk.org/introspection/c/1.0";
xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
<namespace name="PangoX">
- <alias name="PangoXSubfont" target="guint16"/>
- <callback name="PangoGetGCFunc">
+ <alias name="Subfont" target="guint16" c:type="PangoXSubfont"/>
+ <callback name="PangoGetGCFunc" c:type="PangoGetGCFunc">
<return-value>
<type name="xlib.GC" c:type="GC"/>
</return-value>
@@ -20,7 +20,7 @@
</parameter>
</parameters>
</callback>
- <callback name="PangoFreeGCFunc">
+ <callback name="PangoFreeGCFunc" c:type="PangoFreeGCFunc">
<return-value>
<type name="none" c:type="void"/>
</return-value>
@@ -94,10 +94,10 @@
<type name="Pango.GlyphString" c:type="PangoGlyphString*"/>
</parameter>
<parameter name="x">
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</parameter>
<parameter name="y">
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</parameter>
</parameters>
</function>
@@ -169,7 +169,7 @@
<type name="int32" c:type="int"/>
</parameter>
<parameter name="subfont_ids">
- <type name="PangoXSubfont" c:type="PangoXSubfont**"/>
+ <type name="Subfont" c:type="PangoXSubfont**"/>
</parameter>
<parameter name="subfont_charsets">
<type name="int" c:type="int**"/>
@@ -185,14 +185,14 @@
<type name="Pango.Font" c:type="PangoFont*"/>
</parameter>
<parameter name="glyph">
- <type name="Pango.PangoGlyph" c:type="PangoGlyph"/>
+ <type name="Pango.Glyph" c:type="PangoGlyph"/>
</parameter>
</parameters>
</function>
<function name="pango_x_get_unknown_glyph"
c:identifier="pango_x_get_unknown_glyph">
<return-value>
- <type name="Pango.PangoGlyph" c:type="PangoGlyph"/>
+ <type name="Pango.Glyph" c:type="PangoGlyph"/>
</return-value>
<parameters>
<parameter name="font">
@@ -200,11 +200,11 @@
</parameter>
</parameters>
</function>
- <record name="PangoXFontCache" c:type="PangoXFontCache"/>
+ <record name="FontCache" c:type="PangoXFontCache"/>
<function name="pango_x_font_cache_new"
c:identifier="pango_x_font_cache_new">
<return-value>
- <type name="PangoXFontCache" c:type="PangoXFontCache*"/>
+ <type name="FontCache" c:type="PangoXFontCache*"/>
</return-value>
<parameters>
<parameter name="display">
@@ -219,7 +219,7 @@
</return-value>
<parameters>
<parameter name="cache">
- <type name="PangoXFontCache" c:type="PangoXFontCache*"/>
+ <type name="FontCache" c:type="PangoXFontCache*"/>
</parameter>
</parameters>
</function>
@@ -230,7 +230,7 @@
</return-value>
<parameters>
<parameter name="cache">
- <type name="PangoXFontCache" c:type="PangoXFontCache*"/>
+ <type name="FontCache" c:type="PangoXFontCache*"/>
</parameter>
<parameter name="xlfd">
<type name="string" c:type="char*"/>
@@ -244,7 +244,7 @@
</return-value>
<parameters>
<parameter name="cache">
- <type name="PangoXFontCache" c:type="PangoXFontCache*"/>
+ <type name="FontCache" c:type="PangoXFontCache*"/>
</parameter>
<parameter name="fs">
<type name="xlib.XFontStruct" c:type="XFontStruct*"/>
@@ -276,7 +276,7 @@
<function name="pango_x_font_map_get_font_cache"
c:identifier="pango_x_font_map_get_font_cache">
<return-value>
- <type name="PangoXFontCache" c:type="PangoXFontCache*"/>
+ <type name="FontCache" c:type="PangoXFontCache*"/>
</return-value>
<parameters>
<parameter name="font_map">
@@ -294,7 +294,7 @@
<type name="Pango.Font" c:type="PangoFont*"/>
</parameter>
<parameter name="subfont_id">
- <type name="PangoXSubfont" c:type="PangoXSubfont"/>
+ <type name="Subfont" c:type="PangoXSubfont"/>
</parameter>
</parameters>
</function>
@@ -314,7 +314,7 @@
<type name="int32" c:type="int"/>
</parameter>
<parameter name="rfont">
- <type name="PangoXSubfont" c:type="PangoXSubfont*"/>
+ <type name="Subfont" c:type="PangoXSubfont*"/>
</parameter>
</parameters>
</function>
@@ -348,10 +348,10 @@
<type name="Pango.Font" c:type="PangoFont*"/>
</parameter>
<parameter name="subfont">
- <type name="PangoXSubfont" c:type="PangoXSubfont"/>
+ <type name="Subfont" c:type="PangoXSubfont"/>
</parameter>
<parameter name="glyphs">
- <type name="GLib.gunichar" c:type="gunichar**"/>
+ <type name="GLib.unichar" c:type="gunichar**"/>
</parameter>
<parameter name="n_glyphs">
<type name="int" c:type="int*"/>
Modified: trunk/gir/pangoxft.gir
==============================================================================
--- trunk/gir/pangoxft.gir (original)
+++ trunk/gir/pangoxft.gir Mon Aug 18 20:18:43 2008
@@ -3,7 +3,6 @@
xmlns:c="http://www.gtk.org/introspection/c/1.0";
xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
<namespace name="PangoXft">
- <record name="PangoXftRendererPrivate" c:type="PangoXftRendererPrivate"/>
<class name="Renderer"
c:type="PangoXftRenderer"
parent="Pango.Renderer"
@@ -18,7 +17,7 @@
<type name="Renderer" c:type="PangoXftRenderer*"/>
</parameter>
<parameter name="draw">
- <type name="XftDraw" c:type="XftDraw*"/>
+ <type name="xft.Draw" c:type="XftDraw*"/>
</parameter>
</parameters>
</method>
@@ -40,9 +39,9 @@
<type name="any" c:type="gpointer"/>
</property>
<property name="screen">
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</property>
- <callback name="composite_trapezoids">
+ <callback name="composite_trapezoids" c:type="composite_trapezoids">
<return-value>
<type name="none" c:type="void"/>
</return-value>
@@ -51,7 +50,7 @@
<type name="Renderer" c:type="PangoXftRenderer*"/>
</parameter>
<parameter name="part">
- <type name="PangoRenderPart" c:type="PangoRenderPart"/>
+ <type name="Pango.RenderPart" c:type="PangoRenderPart"/>
</parameter>
<parameter name="trapezoids">
<type name="XTrapezoid" c:type="XTrapezoid*"/>
@@ -61,7 +60,7 @@
</parameter>
</parameters>
</callback>
- <callback name="composite_glyphs">
+ <callback name="composite_glyphs" c:type="composite_glyphs">
<return-value>
<type name="none" c:type="void"/>
</return-value>
@@ -81,6 +80,7 @@
</parameters>
</callback>
</class>
+ <record name="RendererPrivate" c:type="PangoXftRendererPrivate"/>
<function name="pango_xft_renderer_new"
c:identifier="pango_xft_renderer_new">
<return-value>
@@ -88,7 +88,7 @@
</return-value>
<parameters>
<parameter name="display">
- <type name="Display" c:type="Display*"/>
+ <type name="xlib.Display" c:type="Display*"/>
</parameter>
<parameter name="screen">
<type name="int32" c:type="int"/>
@@ -101,10 +101,10 @@
</return-value>
<parameters>
<parameter name="draw">
- <type name="XftDraw" c:type="XftDraw*"/>
+ <type name="xft.Draw" c:type="XftDraw*"/>
</parameter>
<parameter name="color">
- <type name="XftColor" c:type="XftColor*"/>
+ <type name="xft.Color" c:type="XftColor*"/>
</parameter>
<parameter name="font">
<type name="Pango.Font" c:type="PangoFont*"/>
@@ -113,10 +113,10 @@
<type name="Pango.GlyphString" c:type="PangoGlyphString*"/>
</parameter>
<parameter name="x">
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</parameter>
<parameter name="y">
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</parameter>
</parameters>
</function>
@@ -127,13 +127,13 @@
</return-value>
<parameters>
<parameter name="display">
- <type name="Display" c:type="Display*"/>
+ <type name="xlib.Display" c:type="Display*"/>
</parameter>
<parameter name="src_picture">
- <type name="Picture" c:type="Picture"/>
+ <type name="xlib.Picture" c:type="Picture"/>
</parameter>
<parameter name="dest_picture">
- <type name="Picture" c:type="Picture"/>
+ <type name="xlib.Picture" c:type="Picture"/>
</parameter>
<parameter name="font">
<type name="Pango.Font" c:type="PangoFont*"/>
@@ -142,10 +142,10 @@
<type name="Pango.GlyphString" c:type="PangoGlyphString*"/>
</parameter>
<parameter name="x">
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</parameter>
<parameter name="y">
- <type name="int32" c:type="gint"/>
+ <type name="int" c:type="gint"/>
</parameter>
</parameters>
</function>
@@ -156,10 +156,10 @@
</return-value>
<parameters>
<parameter name="draw">
- <type name="XftDraw" c:type="XftDraw*"/>
+ <type name="xft.Draw" c:type="XftDraw*"/>
</parameter>
<parameter name="color">
- <type name="XftColor" c:type="XftColor*"/>
+ <type name="xft.Color" c:type="XftColor*"/>
</parameter>
<parameter name="matrix">
<type name="Pango.Matrix" c:type="PangoMatrix*"/>
@@ -185,10 +185,10 @@
</return-value>
<parameters>
<parameter name="draw">
- <type name="XftDraw" c:type="XftDraw*"/>
+ <type name="xft.Draw" c:type="XftDraw*"/>
</parameter>
<parameter name="color">
- <type name="XftColor" c:type="XftColor*"/>
+ <type name="xft.Color" c:type="XftColor*"/>
</parameter>
<parameter name="line">
<type name="Pango.LayoutLine" c:type="PangoLayoutLine*"/>
@@ -208,10 +208,10 @@
</return-value>
<parameters>
<parameter name="draw">
- <type name="XftDraw" c:type="XftDraw*"/>
+ <type name="xft.Draw" c:type="XftDraw*"/>
</parameter>
<parameter name="color">
- <type name="XftColor" c:type="XftColor*"/>
+ <type name="xft.Color" c:type="XftColor*"/>
</parameter>
<parameter name="layout">
<type name="Pango.Layout" c:type="PangoLayout*"/>
@@ -224,13 +224,25 @@
</parameter>
</parameters>
</function>
- <callback name="PangoXftSubstituteFunc">
+ <class name="FontMap"
+ c:type="PangoXftFontMap"
+ parent="PangoFT2.PangoFcFontMap"
+ glib:type-name="PangoXftFontMap"
+ glib:get-type="pango_xft_font_map_get_type">
+ </class>
+ <class name="Font"
+ c:type="PangoXftFont"
+ parent="PangoFT2.PangoFcFont"
+ glib:type-name="PangoXftFont"
+ glib:get-type="pango_xft_font_get_type">
+ </class>
+ <callback name="SubstituteFunc" c:type="PangoXftSubstituteFunc">
<return-value>
<type name="none" c:type="void"/>
</return-value>
<parameters>
<parameter name="pattern">
- <type name="FcPattern" c:type="FcPattern*"/>
+ <type name="fontconfig.Pattern" c:type="FcPattern*"/>
</parameter>
<parameter name="data">
<type name="any" c:type="gpointer"/>
@@ -244,7 +256,7 @@
</return-value>
<parameters>
<parameter name="display">
- <type name="Display" c:type="Display*"/>
+ <type name="xlib.Display" c:type="Display*"/>
</parameter>
<parameter name="screen">
<type name="int32" c:type="int"/>
@@ -258,7 +270,7 @@
</return-value>
<parameters>
<parameter name="display">
- <type name="Display" c:type="Display*"/>
+ <type name="xlib.Display" c:type="Display*"/>
</parameter>
<parameter name="screen">
<type name="int32" c:type="int"/>
@@ -272,7 +284,7 @@
</return-value>
<parameters>
<parameter name="display">
- <type name="Display" c:type="Display*"/>
+ <type name="xlib.Display" c:type="Display*"/>
</parameter>
<parameter name="screen">
<type name="int32" c:type="int"/>
@@ -286,19 +298,19 @@
</return-value>
<parameters>
<parameter name="display">
- <type name="Display" c:type="Display*"/>
+ <type name="xlib.Display" c:type="Display*"/>
</parameter>
<parameter name="screen">
<type name="int32" c:type="int"/>
</parameter>
<parameter name="func">
- <type name="PangoXftSubstituteFunc" c:type="PangoXftSubstituteFunc"/>
+ <type name="SubstituteFunc" c:type="PangoXftSubstituteFunc"/>
</parameter>
<parameter name="data">
<type name="any" c:type="gpointer"/>
</parameter>
<parameter name="notify">
- <type name="GLib.GDestroyNotify" c:type="GDestroyNotify"/>
+ <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
</parameter>
</parameters>
</function>
@@ -309,24 +321,12 @@
</return-value>
<parameters>
<parameter name="display">
- <type name="Display" c:type="Display*"/>
+ <type name="xlib.Display" c:type="Display*"/>
</parameter>
<parameter name="screen">
<type name="int32" c:type="int"/>
</parameter>
</parameters>
</function>
- <class name="FontMap"
- c:type="PangoXftFontMap"
- parent="PangoFcFontMap"
- glib:type-name="PangoXftFontMap"
- glib:get-type="pango_xft_font_map_get_type">
- </class>
- <class name="Font"
- c:type="PangoXftFont"
- parent="PangoFcFont"
- glib:type-name="PangoXftFont"
- glib:get-type="pango_xft_font_get_type">
- </class>
</namespace>
</repository>
Added: trunk/gir/xft.gir
==============================================================================
--- (empty file)
+++ trunk/gir/xft.gir Mon Aug 18 20:18:43 2008
@@ -0,0 +1,8 @@
+<repository version="1.0"
+ xmlns="http://www.gtk.org/introspection/core/1.0";
+ xmlns:c="http://www.gtk.org/introspection/c/1.0";>
+ <namespace name="xft">
+ <record name="Color" c:type="XftColor"/>
+ <record name="Draw" c:type="XftDraw"/>
+ </namespace>
+</repository>
Modified: trunk/gir/xlib.gir
==============================================================================
--- trunk/gir/xlib.gir (original)
+++ trunk/gir/xlib.gir Mon Aug 18 20:18:43 2008
@@ -2,9 +2,14 @@
xmlns="http://www.gtk.org/introspection/core/1.0";
xmlns:c="http://www.gtk.org/introspection/c/1.0";>
<namespace name="xlib">
+ <record name="Atom" c:type="Atom"/>
<record name="Display" c:type="Display"/>
<record name="Drawable" c:type="Drawable"/>
<record name="GC" c:type="GC"/>
+ <record name="Picture" c:type="Picture"/>
+ <record name="VisualID" c:type="VisualID"/>
+ <record name="XID" c:type="XID"/>
+ <record name="XImage" c:type="XImage"/>
<record name="XFontStruct" c:type="XFontStruct"/>
</namespace>
</repository>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
