Changeset 508

Timestamp:

06/28/08 09:56:15 (2 months ago)

Author:

Mike Wey

Message:

Wrapped pangocairo - see ticket #35

Files:

• trunk/src/build/gtkD.d (modified) (1 diff)
• trunk/src/gtkc/pango.d (modified) (4 diffs)
• trunk/src/gtkc/pangotypes.d (modified) (3 diffs)
• trunk/src/gtkc/paths.d (modified) (3 diffs)
• trunk/src/pango/PgCairo.d (added)
• trunk/src/pango/PgCairoFontMap.d (added)
• trunk/wrap/APILookupPango.txt (modified) (2 diffs)
• trunk/wrap/paths.d (modified) (3 diffs)
• trunk/wrap/utils/GtkDClass.d (modified) (1 diff)
• trunk/wrap/utils/GtkWrapper.d (modified) (2 diffs)

trunk/src/build/gtkD.d

@@ -143 +143 @@
-private import pango.PgScriptIter;
-private import pango.PgVertical;
+private import pango.PgCairoFontMap;
+private import pango.PgCairo;
-private import pango.PgRenderer;
-private import pango.PgCoverage;

trunk/src/gtkc/pango.d

@@ -35 +35 @@
-
-private import gtkc.pangotypes;
+private import gtkc.cairotypes;
-private import gtkc.Loader;
-private import gtkc.paths;
@@ -42 +43 @@
-static this()
-{
-
+, libPath ~ importLibs[LIBRARY.PANGOCAIRO]
- pango_Linker.link(pangoLinks);
-
@@ -420 +421 @@
-    PangoGravity function(PangoScript script, PangoGravity baseGravity, PangoGravityHint hint)pango_gravity_get_for_script;
-    double function(PangoGravity gravity)pango_gravity_to_rotation;
+    
+    // pango.PgCairoFontMap
+    
+    PangoFontMap* function()pango_cairo_font_map_get_default;
+    PangoFontMap* function()pango_cairo_font_map_new;
+    PangoFontMap* function(cairo_font_type_t fonttype)pango_cairo_font_map_new_for_font_type;
+    cairo_font_type_t function(PangoCairoFontMap* fontmap)pango_cairo_font_map_get_font_type;
+    void function(PangoCairoFontMap* fontmap, double dpi)pango_cairo_font_map_set_resolution;
+    double function(PangoCairoFontMap* fontmap)pango_cairo_font_map_get_resolution;
+    PangoContext* function(PangoCairoFontMap* fontmap)pango_cairo_font_map_create_context;
+    
+    // pango.PgCairo
+    
+    cairo_scaled_font_t* function(PangoCairoFont* font)pango_cairo_font_get_scaled_font;
+    void function(PangoContext* context, double dpi)pango_cairo_context_set_resolution;
+    double function(PangoContext* context)pango_cairo_context_get_resolution;
+    void function(PangoContext* context, cairo_font_options_t* options)pango_cairo_context_set_font_options;
+    cairo_font_options_t* function(PangoContext* context)pango_cairo_context_get_font_options;
+    void function(PangoContext* context, PangoCairoShapeRendererFunc func, gpointer data, GDestroyNotify dnotify)pango_cairo_context_set_shape_renderer;
+    PangoCairoShapeRendererFunc function(PangoContext* context, gpointer* data)pango_cairo_context_get_shape_renderer;
+    void function(cairo_t* cr, PangoContext* context)pango_cairo_update_context;
+    PangoLayout* function(cairo_t* cr)pango_cairo_create_layout;
+    void function(cairo_t* cr, PangoLayout* layout)pango_cairo_update_layout;
+    void function(cairo_t* cr, PangoFont* font, PangoGlyphString* glyphs)pango_cairo_show_glyph_string;
+    void function(cairo_t* cr, PangoLayoutLine* line)pango_cairo_show_layout_line;
+    void function(cairo_t* cr, PangoLayout* layout)pango_cairo_show_layout;
+    void function(cairo_t* cr, double x, double y, double width, double height)pango_cairo_show_error_underline;
+    void function(cairo_t* cr, PangoFont* font, PangoGlyphString* glyphs)pango_cairo_glyph_string_path;
+    void function(cairo_t* cr, PangoLayoutLine* line)pango_cairo_layout_line_path;
+    void function(cairo_t* cr, PangoLayout* layout)pango_cairo_layout_path;
+    void function(cairo_t* cr, double x, double y, double width, double height)pango_cairo_error_underline_path;
-    
-    // pango.PgRenderer
@@ -782 +814 @@
-    { "pango_gravity_get_for_script",  cast(void**)& pango_gravity_get_for_script},
-    { "pango_gravity_to_rotation",  cast(void**)& pango_gravity_to_rotation},
+    { "pango_cairo_font_map_get_default",  cast(void**)& pango_cairo_font_map_get_default},
+    { "pango_cairo_font_map_new",  cast(void**)& pango_cairo_font_map_new},
+    { "pango_cairo_font_map_new_for_font_type",  cast(void**)& pango_cairo_font_map_new_for_font_type},
+    { "pango_cairo_font_map_get_font_type",  cast(void**)& pango_cairo_font_map_get_font_type},
+    { "pango_cairo_font_map_set_resolution",  cast(void**)& pango_cairo_font_map_set_resolution},
+    { "pango_cairo_font_map_get_resolution",  cast(void**)& pango_cairo_font_map_get_resolution},
+    { "pango_cairo_font_map_create_context",  cast(void**)& pango_cairo_font_map_create_context},
+    { "pango_cairo_font_get_scaled_font",  cast(void**)& pango_cairo_font_get_scaled_font},
+    { "pango_cairo_context_set_resolution",  cast(void**)& pango_cairo_context_set_resolution},
+    { "pango_cairo_context_get_resolution",  cast(void**)& pango_cairo_context_get_resolution},
+    { "pango_cairo_context_set_font_options",  cast(void**)& pango_cairo_context_set_font_options},
+    { "pango_cairo_context_get_font_options",  cast(void**)& pango_cairo_context_get_font_options},
+    { "pango_cairo_context_set_shape_renderer",  cast(void**)& pango_cairo_context_set_shape_renderer},
+    { "pango_cairo_context_get_shape_renderer",  cast(void**)& pango_cairo_context_get_shape_renderer},
+    { "pango_cairo_update_context",  cast(void**)& pango_cairo_update_context},
+    { "pango_cairo_create_layout",  cast(void**)& pango_cairo_create_layout},
+    { "pango_cairo_update_layout",  cast(void**)& pango_cairo_update_layout},
+    { "pango_cairo_show_glyph_string",  cast(void**)& pango_cairo_show_glyph_string},
+    { "pango_cairo_show_layout_line",  cast(void**)& pango_cairo_show_layout_line},
+    { "pango_cairo_show_layout",  cast(void**)& pango_cairo_show_layout},
+    { "pango_cairo_show_error_underline",  cast(void**)& pango_cairo_show_error_underline},
+    { "pango_cairo_glyph_string_path",  cast(void**)& pango_cairo_glyph_string_path},
+    { "pango_cairo_layout_line_path",  cast(void**)& pango_cairo_layout_line_path},
+    { "pango_cairo_layout_path",  cast(void**)& pango_cairo_layout_path},
+    { "pango_cairo_error_underline_path",  cast(void**)& pango_cairo_error_underline_path},
-    { "pango_renderer_draw_layout",  cast(void**)& pango_renderer_draw_layout},
-    { "pango_renderer_draw_layout_line",  cast(void**)& pango_renderer_draw_layout_line},

trunk/src/gtkc/pangotypes.d

@@ -24 +24 @@
-
-
+public import gtkc.cairotypes;
-public import gtkc.glibtypes;
-public import gtkc.gobjecttypes;
@@ -1210 +1211 @@
-
-/**
+ * PangoCairoFont is an interface exported by fonts for
+ * use with Cairo. The actual type of the font will depend
+ * on the particular font technology Cairo was compiled to use.
+ * Since 1.18
+ */
+public struct PangoCairoFont{}
+
+
+/**
+ * PangoCairoFontMap is an interface exported by font maps for
+ * use with Cairo. The actual type of the font map will depend
+ * on the particular font technology Cairo was compiled to use.
+ * Since 1.10
+ */
+public struct PangoCairoFontMap{}
+
+
+/**
- * Main Gtk struct.
- * PangoRenderer is a base class for objects that are used to
@@ -1671 +1690 @@
-// gboolean (*PangoAttrFilterFunc) (PangoAttribute *attribute,  gpointer data);
-public typedef extern(C) int  function (PangoAttribute*, void*) PangoAttrFilterFunc;
+
+/*
+ * Function type for rendering attributes of type PANGO_ATTR_SHAPE
+ * with Pango's Cairo renderer.
+ * cr :
+ * a Cairo context with current point set to where the shape should
+ *  be rendered
+ * attr :
+ * the PANGO_ATTR_SHAPE to render
+ * do_path :
+ * whether only the shape path should be appended to current
+ *  path of cr and no filling/stroking done. This will be set
+ *   to TRUE when called from pango_cairo_layout_path() and
+ *   pango_cairo_layout_line_path() rendering functions.
+ * data :
+ * user data passed to pango_cairo_context_set_shape_renderer()
+ */
+// void (*PangoCairoShapeRendererFunc) (cairo_t *cr,  PangoAttrShape *attr,  gboolean do_path,  gpointer data);
+public typedef extern(C) void  function (cairo_t*, PangoAttrShape*, int, void*) PangoCairoShapeRendererFunc;

trunk/src/gtkc/paths.d

@@ -32 +32 @@
-    GTK,
-    PANGO,
+    PANGOCAIRO,
-    GLGDK,
-    GLGTK,
@@ -58 +59 @@
-    LIBRARY.GTK:        "libgtk-win32-2.0-0.dll",
-    LIBRARY.PANGO:      "libpango-1.0-0.dll",
+    LIBRARY.PANGOCAIRO: "libpangocairo-1.0-0.dll",
-    LIBRARY.GLGDK:      "libgdkglext-win32-1.0-0.dll",
-    LIBRARY.GLGTK:      "libgtkglext-win32-1.0-0.dll",
@@ -84 +86 @@
-    LIBRARY.GTK:        "libgtk-x11-2.0.so",
-    LIBRARY.PANGO:      "libpango-1.0.so",
+    LIBRARY.PANGOCAIRO: "libpangocairo-1.0.so",
-    LIBRARY.GLGDK:      "libgdkglext-x11-1.0.so",
-    LIBRARY.GLGTK:      "libgtkglext-x11-1.0.so",

trunk/wrap/APILookupPango.txt

@@ -30 +30 @@
-addTypedefs: start
-
+public import gtkc.cairotypes;
-public import gtkc.glibtypes;
-public import gtkc.gobjecttypes;
@@ -485 +486 @@
-#outFile: PgXft
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#file: pango-ATSUI-Fonts.html

trunk/wrap/paths.d

@@ -32 +32 @@
-    GTK,
-    PANGO,
+    PANGOCAIRO,
-    GLGDK,
-    GLGTK,
@@ -58 +59 @@
-    LIBRARY.GTK:        "libgtk-win32-2.0-0.dll",
-    LIBRARY.PANGO:      "libpango-1.0-0.dll",
+    LIBRARY.PANGOCAIRO: "libpangocairo-1.0-0.dll",
-    LIBRARY.GLGDK:      "libgdkglext-win32-1.0-0.dll",
-    LIBRARY.GLGTK:      "libgtkglext-win32-1.0-0.dll",
@@ -84 +86 @@
-    LIBRARY.GTK:        "libgtk-x11-2.0.so",
-    LIBRARY.PANGO:      "libpango-1.0.so",
+    LIBRARY.PANGOCAIRO: "libpangocairo-1.0.so",
-    LIBRARY.GLGDK:      "libgdkglext-x11-1.0.so",
-    LIBRARY.GLGTK:      "libgtkglext-x11-1.0.so",

trunk/wrap/utils/GtkDClass.d

@@ -2763 +2763 @@
-            converted = gToken.dup;
-        }
+        else if ( endsWith(gToken, "_t*") && startsWith(gToken,"cairo_") )
+        {
+            converted = gToken.dup;
+        }
-        else if ( startsWith(gToken,"f_") && (endsWith(gToken,"_out") || endsWith(gToken,"_in") || endsWith(gToken,"_inout") ) )
-        {

trunk/wrap/utils/GtkWrapper.d

@@ -820 +820 @@
-            externalText ~= "\nprivate import "~bindingsDir~".gthreadtypes;";
-        }
-
+|| loaderTableName == "pango" 
-        {
-            externalText ~= "\nprivate import "~bindingsDir~".cairotypes;";
@@ -843 +843 @@
-                         ~std.string.toupper(loaderTableName.dup)~"], libPath ~ importLibs[LIBRARY.GDKPIXBUF] );";
-            }
-
+
+
+
+
+
+
-            {
-                externalText ~= "\n "~loaderTableName~"_Linker = new Linker(libPath ~ importLibs[LIBRARY."