X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gdk%2Fgdk.drawing-primitives.lisp;h=b1b6db6f4175e7c31f62a00ad79e672a3aba57f5;hb=a088fbe624f085d53b356d77d15ef4aca0788ceb;hp=6d32034e6686da1d94d49e2e903d5eae69a8ea2c;hpb=e9d93dac434bc319821c909c022d8e1b3c6445b3;p=cl-gtk2.git

diff --git a/gdk/gdk.drawing-primitives.lisp b/gdk/gdk.drawing-primitives.lisp
index 6d32034..b1b6db6 100644
--- a/gdk/gdk.drawing-primitives.lisp
+++ b/gdk/gdk.drawing-primitives.lisp
@@ -92,6 +92,8 @@
   (width :int)
   (height :int))
 
+(export 'draw-rectangle)
+
 (defcfun (draw-arc "gdk_draw_arc") :void
   (drawable (g-object drawable))
   (gc (g-object graphics-context))
@@ -130,32 +132,45 @@
 
 (export 'draw-trapezoids)
 
-;; TODO
-;; void                gdk_draw_glyphs                     (GdkDrawable *drawable,
-;;                                                          GdkGC *gc,
-;;                                                          PangoFont *font,
-;;                                                          gint x,
-;;                                                          gint y,
-;;                                                          PangoGlyphString *glyphs);
-;; void                gdk_draw_glyphs_transformed         (GdkDrawable *drawable,
-;;                                                          GdkGC *gc,
-;;                                                          const PangoMatrix *matrix,
-;;                                                          PangoFont *font,
-;;                                                          gint x,
-;;                                                          gint y,
-;;                                                          PangoGlyphString *glyphs);
-;; void                gdk_draw_layout_line                (GdkDrawable *drawable,
-;;                                                          GdkGC *gc,
-;;                                                          gint x,
-;;                                                          gint y,
-;;                                                          PangoLayoutLine *line);
-;; void                gdk_draw_layout_line_with_colors    (GdkDrawable *drawable,
-;;                                                          GdkGC *gc,
-;;                                                          gint x,
-;;                                                          gint y,
-;;                                                          PangoLayoutLine *line,
-;;                                                          const GdkColor *foreground,
-;;                                                          const GdkColor *background);
+(defcfun (draw-glyphs "gdk_draw_glyphs") :void
+  (drawable (g-object drawable))
+  (gc (g-object graphics-context))
+  (font (g-object pango-font))
+  (x :int)
+  (y :int)
+  (glyphs (g-boxed-foreign pango-glyph-string)))
+
+(export 'draw-glyphs)
+
+(defcfun (draw-glyphs-transformed "gdk_draw_glyphs_transformed") :void
+  (drawable (g-object drawable))
+  (gc (g-object graphics-context))
+  (matrix (g-boxed-foreign pango-matrix))
+  (font (g-object pango-font))
+  (x :int)
+  (y :int))
+
+(export 'draw-glyphs-transformed)
+
+(defcfun (draw-layout-line "gdk_draw_layout_line") :void
+  (drawable (g-object drawable))
+  (gc (g-object graphics-context))
+  (x :int)
+  (y :int)
+  (line (g-boxed-foreign pango-layout-line)))
+
+(export 'draw-layout-line)
+
+(defcfun (draw-layout-line-with-colors "gdk_draw_layout_line_with_colors") :void
+  (drawable (g-object drawable))
+  (gc (g-object graphics-context))
+  (x :int)
+  (y :int)
+  (line (g-boxed-foreign pango-layout-line))
+  (foreground (g-boxed-foreign color))
+  (background (g-boxed-foreign color)))
+
+(export 'draw-layout-line-with-colors)
 
 (defcfun (draw-layout "gdk_draw_layout") :void
   (drawable (g-object drawable))