gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtksettings.c

@@ -1,28 +1,40 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtksettings.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:32 $
-
-  Copyright (C) 2003,2004 Ruby-GNOME2 Project Team
-  Copyright (C) 2003 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003,2004 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003  Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cSettings
+
 static VALUE prop_func_table;
 
 static VALUE
-settings_s_get_default(VALUE self)
+rg_s_default(G_GNUC_UNUSED VALUE self)
 {
     return GOBJ2RVAL(gtk_settings_get_default());
 }
 
 #if GTK_CHECK_VERSION(2,2,0)
 static VALUE
-settings_s_get_for_screen(VALUE self, VALUE screen)
+rg_s_get_for_screen(G_GNUC_UNUSED VALUE self, VALUE screen)
 {
     return GOBJ2RVAL(gtk_settings_get_for_screen(GDK_SCREEN(RVAL2GOBJ(screen))));
 }
@@ -52,7 +64,7 @@ rc_property_parser(const GParamSpec *pspec, const GString *rc_string, GValue *pr
 }
 
 static VALUE
-settings_s_install_property(VALUE self, VALUE spec)
+rg_s_install_property(VALUE self, VALUE spec)
 {
     GParamSpec* pspec = G_PARAM_SPEC(RVAL2GOBJ(spec));
     if (rb_block_given_p()){
@@ -66,106 +78,115 @@ settings_s_install_property(VALUE self, VALUE spec)
 }
 
 static VALUE
-settings_rc_property_parse_color(VALUE self, VALUE spec, VALUE str)
+settings_rc_property_parse(G_GNUC_UNUSED VALUE self, VALUE rbspec, VALUE rbstring, GtkRcPropertyParser parser)
 {
-    gboolean ret; 
-    GValue prop = {0,};
-    VALUE val = Qnil;
-    GString* gstr = g_string_new(RVAL2CSTR(str));
-    g_value_init(&prop, GDK_TYPE_COLOR);
-    ret = gtk_rc_property_parse_color(G_PARAM_SPEC(RVAL2GOBJ(spec)), 
-                                      gstr, &prop);
-    if (ret) val = GVAL2RVAL(&prop);
-
-    g_string_free(gstr, TRUE);
-    g_value_unset(&prop);
-    return val;
+    GParamSpec *spec = RVAL2GOBJ(rbspec);
+    GString *string = g_string_new(RVAL2CSTR(rbstring));
+    GValue property = G_VALUE_INIT;
+    gboolean parsed;
+
+    g_value_init(&property, spec->value_type);
+
+    parsed = parser(spec, string, &property);
+
+    g_string_free(string, TRUE);
+
+    return parsed ? GVAL2RVAL_UNSET(&property) : Qnil;
 }
 
 static VALUE
-settings_rc_property_parse_enum(VALUE self, VALUE spec, VALUE str)
+rg_s_rc_property_parse_color(VALUE self, VALUE rbspec, VALUE rbstring)
 {
-    gboolean ret; 
-    GValue prop = {0,};
-    VALUE val = Qnil;
-    GString* gstr = g_string_new(RVAL2CSTR(str));
-    GParamSpec* gspec = G_PARAM_SPEC(RVAL2GOBJ(spec));
-    g_value_init(&prop, gspec->value_type);
-    ret = gtk_rc_property_parse_enum(gspec, gstr, &prop);
-
-    if (ret) val = GVAL2RVAL(&prop);
-
-    g_string_free(gstr, TRUE);
-    g_value_unset(&prop);
-    return val;
+    return settings_rc_property_parse(self, rbspec, rbstring, gtk_rc_property_parse_color);
 }
 
 static VALUE
-settings_rc_property_parse_flags(VALUE self, VALUE spec, VALUE str)
+rg_s_rc_property_parse_enum(VALUE self, VALUE rbspec, VALUE rbstring)
 {
-    gboolean ret; 
-    GValue prop = {0,};
-    VALUE val = Qnil;
-    GString* gstr = g_string_new(RVAL2CSTR(str));
-    GParamSpec* gspec = G_PARAM_SPEC(RVAL2GOBJ(spec));
-    g_value_init(&prop, gspec->value_type);
-    ret = gtk_rc_property_parse_flags(gspec, gstr, &prop);
-
-    if (ret) val = GVAL2RVAL(&prop);
-
-    g_string_free(gstr, TRUE);
-    g_value_unset(&prop);
-    return val;
+    return settings_rc_property_parse(self, rbspec, rbstring, gtk_rc_property_parse_enum);
 }
 
 static VALUE
-settings_rc_property_parse_requisition(VALUE self, VALUE spec, VALUE str)
+rg_s_rc_property_parse_flags(VALUE self, VALUE rbspec, VALUE rbstring)
 {
-    gboolean ret; 
-    GValue prop = {0,};
-    VALUE val = Qnil;
-    GString* gstr = g_string_new(RVAL2CSTR(str));
-    g_value_init(&prop, GTK_TYPE_REQUISITION);
-    ret = gtk_rc_property_parse_requisition(G_PARAM_SPEC(RVAL2GOBJ(spec)), 
-                                            gstr, &prop);
-    if (ret){
-        GtkRequisition* req = g_value_get_boxed(&prop);
-        val = rb_assoc_new(INT2NUM(req->width), INT2NUM(req->height));
-    }
-    g_string_free(gstr, TRUE);
-    g_value_unset(&prop);
-    return val;    
+    return settings_rc_property_parse(self, rbspec, rbstring, gtk_rc_property_parse_flags);
 }
 
 static VALUE
-settings_rc_property_parse_border(VALUE self, VALUE spec, VALUE str)
+rg_s_rc_property_parse_requisition(G_GNUC_UNUSED VALUE self, VALUE rbspec, VALUE rbstring)
 {
-    gboolean ret; 
-    GValue prop = {0,};
-    VALUE val = Qnil;
-    GString* gstr = g_string_new(RVAL2CSTR(str));
-    g_value_init(&prop, GTK_TYPE_BORDER);
-    ret = gtk_rc_property_parse_border(G_PARAM_SPEC(RVAL2GOBJ(spec)), 
-                                      gstr, &prop);
-    if (ret){
-        GtkBorder* border = g_value_get_boxed(&prop);
-        val = BOXED2RVAL(border, GTK_TYPE_BORDER);
-    }
-    g_string_free(gstr, TRUE);
-    g_value_unset(&prop);
-    return val;
+    GParamSpec *spec = RVAL2GOBJ(rbspec);
+    GString *string = g_string_new(RVAL2CSTR(rbstring));
+    GValue property = G_VALUE_INIT;
+    gboolean parsed;
+    GtkRequisition *requisition;
+    gint width;
+    gint height;
+
+    g_value_init(&property, GTK_TYPE_REQUISITION);
+
+    parsed = gtk_rc_property_parse_requisition(spec, string, &property);
+
+    g_string_free(string, TRUE);
+
+    if (!parsed)
+        return Qnil;
+
+    requisition = g_value_get_boxed(&property);
+    width = requisition->width;
+    height = requisition->height;
+
+    g_value_unset(&property);
+
+    return rb_assoc_new(INT2NUM(width), INT2NUM(height));
 }
 
 static VALUE
-settings_set_property_value(VALUE self, VALUE name, VALUE value, VALUE origin)
+settings_rc_property_parse_border_result(VALUE value)
 {
-    GtkSettingsValue svalue = { NULL, { 0, }, };
-    g_value_init(&svalue.value, RVAL2GTYPE(value));
-    rbgobj_rvalue_to_gvalue(value, &svalue.value);
+    return BOXED2RVAL(g_value_get_boxed((GValue *)value), GTK_TYPE_BORDER);
+}
+
+static VALUE
+settings_rc_property_parse_border_ensure(VALUE value)
+{
+    g_value_unset((GValue *)value);
+
+    return Qnil;
+}
+
+static VALUE
+rg_s_rc_property_parse_border(G_GNUC_UNUSED VALUE self, VALUE rbspec, VALUE rbstring)
+{
+    GParamSpec *spec = RVAL2GOBJ(rbspec);
+    GString *string = g_string_new(RVAL2CSTR(rbstring));
+    GValue property = G_VALUE_INIT;
+    gboolean parsed;
+
+    g_value_init(&property, GTK_TYPE_BORDER);
+
+    parsed = gtk_rc_property_parse_border(spec, string, &property);
+
+    g_string_free(string, TRUE);
+
+    if (!parsed)
+        return Qnil;
+
+    return rb_ensure(settings_rc_property_parse_border_result, (VALUE)&property,
+                     settings_rc_property_parse_border_ensure, (VALUE)&property);
+}
+
+static VALUE
+rg_set_property_value(VALUE self, VALUE rbname, VALUE rbvalue, VALUE origin)
+{
+    GtkSettings *settings = GTK_SETTINGS(RVAL2GOBJ(self));
+    GtkSettingsValue svalue = { (gchar *)RVAL2CSTR(origin), G_VALUE_INIT };
+    const gchar *name = RVAL2CSTR(rbname);
+    g_value_init(&svalue.value, RVAL2GTYPE(rbvalue));
+    rbgobj_rvalue_to_gvalue(rbvalue, &svalue.value);
+
+    gtk_settings_set_property_value(settings, name, &svalue);
 
-    svalue.origin = (char *)RVAL2CSTR(origin);
-    gtk_settings_set_property_value(GTK_SETTINGS(RVAL2GOBJ(self)), 
-                                    RVAL2CSTR(name), &svalue);
     g_value_unset(&svalue.value);
 
     return self;
@@ -188,26 +209,25 @@ void        gtk_settings_set_double_property
                                              const gchar *origin);
 */
 
-
 void 
-Init_gtk_settings()
+Init_gtk_settings(VALUE mGtk)
 {
-    VALUE gSettings = G_DEF_CLASS(GTK_TYPE_SETTINGS, "Settings", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_SETTINGS, "Settings", mGtk);
 
     rb_global_variable(&prop_func_table);
     prop_func_table = rb_hash_new();
 
-    rb_define_singleton_method(gSettings, "default", settings_s_get_default, 0);
+    RG_DEF_SMETHOD(default, 0);
 #if GTK_CHECK_VERSION(2,2,0)
-    rb_define_singleton_method(gSettings, "get_for_screen", settings_s_get_for_screen, 1);
+    RG_DEF_SMETHOD(get_for_screen, 1);
 #endif
-    rb_define_singleton_method(gSettings, "install_property", settings_s_install_property, 1);
+    RG_DEF_SMETHOD(install_property, 1);
 
-    rb_define_singleton_method(gSettings, "rc_property_parse_color", settings_rc_property_parse_color, 2);
-    rb_define_singleton_method(gSettings, "rc_property_parse_enum", settings_rc_property_parse_enum, 2);
-    rb_define_singleton_method(gSettings, "rc_property_parse_flags", settings_rc_property_parse_flags, 2);
-    rb_define_singleton_method(gSettings, "rc_property_parse_requisition", settings_rc_property_parse_requisition, 2);
-    rb_define_singleton_method(gSettings, "rc_property_parse_border", settings_rc_property_parse_border, 2);
+    RG_DEF_SMETHOD(rc_property_parse_color, 2);
+    RG_DEF_SMETHOD(rc_property_parse_enum, 2);
+    RG_DEF_SMETHOD(rc_property_parse_flags, 2);
+    RG_DEF_SMETHOD(rc_property_parse_requisition, 2);
+    RG_DEF_SMETHOD(rc_property_parse_border, 2);
 
-    rb_define_method(gSettings, "set_property_value", settings_set_property_value, 3);
+    RG_DEF_METHOD(set_property_value, 3);
 }

data/ext/gtk2/rbgtksizegroup.c

@@ -1,70 +1,73 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2003-2005 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 OGASAWARA, Takeshi
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
-  rbgtksizegroup.c -
- 
-  $Author: mutoh $
-  $Date: 2006/11/12 15:28:40 $
-
-  Copyright (C) 2003-2005 Ruby-GNOME2 Project Team
-  Copyright (C) 2002,2003 OGASAWARA, Takeshi
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cSizeGroup
 #define _SELF(self) (GTK_SIZE_GROUP(RVAL2GOBJ(self)))
 
 static VALUE
-sizegrp_initialize(VALUE self, VALUE mode)
+rg_initialize(VALUE self, VALUE mode)
 {
     G_INITIALIZE(self, gtk_size_group_new(RVAL2GENUM(mode, GTK_TYPE_SIZE_GROUP_MODE)));
     return Qnil;
 }
 
 static VALUE
-sizegrp_add_widget(VALUE self, VALUE widget)
+rg_add_widget(VALUE self, VALUE widget)
 {
     gtk_size_group_add_widget(_SELF(self), GTK_WIDGET(RVAL2GOBJ(widget)));
     return self;
 }
 
 static VALUE
-sizegrp_remove_widget(VALUE self, VALUE widget)
+rg_remove_widget(VALUE self, VALUE widget)
 {
     gtk_size_group_remove_widget(_SELF(self), GTK_WIDGET(RVAL2GOBJ(widget)));
     return self;
 }
 
-/* Defined as properties
-void        gtk_size_group_set_ignore_hidden
-                                            (GtkSizeGroup *size_group,
-                                             gboolean ignore_hidden);
-gboolean    gtk_size_group_get_ignore_hidden
-                                            (GtkSizeGroup *size_group);
-*/
-
 #if GTK_CHECK_VERSION(2,10,0)
 static VALUE
-sizegrp_get_widgets(VALUE self)
+rg_widgets(VALUE self)
 {
     return GSLIST2ARY(gtk_size_group_get_widgets(_SELF(self)));
 }
 #endif
 
 void
-Init_sizegrp()
+Init_gtk_size_group(VALUE mGtk)
 {
-    VALUE gSizeGroup = G_DEF_CLASS(GTK_TYPE_SIZE_GROUP, "SizeGroup", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_SIZE_GROUP, "SizeGroup", mGtk);
 
-    rb_define_method(gSizeGroup, "initialize", sizegrp_initialize, 1);
-    rb_define_method(gSizeGroup, "add_widget", sizegrp_add_widget, 1);
-    rb_define_method(gSizeGroup, "remove_widget", sizegrp_remove_widget, 1);
+    RG_DEF_METHOD(initialize, 1);
+    RG_DEF_METHOD(add_widget, 1);
+    RG_DEF_METHOD(remove_widget, 1);
 
 #if GTK_CHECK_VERSION(2,10,0)
-    rb_define_method(gSizeGroup, "widgets", sizegrp_get_widgets, 0);
+    RG_DEF_METHOD(widgets, 0);
 #endif
 
     /* GtkSizeGroupMode */
-    G_DEF_CLASS(GTK_TYPE_SIZE_GROUP_MODE, "Mode", gSizeGroup);
-    G_DEF_CONSTANTS(gSizeGroup, GTK_TYPE_SIZE_GROUP_MODE, "GTK_SIZE_GROUP_");
+    G_DEF_CLASS(GTK_TYPE_SIZE_GROUP_MODE, "Mode", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_SIZE_GROUP_MODE, "GTK_SIZE_GROUP_");
 }
-

data/ext/gtk2/rbgtksocket.c

@@ -1,29 +1,41 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtksocket.c -
-
-  $Author: mutoh $
-  $Date: 2003/05/27 10:59:22 $
-
-  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
-  Copyright (C) 2002 Neil Conway
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002  Neil Conway
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #include "global.h"
 
 #ifdef HAVE_GTK_SOCKET_GET_TYPE
+
+#define RG_TARGET_NAMESPACE cSocket
 #define _SELF(self) GTK_SOCKET(RVAL2GOBJ(self))
 
 static VALUE
-socket_initialize(VALUE self)
+rg_initialize(VALUE self)
 {
     RBGTK_INITIALIZE(self, gtk_socket_new());
     return Qnil;
 }
 
 static VALUE
-socket_add_id(VALUE self, VALUE wid)
+rg_add_id(VALUE self, VALUE wid)
 {
     gtk_socket_add_id(_SELF(self),
 #ifdef GDK_NATIVE_WINDOW_POINTER
@@ -36,13 +48,13 @@ socket_add_id(VALUE self, VALUE wid)
 }
 
 static VALUE
-socket_plug_window(VALUE self)
+rg_plug_window(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->plug_window);
 }
 
 static VALUE
-socket_get_socket_id(VALUE self)
+rg_id(VALUE self)
 {
     GdkNativeWindow id =  gtk_socket_get_id(_SELF(self));
 #ifdef GDK_NATIVE_WINDOW_POINTER
@@ -55,14 +67,14 @@ socket_get_socket_id(VALUE self)
 #endif /* HAVE_GTK_SOCKET_GET_TYPE */
 
 void 
-Init_gtk_socket()
+Init_gtk_socket(VALUE mGtk)
 {
 #ifdef HAVE_GTK_SOCKET_GET_TYPE
-    VALUE gSocket = G_DEF_CLASS(GTK_TYPE_SOCKET, "Socket", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_SOCKET, "Socket", mGtk);
 
-    rb_define_method(gSocket, "initialize",  socket_initialize, 0);
-    rb_define_method(gSocket, "plug_window", socket_plug_window, 0);
-    rb_define_method(gSocket, "add_id", socket_add_id, 1);
-    rb_define_method(gSocket, "id", socket_get_socket_id, 0);
+    RG_DEF_METHOD(initialize, 0);
+    RG_DEF_METHOD(plug_window, 0);
+    RG_DEF_METHOD(add_id, 1);
+    RG_DEF_METHOD(id, 0);
 #endif
 }