Re: Can't add new GTK 2.16 methods to GtkStyle

[Emmanuel Rodriguez <emmanuel rodriguez gmail com>]

On Wed, Jan 21, 2009 at 7:47 AM, muppet <scott asofyet org> wrote:
>
> On Jan 20, 2009, at 2:13 PM, Emmanuel Rodriguez wrote:
>
>> Here's a new version of the patch with the fixes requested.
>
>> <GtkStyle.patch>
>
> Comment suffers cut and paste bug -- refers to g_object_get_property(), i
> think you mean gtk_style_get_property().
>
Bad copy/paste that's now fixed.

> Don't need braces around C if blocks with only one statement in them.
>
Removed.

> Indentation on g_type_class_unref() is wonky.
s/\t/  /g;

>
> If we actually hit the warn ("Invalid property ...") case, i think that the
> return list will contain the property name instead of the value.  Should
> that case include  ST (i - 2) = newSV (&PL_sv_undef) so that we give back
> undef for bad property names?  Or should we croak on bad property names,
> flagging that as programmer error?
>
I'm not setting undef and issuing a warning. Note that newSV ()
expects a length as argument, so I've changed the code to ST (i - 2) =
 newSVsv (&PL_sv_undef);.

Question do I actually need to wrap &PL_sv_undef with a SV? Can't I
just do  ST (i - 2) = &PL_sv_undef; ? I've tried both solutions and
the unit tests work. I've also tried fetching properties that don't
exist and I got no segmentation fault.

-- 
Emmanuel Rodriguez

Index: xs/GtkStyle.xs
===================================================================
--- xs/GtkStyle.xs	(revision 2116)
+++ xs/GtkStyle.xs	(working copy)
@@ -572,3 +572,78 @@
         RETVAL
 
 #endif
+
+#if GTK_CHECK_VERSION (2, 15, 0) /* FIXME 2.16 */
+
+=for apidoc Gtk2::Style::get
+=for signature $style->get (widget_package, ...)
+=for arg widget_package (string) widget package name (ex: 'Gtk2::TreeView')
+=for arg ... (list) list of property names
+
+Fetch and return the values for the style properties named in I<...> for a
+widget of type I<widget_package>.
+
+=cut
+
+=for apidoc Gtk2::Style::get_property
+=for arg widget_package (__hide__)
+=for arg ... (__hide__)
+
+Alias for C<get>.
+
+=cut
+
+void
+gtk_style_get (style, widget_package, ...)
+    GtkStyle    *style
+    const char  *widget_package
+    ALIAS:
+        Gtk2::Style::get = 0
+        Gtk2::Style::get_property = 1
+    PREINIT:
+        int i;
+        GType widget_type;
+        gpointer class_peek;
+        GValue value = {0,};
+
+    CODE:
+        /* Use CODE: instead of PPCODE: so we can handle the stack ourselves in
+         * order to avoid that xsubs called by gtk_style_get_property overwrite
+         * what we put on the stack. */
+        PERL_UNUSED_VAR (ix);
+
+        widget_type = gperl_type_from_package(widget_package);
+        if (widget_type == 0)
+            croak("package %s is not registered with GPerl", widget_package);
+
+        if (! g_type_is_a (widget_type, GTK_TYPE_WIDGET))
+            croak("%s is not a subclass of Gtk2::Widget", widget_package);
+
+        
+        class_peek = g_type_class_ref(widget_type);
+        if (class_peek == NULL)
+            croak("Can't find class %s", widget_package);
+
+        
+        
+        for (i = 2 ; i < items ; i++) {
+            GValue value = {0, };
+            gchar *name = SvGChar(ST(i));
+            GParamSpec *pspec = pspec = gtk_widget_class_find_style_property(class_peek, name);
+            if (pspec) {
+                g_value_init(&value, G_PARAM_SPEC_VALUE_TYPE(pspec));
+                gtk_style_get_property(style, widget_type, name, &value);
+                ST (i - 2) = sv_2mortal (gperl_sv_from_value(&value));
+                g_value_unset(&value);
+            }
+            else {
+                warn ("Invalid property `%s' used, returning undef", name);
+                ST (i - 2) =  newSVsv (&PL_sv_undef);
+            }
+        }
+        
+        g_type_class_unref(class_peek);
+        
+        XSRETURN (items - 2);
+
+#endif
Index: t/GtkStyle.t
===================================================================
--- t/GtkStyle.t	(revision 2116)
+++ t/GtkStyle.t	(working copy)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 # vim: set ft=perl expandtab shiftwidth=2 softtabstop=2 :
 use strict;
-use Gtk2::TestHelper tests => 113;
+use Gtk2::TestHelper tests => 118;
 
 # $Id$
 
@@ -133,6 +133,55 @@
   ok (1);
 }
 
+SKIP: {
+  skip("get_property is new in 2.16", 5)
+    unless (Gtk2->CHECK_VERSION(2, 15, 0)); # FIXME 2.16
+
+  # Test different properties (gint, gboolean, gchar* and GObject)
+  my $treeview = Gtk2::TreeView -> new();
+  
+  # get gboolean
+  is (
+    $style -> get_property('Gtk2::TreeView', 'allow-rules'),
+    $treeview -> style_get_property('allow-rules'),
+    "get_property gboolean"
+  );
+  
+  # get gint
+  is (
+    $style -> get_property('Gtk2::TreeView', 'expander-size'),
+    $treeview -> style_get_property('expander-size'),
+    "get_property gint"
+  );
+  
+  # get gchar*
+  is (
+    $style -> get_property('Gtk2::TreeView', 'grid_line-pattern'),
+    $treeview -> style_get_property('grid_line-pattern'),
+    "get_property gchar*"
+  );
+  
+  # get GObject (a color)
+  is (
+    $style -> get_property('Gtk2::TreeView', 'even-row-color'),
+    $treeview -> style_get_property('even-row-color'),
+    "get_property GObject*"
+  );
+  
+  
+  # Get multiple properties simultaneously
+  my @properties = $style -> get('Gtk2::TreeView', 'expander-size', 'even-row-color', 'grid_line-pattern');
+  is_deeply (
+    \ properties,
+    [
+      $treeview -> style_get_property('expander-size'),
+      $treeview -> style_get_property('even-row-color'),
+      $treeview -> style_get_property('grid_line-pattern'),
+    ],
+    'get multiple properties',
+  );
+}
+
 __END__
 
 Copyright (C) 2003-2006 by the gtk2-perl team (see the file AUTHORS for the