Changeset 405

Timestamp:

09/20/07 18:07:56 (1 year ago)

Author:

bjourne

Message:

Add overrides that makes GdkPixbufDrawOpts and GdkPixbufDrawCache
boxed types. Also add a constructor for GdkPixbufDrawOpts, implemented
using a function in a (to me) really weird way.

Files:

• pygtkimageview/src/gtkimageview.defs (modified) (1 diff)
• pygtkimageview/src/gtkimageview.override (modified) (3 diffs)

pygtkimageview/src/gtkimageview.defs

@@ -48 +48 @@
-  (gtype-id "GTK_TYPE_ANIM_VIEW")
-)
+
+;; boxes
+
+;; This is the weird looparounds you have to use to give c-structs
+;; constructors.
+(define-function pixbuf_draw_opts_new
+  (c-name "gdk_pixbuf_draw_opts_new")
+  (is-constructor-of "GdkPixbufDrawOpts")
+  (return-type "GdkPixbufDrawOpts")
+  )
+
+(define-boxed PixbufDrawOpts
+  (in-module "Gtk")
+  (c-name "GdkPixbufDrawOpts")
+  (gtype-id "GDK_TYPE_PIXBUF_DRAW_OPTS")
+  (fields
+   '("gdouble" "zoom")
+   '("GdkRectangle" "zoom_rect")
+   '("int" "widget_x")
+   '("int" "widget_y")
+   '("GdkInterpType" "interp")
+   '("GdkPixbuf*" "pixbuf")
+   '("int" "check_color1")
+   '("int" "check_color2")
+   )
+  )
+
+(define-boxed PixbufDrawCache
+  (in-module "Gtk")
+  (c-name "GdkPixbufDrawCache")
+  (gtype-id "GDK_TYPE_PIXBUF_DRAW_CACHE")
+  (fields
+   '("GdkPixbuf*" "last_pixbuf")
+   '("GdkPixbufDrawOpts" "old")
+   '("int" "check_size")
+   )
+  )
-
-;; Enumerations and flags ...

pygtkimageview/src/gtkimageview.override

@@ +1 @@
+/* -*- Mode: C; c-basic-offset: 4 -*- */
-%%
-headers
@@ -36 +37 @@
-}
-
+/* These overrides are here because pygtk insists on that boxed types
+   should be registered. */
+#define GDK_TYPE_PIXBUF_DRAW_OPTS (gdk_pixbuf_draw_opts_get_type())
+
+static GdkPixbufDrawOpts*
+gdk_pixbuf_draw_opts_copy (GdkPixbufDrawOpts *opts)
+{
+    return g_memdup (opts, sizeof (GdkPixbufDrawOpts));
+}
+
+GType
+gdk_pixbuf_draw_opts_get_type (void)
+{
+    static GType our_type = 0;
+    if (our_type)
+        return our_type;
+    const char *name = g_intern_static_string ("GdkPixbufDrawOpts");
+    our_type =
+        g_boxed_type_register_static (name,
+                                      (GBoxedCopyFunc) gdk_pixbuf_draw_opts_copy,
+                                      (GBoxedFreeFunc )g_free);
+    return our_type;
+}
+
+#define GDK_TYPE_PIXBUF_DRAW_CACHE (gdk_pixbuf_draw_cache_get_type())
+
+static GdkPixbufDrawCache*
+gdk_pixbuf_draw_cache_copy (GdkPixbufDrawCache *cache)
+{
+    return g_memdup (cache, sizeof (GdkPixbufDrawCache));
+}
+
+GType
+gdk_pixbuf_draw_cache_get_type (void)
+{
+    static GType our_type = 0;
+    if (our_type)
+        return our_type;
+    const char *name = g_intern_static_string ("GdkPixbufDrawCache");
+    our_type =
+        g_boxed_type_register_static (name,
+                                      (GBoxedCopyFunc) gdk_pixbuf_draw_cache_copy,
+                                      (GBoxedFreeFunc) gdk_pixbuf_draw_cache_free);
+    return our_type;
+}
+
+/* We must also add more boilerplate to make instantiation work. */
-%%
-module gtkimageview
@@ -77 +125 @@
-    return pyg_boxed_new (GDK_TYPE_RECTANGLE, &rect, TRUE, TRUE);
-}
+%%
+override gdk_pixbuf_draw_opts_new kwargs
+static int
+_wrap_gdk_pixbuf_draw_opts_new (PyGBoxed *self,
+                                PyObject *args,
+                                PyObject *kwargs)
+{
+    static char *kwlist[] = {
+        "zoom", "zoom_rect",
+        "widget_x", "widget_y",
+        "interp",
+        "pixbuf",
+        "check_color1", "check_color2",
+        NULL
+    };
+    GdkPixbufDrawOpts opts = {
+        0, {0, 0, 0, 0},
+        0, 0,
+        GDK_INTERP_BILINEAR,
+        NULL,
+        0, 0
+    };
-
+    if (!PyArg_ParseTupleAndKeywords (args, kwargs,
+                                      "|fOiiOOii:GdkPixbufDrawOpts.__init__",
+                                      kwlist,
+                                      &opts.zoom, &opts.zoom_rect,
+                                      &opts.widget_x, &opts.widget_y,
+                                      &opts.interp, &opts.pixbuf,
+                                      &opts.check_color1, &opts.check_color2))
+        return -1;
+
+    self->boxed = g_boxed_copy (GDK_TYPE_PIXBUF_DRAW_OPTS, &opts);
+    self->free_on_dealloc = TRUE;
+    self->gtype = GDK_TYPE_PIXBUF_DRAW_OPTS;
+
+    return 0;
+}
+
+