gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgdkproperty.c

@@ -1,35 +1,43 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2004 Ruby-GNOME2 Project Team
+ *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
+ *                          Daisuke Kanda,
+ *                          Hiroshi Igarashi
+ *
+ *  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
+ */
 
-  rbgdkproperty.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-
-  Copyright (C) 2003,2004 Ruby-GNOME2 Project Team
-
-  Devided from rbgdkwindow.c
-  rbgdkwindow.c - 
-  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE mProperty
+
 static VALUE
-gdkprop_text_property_to_text_list(int argc, VALUE *argv, VALUE self)
+rg_m_text_property_to_text_list(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     gint num, i;
     gchar** list;
     VALUE ret = Qnil;
-    
+
     if (argc == 3) {
         VALUE encoding, format, text;
         rb_scan_args(argc, argv, "30", &encoding, &format, &text);
         StringValue(text);
-        
+
         num = gdk_text_property_to_text_list(RVAL2ATOM(encoding),
                                              NUM2INT(format),
                                              (const guchar*)RVAL2CSTR(text), 
@@ -39,7 +47,7 @@ gdkprop_text_property_to_text_list(int argc, VALUE *argv, VALUE self)
         VALUE display, encoding, format, text;
         rb_scan_args(argc, argv, "40", &display, &encoding, &format, &text);
         StringValue(text);
-        
+
         num = gdk_text_property_to_text_list_for_display(GDK_DISPLAY_OBJECT(RVAL2GOBJ(display)),
                                                          RVAL2ATOM(encoding),
                                                          NUM2INT(format),
@@ -66,17 +74,17 @@ gdkprop_text_property_to_text_list(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-gdkprop_text_property_to_utf8_list(int argc, VALUE *argv, VALUE self)
+rg_m_text_property_to_utf8_list(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     gint num, i;
     gchar** list;
     VALUE ret = Qnil;
-    
+
     if (argc == 3) {
         VALUE encoding, format, text;
         rb_scan_args(argc, argv, "30", &encoding, &format, &text);
         StringValue(text);
-        
+
         num = gdk_text_property_to_utf8_list(RVAL2ATOM(encoding),
                                              NUM2INT(format),
                                              (const guchar*)RVAL2CSTR(text),
@@ -86,7 +94,7 @@ gdkprop_text_property_to_utf8_list(int argc, VALUE *argv, VALUE self)
         VALUE display, encoding, format, text;
         rb_scan_args(argc, argv, "40", &display, &encoding, &format, &text);
         StringValue(text);
-        
+
         num = gdk_text_property_to_utf8_list_for_display(GDK_DISPLAY_OBJECT(RVAL2GOBJ(display)),
                                                          RVAL2ATOM(encoding),
                                                          NUM2INT(format),
@@ -115,7 +123,7 @@ gdkprop_text_property_to_utf8_list(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-gdkprop_string_to_compound_text(int argc, VALUE *argv, VALUE self)
+rg_m_string_to_compound_text(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     gint num;
     GdkAtom encoding;
@@ -160,13 +168,13 @@ gdkprop_string_to_compound_text(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-gdkprop_utf8_to_string_target(VALUE self, VALUE str)
+rg_m_utf8_to_string_target(G_GNUC_UNUSED VALUE self, VALUE str)
 {
     return CSTR2RVAL((const char*)gdk_utf8_to_string_target(RVAL2CSTR(str)));
 }
 
 static VALUE
-gdkprop_utf8_to_compound_text(int argc, VALUE *argv, VALUE self)
+rg_m_utf8_to_compound_text(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     GdkAtom encoding;
     gint format;
@@ -177,7 +185,7 @@ gdkprop_utf8_to_compound_text(int argc, VALUE *argv, VALUE self)
     if (argc == 1) {
         VALUE str;
         rb_scan_args(argc, argv, "10", &str);
-    
+
         ret = gdk_utf8_to_compound_text(RVAL2CSTR(str),
                                         &encoding, &format,
                                         &ctext, &length);
@@ -193,7 +201,7 @@ gdkprop_utf8_to_compound_text(int argc, VALUE *argv, VALUE self)
 #else
         VALUE str;
         rb_scan_args(argc, argv, "10", &str);
-    
+
         rb_warn("Gdk::Property.utf8_to_compound_text: Not supported arguments in GTK+-2.0.x.");
         ret = gdk_utf8_to_compound_text(RVAL2CSTR(str),
                                         &encoding, &format,
@@ -212,22 +220,21 @@ gdkprop_utf8_to_compound_text(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-
 static VALUE
-gdkprop_change(int argc, VALUE *argv, VALUE self)
+rg_m_change(int argc, VALUE *argv, VALUE self)
 {
     int        fmt, len;
     void*      dat;
     GdkAtom    ntype;
     VALUE win, property, type, size= Qnil, mode, src;
-    
+
     if(6 == argc)
         rb_scan_args(argc, argv, "60", &win, &property, &type, &size, &mode, &src);
     else
         rb_scan_args(argc, argv, "50", &win, &property, &type, &mode, &src);
-    
+
     rbgtk_atom2selectiondata(type, size, src, &ntype, &dat, &fmt, &len);
-    
+
     gdk_property_change(GDK_WINDOW(RVAL2GOBJ(win)), RVAL2ATOM(property), 
                         ntype, fmt, RVAL2GENUM(mode, GDK_TYPE_PROP_MODE), dat, len);
 
@@ -237,45 +244,44 @@ gdkprop_change(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-gdkprop_get(int argc, VALUE *argv, VALUE self)
+rg_m_get(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self)
 {
     /* for argument processing */
     GdkAtom     rtype;
     gint        rfmt, rlen;
-    guchar*	rdat;
+    guchar* rdat;
     VALUE win, property, type, offset=INT2FIX(0), length=INT2FIX(9999), delete;
-    
+
     /* for inner processing */
-    gint		i;
+    gint        i;
     size_t j;
-    VALUE	ret = 0;
-    
+    VALUE   ret = 0;
+
     if(6 == argc)
         rb_scan_args(argc, argv, "60", &win, &property, &type, &offset, &length, &delete);
     else
         rb_scan_args(argc, argv, "40", &win, &property, &type, &delete);
-    
-    
+
     if(gdk_property_get(GDK_WINDOW(RVAL2GOBJ(win)), RVAL2ATOM(property), RVAL2ATOM(type),
                         NUM2INT(offset), NUM2INT(length),
                         RVAL2CBOOL(delete), &rtype, &rfmt, &rlen, &rdat) == FALSE){
         return Qnil;
     }
- 
+
     switch(rfmt){
       case 8:
       default:
         ret = RBG_STRING_SET_UTF8_ENCODING(rb_str_new((const char*)rdat, rlen));
         break;
-        
+
       case 16:
         ret = rb_ary_new();
-        
+
         for( i = 0; i < rlen; i++){
             rb_ary_push(ret, rb_Integer(((unsigned short*)rdat)[i]));
         }
         break;
-        
+
       case 32:
          ret = rb_ary_new();
 
@@ -290,34 +296,34 @@ gdkprop_get(int argc, VALUE *argv, VALUE self)
          }
         break;
     }
-    
+
     return rb_ary_new3(3, BOXED2RVAL(rtype, GDK_TYPE_ATOM), 
                        ret, INT2NUM(rlen));
 }
 
 static VALUE
-gdkprop_delete(VALUE self, VALUE win, VALUE property)
+rg_m_delete(VALUE self, VALUE win, VALUE property)
 {
     gdk_property_delete(GDK_WINDOW(RVAL2GOBJ(win)), RVAL2ATOM(property));
     return self;
 }
 
 void
-Init_gtk_gdk_property()
+Init_gtk_gdk_property(VALUE mGdk)
 {
-    VALUE gdkProperty = rb_define_module_under(mGdk, "Property");
+    VALUE RG_TARGET_NAMESPACE = rb_define_module_under(mGdk, "Property");
 
-    rb_define_module_function(gdkProperty, "text_property_to_text_list", gdkprop_text_property_to_text_list, -1);
-    rb_define_module_function(gdkProperty, "text_property_to_utf8_list", gdkprop_text_property_to_utf8_list, -1);
-    rb_define_module_function(gdkProperty, "string_to_compound_text", gdkprop_string_to_compound_text, -1);
-    rb_define_module_function(gdkProperty, "utf8_to_string_target", gdkprop_utf8_to_string_target, 1);
-    rb_define_module_function(gdkProperty, "utf8_to_compound_text", gdkprop_utf8_to_compound_text, -1);
-    rb_define_module_function(gdkProperty, "change", gdkprop_change, -1);
-    rb_define_module_function(gdkProperty, "get", gdkprop_get, -1);
-    rb_define_module_function(gdkProperty, "delete", gdkprop_delete, 2);
+    RG_DEF_MODFUNC(text_property_to_text_list, -1);
+    RG_DEF_MODFUNC(text_property_to_utf8_list, -1);
+    RG_DEF_MODFUNC(string_to_compound_text, -1);
+    RG_DEF_MODFUNC(utf8_to_string_target, 1);
+    RG_DEF_MODFUNC(utf8_to_compound_text, -1);
+    RG_DEF_MODFUNC(change, -1);
+    RG_DEF_MODFUNC(get, -1);
+    RG_DEF_MODFUNC(delete, 2);
 
     /* GdkPropMode from GdkProperties */
-    G_DEF_CLASS(GDK_TYPE_PROP_MODE, "PropMode", gdkProperty);
-    G_DEF_CONSTANTS(gdkProperty, GDK_TYPE_PROP_MODE, "GDK_PROP_");
+    G_DEF_CLASS(GDK_TYPE_PROP_MODE, "PropMode", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GDK_TYPE_PROP_MODE, "GDK_PROP_");
 
 }

data/ext/gtk2/rbgdkrectangle.c

@@ -1,26 +1,34 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdkrectangle.c -
-
-  $Author: mutoh $
-  $Date: 2003/01/12 18:09:10 $
-
-  Copyright (C) 2002,2003 Masao Mutoh
-
-  This file is derived from rbgdkregion.c.
-  rbgdkregion.c -
-  Copyright (C) 1998-2000 Yukihiro Matsumoto,
-                          Daisuke Kanda,
-                          Hiroshi Igarashi
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Masao Mutoh
+ *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
+ *                          Daisuke Kanda,
+ *                          Hiroshi Igarashi
+ *
+ *  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 cRectangle
 #define _SELF(r) ((GdkRectangle*)RVAL2BOXED(r, GDK_TYPE_RECTANGLE))
 
 static VALUE
-gdkrect_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
+rg_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 {
     GdkRectangle new;
 
@@ -34,7 +42,7 @@ gdkrect_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 }
 
 static VALUE
-gdkrect_intersect(VALUE self, VALUE other)
+rg_intersect(VALUE self, VALUE other)
 {
     GdkRectangle dest;
     gboolean ret = gdk_rectangle_intersect(_SELF(self), _SELF(other), &dest);
@@ -42,7 +50,7 @@ gdkrect_intersect(VALUE self, VALUE other)
 }
 
 static VALUE
-gdkrect_union(VALUE self, VALUE other)
+rg_union(VALUE self, VALUE other)
 {
     GdkRectangle dest;
     gdk_rectangle_union(_SELF(self), _SELF(other), &dest);
@@ -51,59 +59,59 @@ gdkrect_union(VALUE self, VALUE other)
 
 /* Struct accessors */
 static VALUE
-gdkrect_x(VALUE self)
+rg_x(VALUE self)
 {
     return INT2NUM(_SELF(self)->x);
 }
 
 static VALUE
-gdkrect_y(VALUE self)
+rg_y(VALUE self)
 {
     return INT2NUM(_SELF(self)->y);
 }
 
 static VALUE
-gdkrect_w(VALUE self)
+rg_width(VALUE self)
 {
     return INT2NUM(_SELF(self)->width);
 }
 
 static VALUE
-gdkrect_h(VALUE self)
+rg_height(VALUE self)
 {
     return INT2NUM(_SELF(self)->height);
 }
 
 static VALUE
-gdkrect_set_x(VALUE self, VALUE x)
+rg_set_x(VALUE self, VALUE x)
 {
     _SELF(self)->x = NUM2INT(x);
     return self;
 }
 
 static VALUE
-gdkrect_set_y(VALUE self, VALUE y)
+rg_set_y(VALUE self, VALUE y)
 {
     _SELF(self)->y = NUM2INT(y);
     return self;
 }
 
 static VALUE
-gdkrect_set_w(VALUE self, VALUE width)
+rg_set_width(VALUE self, VALUE width)
 {
     _SELF(self)->width = NUM2INT(width);
     return self;
 }
 
 static VALUE
-gdkrect_set_h(VALUE self, VALUE height)
+rg_set_height(VALUE self, VALUE height)
 {
     _SELF(self)->height = NUM2INT(height);
     return self;
 }
 
 static VALUE
-gdkrect_to_a(VALUE self)
+rg_to_a(VALUE self)
 {
   GdkRectangle* a = _SELF(self);
   return rb_ary_new3(4, INT2FIX(a->x), INT2FIX(a->y),
@@ -111,24 +119,24 @@ gdkrect_to_a(VALUE self)
 }
 
 void
-Init_gtk_gdk_rectangle()
+Init_gtk_gdk_rectangle(VALUE mGdk)
 {
-    VALUE gdkRectangle = G_DEF_CLASS(GDK_TYPE_RECTANGLE, "Rectangle", mGdk);
-
-    rb_define_method(gdkRectangle, "initialize", gdkrect_initialize, 4);
-    rb_define_method(gdkRectangle, "intersect", gdkrect_intersect, 1);
-    rb_define_alias(gdkRectangle, "&", "intersect");
-    rb_define_method(gdkRectangle, "union", gdkrect_union, 1);
-    rb_define_alias(gdkRectangle, "|", "union");
-    rb_define_method(gdkRectangle, "x", gdkrect_x, 0);
-    rb_define_method(gdkRectangle, "y", gdkrect_y, 0);
-    rb_define_method(gdkRectangle, "width", gdkrect_w, 0);
-    rb_define_method(gdkRectangle, "height", gdkrect_h, 0);
-    rb_define_method(gdkRectangle, "set_x", gdkrect_set_x, 1);
-    rb_define_method(gdkRectangle, "set_y", gdkrect_set_y, 1);
-    rb_define_method(gdkRectangle, "set_width", gdkrect_set_w, 1);
-    rb_define_method(gdkRectangle, "set_height", gdkrect_set_h, 1);
-    rb_define_method(gdkRectangle, "to_a", gdkrect_to_a, 0);
-
-    G_DEF_SETTERS(gdkRectangle);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_RECTANGLE, "Rectangle", mGdk);
+
+    RG_DEF_METHOD(initialize, 4);
+    RG_DEF_METHOD(intersect, 1);
+    RG_DEF_ALIAS("&", "intersect");
+    RG_DEF_METHOD(union, 1);
+    RG_DEF_ALIAS("|", "union");
+    RG_DEF_METHOD(x, 0);
+    RG_DEF_METHOD(y, 0);
+    RG_DEF_METHOD(width, 0);
+    RG_DEF_METHOD(height, 0);
+    RG_DEF_METHOD(set_x, 1);
+    RG_DEF_METHOD(set_y, 1);
+    RG_DEF_METHOD(set_width, 1);
+    RG_DEF_METHOD(set_height, 1);
+    RG_DEF_METHOD(to_a, 0);
+
+    G_DEF_SETTERS(RG_TARGET_NAMESPACE);
 }