gdk3 1.2.4 → 1.2.5

data/ext/gdk3/rbgdkcolor.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003 Ruby-GNOME2 Project Team
  *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
  *                          Daisuke Kanda,
@@ -30,13 +30,13 @@
 static VALUE
 rg_initialize(VALUE self, VALUE red, VALUE green, VALUE blue)
 {
-    GdkColor c;
-    c.pixel = 0;
-    c.red = NUM2INT(red);
-    c.green = NUM2INT(green);
-    c.blue = NUM2INT(blue);
+    GdkColor color;
+    color.pixel = 0;
+    color.red = NUM2INT(red);
+    color.green = NUM2INT(green);
+    color.blue = NUM2INT(blue);
 
-    G_INITIALIZE(self, &c);
+    G_INITIALIZE(self, g_boxed_copy(GDK_TYPE_COLOR, &color));
 
     return Qnil;
 }

data/ext/gdk3/rbgdkgeometry.c

@@ -53,8 +53,9 @@ gdk_geometry_get_type(void)
 static VALUE
 rg_initialize(VALUE self)
 {
-    GdkGeometry g;
-    G_INITIALIZE(self, &g);
+    GdkGeometry geometry;
+    memset(&geometry, 0, sizeof(GdkGeometry));
+    G_INITIALIZE(self, g_boxed_copy(GDK_TYPE_GEOMETRY, &geometry));
     return Qnil;
 }
 

data/ext/gdk3/rbgdkrectangle.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002,2003 Masao Mutoh
  *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
  *                          Daisuke Kanda,
@@ -30,14 +30,14 @@
 static VALUE
 rg_initialize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 {
-    GdkRectangle new;
+    GdkRectangle rectangle;
 
-    new.x = NUM2INT(x);
-    new.y = NUM2INT(y);
-    new.width = NUM2INT(width);
-    new.height = NUM2INT(height);
+    rectangle.x = NUM2INT(x);
+    rectangle.y = NUM2INT(y);
+    rectangle.width = NUM2INT(width);
+    rectangle.height = NUM2INT(height);
 
-    G_INITIALIZE(self, &new);
+    G_INITIALIZE(self, g_boxed_copy(GDK_TYPE_RECTANGLE, &rectangle));
     return Qnil;
 }
 

data/ext/gdk3/rbgdkrgba.c

@@ -35,14 +35,14 @@ rg_s_parse(G_GNUC_UNUSED VALUE self, VALUE spec)
 static VALUE
 rg_initialize(VALUE self, VALUE red, VALUE green, VALUE blue, VALUE alpha)
 {
-    GdkRGBA color;
+    GdkRGBA rgba;
 
-    color.red = NUM2DBL(red);
-    color.green = NUM2DBL(green);
-    color.blue = NUM2DBL(blue);
-    color.alpha = NUM2DBL(alpha);
+    rgba.red = NUM2DBL(red);
+    rgba.green = NUM2DBL(green);
+    rgba.blue = NUM2DBL(blue);
+    rgba.alpha = NUM2DBL(alpha);
 
-    G_INITIALIZE(self, &color);
+    G_INITIALIZE(self, g_boxed_copy(GDK_TYPE_RGBA, &rgba));
 
     return Qnil;
 }
@@ -102,11 +102,11 @@ rg_set_alpha(VALUE self, VALUE alpha)
 static VALUE
 rg_to_a(VALUE self)
 {
-    GdkRGBA *color = _SELF(self);
-    return rb_ary_new3(4, DBL2NUM(color->red), 
-                          DBL2NUM(color->green),
-                          DBL2NUM(color->blue),
-                          DBL2NUM(color->alpha));
+    GdkRGBA *rgba = _SELF(self);
+    return rb_ary_new3(4, DBL2NUM(rgba->red), 
+                          DBL2NUM(rgba->green),
+                          DBL2NUM(rgba->blue),
+                          DBL2NUM(rgba->alpha));
 }
 
 static VALUE

data/ext/gdk3/rbgdkwindow.c

@@ -1019,9 +1019,8 @@ Init_gdk_window(VALUE mGdk)
     RG_DEF_METHOD(drag_protocol, 0);
 
     G_DEF_CLASS(GDK_TYPE_WINDOW_TYPE, "Type", RG_TARGET_NAMESPACE);
-/* TODO
-    G_DEF_CLASS(GDK_TYPE_WINDOW_CLASS, "Class", RG_TARGET_NAMESPACE);
-*/
+    G_DEF_CLASS(GDK_TYPE_WINDOW_WINDOW_CLASS, "WindowClass",
+                RG_TARGET_NAMESPACE);
     G_DEF_CLASS(GDK_TYPE_WINDOW_HINTS, "Hints", RG_TARGET_NAMESPACE);
     G_DEF_CLASS(GDK_TYPE_GRAVITY, "Gravity", RG_TARGET_NAMESPACE);
     G_DEF_CLASS(GDK_TYPE_WINDOW_EDGE, "Edge", RG_TARGET_NAMESPACE);

data/ext/gdk3/rbgdkwindowattr.c

@@ -51,12 +51,12 @@ static VALUE
 rg_initialize(VALUE self, VALUE width, VALUE height, VALUE wclass,
         VALUE window_type)
 {
-    GdkWindowAttr w;
-    w.width = NUM2INT(width);
-    w.height = NUM2INT(height);
-    w.wclass = RVAL2GDKWINDOWWINDOWCLASS(wclass);
-    w.window_type = RVAL2GDKWINDOWTYPE(window_type);
-    G_INITIALIZE(self, &w);
+    GdkWindowAttr attribute;
+    attribute.width = NUM2INT(width);
+    attribute.height = NUM2INT(height);
+    attribute.wclass = RVAL2GDKWINDOWWINDOWCLASS(wclass);
+    attribute.window_type = RVAL2GDKWINDOWTYPE(window_type);
+    G_INITIALIZE(self, g_boxed_copy(GDK_TYPE_WINDOW_ATTR, &attribute));
     return Qnil;
 }
 

data/lib/gdk3/deprecated.rb

@@ -132,6 +132,7 @@ module Gdk
     define_deprecated_flags :ModifierType
     define_deprecated_enums :Type
     define_deprecated_enums :TypeHint, 'TYPE_HINT'
+    define_deprecated_enums :WindowClass
     define_deprecated_flags :WMDecoration, 'DECOR'
     define_deprecated_flags :WMFunction, 'FUNC'
     define_deprecated_method :clear, :warn => "Don't use this method."

data/test/gdk-test-utils.rb

@@ -0,0 +1,21 @@
+# Copyright (C) 2013  Ruby-GNOME2 Project Team
+#
+# 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
+
+require "test-unit"
+require "test/unit/notify"
+
+module GdkTestUtils
+end

data/test/run-test.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+#
+# Copyright (C) 2013  Ruby-GNOME2 Project Team
+#
+# 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
+
+ruby_gnome2_base = File.join(File.dirname(__FILE__), "..", "..")
+ruby_gnome2_base = File.expand_path(ruby_gnome2_base)
+
+glib_base = File.join(ruby_gnome2_base, "glib2")
+atk_base = File.join(ruby_gnome2_base, "atk")
+pango_base = File.join(ruby_gnome2_base, "pango")
+gdk_pixbuf_base = File.join(ruby_gnome2_base, "gdk_pixbuf2")
+gdk3_base = File.join(ruby_gnome2_base, "gdk3")
+
+[[glib_base, "glib2"],
+ [atk_base, "atk"],
+ [pango_base, "pango"],
+ [gdk_pixbuf_base, "gdk_pixbuf2"],
+ [gdk3_base, "gdk3"]].each do |target, module_name|
+  if system("which make > /dev/null")
+    `make -C #{target.dump} > /dev/null` or exit(false)
+  end
+  $LOAD_PATH.unshift(File.join(target, "ext", module_name))
+  $LOAD_PATH.unshift(File.join(target, "lib"))
+end
+
+$LOAD_PATH.unshift(File.join(glib_base, "test"))
+require "glib-test-init"
+
+$LOAD_PATH.unshift(File.join(gdk3_base, "test"))
+require "gdk-test-utils"
+
+require "gdk3"
+
+exit Test::Unit::AutoRunner.run(true)

data/test/test-gdk-color.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  Ruby-GNOME2 Project Team
+#
+# 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
+
+class TestGdkColor < Test::Unit::TestCase
+  def test_to_s
+    color = Gdk::Color.new(0xffff, 0x1234, 0xabcd)
+    assert_equal("#ffff1234abcd", color.to_s)
+  end
+end

data/test/test-gdk-geometry.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  Ruby-GNOME2 Project Team
+#
+# 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
+
+class TestGdkGeometry < Test::Unit::TestCase
+  def test_min_width
+    geometry = Gdk::Geometry.new
+    assert_equal(0, geometry.min_width)
+  end
+end

data/test/test-gdk-rectangle.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  Ruby-GNOME2 Project Team
+#
+# 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
+
+class TestGdkRectangle < Test::Unit::TestCase
+  def test_width
+    rectangle = Gdk::Rectangle.new(0, 10, 20, 30)
+    assert_equal(20, rectangle.width)
+  end
+end

data/test/test-gdk-rgba.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  Ruby-GNOME2 Project Team
+#
+# 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
+
+class TestGdkRGBA < Test::Unit::TestCase
+  def test_to_s
+    rgba = Gdk::RGBA.new(0.1, 0.2, 0.3, 0.5)
+    assert_equal("rgba(26,51,77,0.5)", rgba.to_s)
+  end
+end

data/test/test-gdk-window-attr.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2013  Ruby-GNOME2 Project Team
+#
+# 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
+
+class TestGdkWindowAttr < Test::Unit::TestCase
+  include GdkTestUtils
+
+  def test_initialize
+    attrs = Gdk::WindowAttr.new(100, 100, :input_only, :temp)
+    assert_equal([
+                   100,
+                   100,
+                   Gdk::Window::WindowClass::INPUT_ONLY,
+                   Gdk::Window::Type::TEMP,
+                 ],
+                 [attrs.width, attrs.height, attrs.wclass, attrs.window_type])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gdk3
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atk
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: pango
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.5
 description: Ruby/GDK3 is a Ruby binding of GDK-3.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -109,6 +109,13 @@ files:
 - ext/gdk3/rbgdkwindowattr.c
 - ext/gdk3/rbgdkx11.c
 - ext/gdk3/rbgdkx11x11window.c
+- test/gdk-test-utils.rb
+- test/run-test.rb
+- test/test-gdk-color.rb
+- test/test-gdk-geometry.rb
+- test/test-gdk-rectangle.rb
+- test/test-gdk-rgba.rb
+- test/test-gdk-window-attr.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: []
 post_install_message: This library is experimental.