gdk3 2.2.0 → 2.2.1

data/lib/gdk3.rb

@@ -1,3 +1,62 @@
-require 'gdk3/base'
-require 'gdk3/deprecated'
+# Copyright (C) 2013-2014  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 "gobject-introspection"
+require "cairo-gobject"
+require "atk"
+require "pango"
+require "gdk_pixbuf2"
+
+base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
+vendor_dir = base_dir + "vendor" + "local"
+vendor_bin_dir = vendor_dir + "bin"
+GLib.prepend_dll_path(vendor_bin_dir)
+vendor_girepository_dir = vendor_dir + "lib" + "girepository-1.0"
+GObjectIntrospection.prepend_typelib_path(vendor_girepository_dir)
+
+require "gdk3/loader"
+
+module Gdk
+  LOG_DOMAIN = "Gdk"
+  GLib::Log.set_log_domain(LOG_DOMAIN)
+
+  class Error < StandardError
+  end
+
+  class << self
+    def const_missing(name)
+      init
+      if const_defined?(name)
+        const_get(name)
+      else
+        super
+      end
+    end
+
+    def init
+      class << self
+        remove_method(:init)
+        remove_method(:const_missing)
+      end
+      loader = Loader.new(self)
+      loader.load("Gdk")
+    end
+
+    def cairo_available?
+      true
+    end
+  end
+end

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2014  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
@@ -21,15 +21,20 @@ 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")
+cairo_gobject_base = File.join(ruby_gnome2_base, "cairo-gobject")
 pango_base = File.join(ruby_gnome2_base, "pango")
 gdk_pixbuf_base = File.join(ruby_gnome2_base, "gdk_pixbuf2")
+gobject_introspection_base = File.join(ruby_gnome2_base, "gobject-introspection")
 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|
+[
+  [glib_base, "glib2"],
+  [atk_base, "atk"],
+  [cairo_gobject_base, "cairo-gobject"],
+  [pango_base, "pango"],
+  [gdk_pixbuf_base, "gdk_pixbuf2"],
+  [gobject_introspection_base, "gobject-introspection"]
+].each do |target, module_name|
   if system("which make > /dev/null")
     `make -C #{target.dump} > /dev/null` or exit(false)
   end
@@ -37,6 +42,8 @@ gdk3_base = File.join(ruby_gnome2_base, "gdk3")
   $LOAD_PATH.unshift(File.join(target, "lib"))
 end
 
+$LOAD_PATH.unshift(File.join(gdk3_base, "lib"))
+
 $LOAD_PATH.unshift(File.join(glib_base, "test"))
 require "glib-test-init"
 
@@ -44,5 +51,7 @@ $LOAD_PATH.unshift(File.join(gdk3_base, "test"))
 require "gdk-test-utils"
 
 require "gdk3"
+Gdk.init
+Gdk.init_check([$0])
 
 exit Test::Unit::AutoRunner.run(true)

data/test/test-gdk-cairo.rb

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2014  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 "stringio"
+
+class TestGdkCairo < Test::Unit::TestCase
+  def setup
+    output = StringIO.new
+    surface = Cairo::PDFSurface.new(output, 10, 10)
+    @context = Cairo::Context.new(surface)
+  end
+
+  def test_set_source_color
+    color = Gdk::Color.new(0xffff, 0x0000, 0xffff)
+    @context.source_color = color
+    assert_equal(Cairo::Color::RGB.new(1.0, 0.0, 1.0),
+                 @context.source.color)
+  end
+
+  def test_set_source_rgba
+    rgba = Gdk::RGBA.new(0.1, 0.2, 0.3, 0.4)
+    @context.source_rgba = rgba
+    assert_equal(Cairo::Color::RGB.new(0.1, 0.2, 0.3, 0.4),
+                 @context.source.color)
+  end
+end

data/test/test-gdk-event-type.rb

@@ -0,0 +1,25 @@
+# Copyright (C) 2014  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 TestGdkEventType < Test::Unit::TestCase
+  def test_2button_press
+    assert_equal("2button-press", Gdk::EventType::BUTTON2_PRESS.nick)
+  end
+
+  def test_3button_press
+    assert_equal("3button-press", Gdk::EventType::BUTTON3_PRESS.nick)
+  end
+end

data/test/test-gdk-event.rb

@@ -30,9 +30,13 @@ class TestGdkEvent < Test::Unit::TestCase
   module TestAnyMethods
     def test_window
       assert_nil(event.window)
+      attributes = Gdk::WindowAttr.new(100, 100, :input_only, :temp)
+      window = Gdk::Window.new(nil, attributes, 0)
+      event.window = window
+      assert_equal(window, event.window)
     end
 
-    def test_send_event
+    def test_send_event?
       assert_false(event.send_event?)
     end
   end
@@ -50,12 +54,12 @@ class TestGdkEvent < Test::Unit::TestCase
 
     def test_delete
       assert_equal("GDK_DELETE",
-                   Gdk::EventAny.new(:delete).event_type.name)
+                   Gdk::EventAny.new(:delete).type.name)
     end
 
     def test_destroy
       assert_equal("GDK_DESTROY",
-                   Gdk::EventAny.new(:destroy).event_type.name)
+                   Gdk::EventAny.new(:destroy).type.name)
     end
   end
 
@@ -72,12 +76,12 @@ class TestGdkEvent < Test::Unit::TestCase
 
     def test_key_press
       assert_equal("GDK_KEY_PRESS",
-                   Gdk::EventKey.new(:key_press).event_type.name)
+                   Gdk::EventKey.new(:key_press).type.name)
     end
 
     def test_key_release
       assert_equal("GDK_KEY_RELEASE",
-                   Gdk::EventKey.new(:key_release).event_type.name)
+                   Gdk::EventKey.new(:key_release).type.name)
     end
 
     def test_time
@@ -106,22 +110,22 @@ class TestGdkEvent < Test::Unit::TestCase
 
     def test_button_press
       assert_equal("GDK_BUTTON_PRESS",
-                   Gdk::EventButton.new(:button_press).event_type.name)
+                   Gdk::EventButton.new(:button_press).type.name)
     end
 
     def test_button2_press
       assert_equal("GDK_2BUTTON_PRESS",
-                   Gdk::EventButton.new(:button2_press).event_type.name)
+                   Gdk::EventButton.new(:button2_press).type.name)
     end
 
     def test_button3_press
       assert_equal("GDK_3BUTTON_PRESS",
-                   Gdk::EventButton.new(:button3_press).event_type.name)
+                   Gdk::EventButton.new(:button3_press).type.name)
     end
 
     def test_button_release
       assert_equal("GDK_BUTTON_RELEASE",
-                   Gdk::EventButton.new(:button_release).event_type.name)
+                   Gdk::EventButton.new(:button_release).type.name)
     end
 
     def test_time
@@ -188,28 +192,26 @@ class TestGdkEvent < Test::Unit::TestCase
 
     def test_touch_begin
       assert_equal("GDK_TOUCH_BEGIN",
-                   Gdk::EventTouch.new(:touch_begin).event_type.name)
+                   Gdk::EventTouch.new(:touch_begin).type.name)
     end
 
     def test_touch_update
       assert_equal("GDK_TOUCH_UPDATE",
-                   Gdk::EventTouch.new(:touch_update).event_type.name)
+                   Gdk::EventTouch.new(:touch_update).type.name)
     end
 
     def test_touch_cancel
       assert_equal("GDK_TOUCH_CANCEL",
-                   Gdk::EventTouch.new(:touch_cancel).event_type.name)
+                   Gdk::EventTouch.new(:touch_cancel).type.name)
     end
 
     def test_touch_end
       assert_equal("GDK_TOUCH_END",
-                   Gdk::EventTouch.new(:touch_end).event_type.name)
+                   Gdk::EventTouch.new(:touch_end).type.name)
     end
 
     def test_emulating_pointer
-      assert_nothing_raised do
-        @touch.emulating_pointer
-      end
+      assert_boolean(@touch.emulating_pointer?)
     end
 
     def test_device
@@ -231,7 +233,7 @@ class TestGdkEvent < Test::Unit::TestCase
     include TestAnyMethods
 
     def setup
-      @scroll = Gdk::EventScroll.new
+      @scroll = Gdk::EventScroll.new(:scroll)
     end
 
     def event
@@ -255,7 +257,7 @@ class TestGdkEvent < Test::Unit::TestCase
     end
 
     def test_direction
-      assert_kind_of(Gdk::EventScroll::Direction, @scroll.direction)
+      assert_kind_of(Gdk::ScrollDirection, @scroll.direction)
     end
 
     def test_x_root
@@ -271,7 +273,7 @@ class TestGdkEvent < Test::Unit::TestCase
     include TestAnyMethods
 
     def setup
-      @motion = Gdk::EventMotion.new
+      @motion = Gdk::EventMotion.new(:motion_notify)
     end
 
     def event
@@ -321,7 +323,7 @@ class TestGdkEvent < Test::Unit::TestCase
     end
 
     def test_state
-      assert_kind_of(Gdk::EventVisibility::State, @visibility.state)
+      assert_kind_of(Gdk::VisibilityState, @visibility.state)
     end
   end
 
@@ -338,12 +340,12 @@ class TestGdkEvent < Test::Unit::TestCase
 
     def test_enter_notify
       assert_equal("GDK_ENTER_NOTIFY",
-                   Gdk::EventCrossing.new(:enter_notify).event_type.name)
+                   Gdk::EventCrossing.new(:enter_notify).type.name)
     end
 
     def test_leave_notify
       assert_equal("GDK_LEAVE_NOTIFY",
-                   Gdk::EventCrossing.new(:leave_notify).event_type.name)
+                   Gdk::EventCrossing.new(:leave_notify).type.name)
     end
 
     def test_time
@@ -351,13 +353,11 @@ class TestGdkEvent < Test::Unit::TestCase
     end
 
     def test_x
-      # TODO: Is Float better?
-      assert_kind_of(Integer, @crossing.x)
+      assert_kind_of(Float, @crossing.x)
     end
 
     def test_y
-      # TODO: Is Float better?
-      assert_kind_of(Integer, @crossing.y)
+      assert_kind_of(Float, @crossing.y)
     end
 
     def test_x_root
@@ -369,7 +369,7 @@ class TestGdkEvent < Test::Unit::TestCase
     end
 
     def test_mode
-      assert_kind_of(Gdk::EventCrossing::Mode, @crossing.mode)
+      assert_kind_of(Gdk::CrossingMode, @crossing.mode)
     end
 
     def test_detail
@@ -385,7 +385,7 @@ class TestGdkEvent < Test::Unit::TestCase
     include TestAnyMethods
 
     def setup
-      @focus = Gdk::EventFocus.new
+      @focus = Gdk::EventFocus.new(:focus_change)
     end
 
     def event
@@ -401,7 +401,7 @@ class TestGdkEvent < Test::Unit::TestCase
     include TestAnyMethods
 
     def setup
-      @configure = Gdk::EventConfigure.new
+      @configure = Gdk::EventConfigure.new(:configure)
     end
 
     def event
@@ -429,7 +429,7 @@ class TestGdkEvent < Test::Unit::TestCase
     include TestAnyMethods
 
     def setup
-      @property = Gdk::EventProperty.new
+      @property = Gdk::EventProperty.new(:property_notify)
     end
 
     def event
@@ -447,7 +447,7 @@ class TestGdkEvent < Test::Unit::TestCase
     end
 
     def test_state
-      assert_equal(Gdk::EventProperty::State::NEW_VALUE, @property.state)
+      assert_equal(Gdk::PropertyState::NEW_VALUE, @property.state)
     end
   end
 
@@ -464,17 +464,17 @@ class TestGdkEvent < Test::Unit::TestCase
 
     def test_selection_clear
       assert_equal("GDK_SELECTION_CLEAR",
-                   Gdk::EventSelection.new(:selection_clear).event_type.name)
+                   Gdk::EventSelection.new(:selection_clear).type.name)
     end
 
     def test_selection_notify
       assert_equal("GDK_SELECTION_NOTIFY",
-                   Gdk::EventSelection.new(:selection_notify).event_type.name)
+                   Gdk::EventSelection.new(:selection_notify).type.name)
     end
 
     def test_selection_request
       assert_equal("GDK_SELECTION_REQUEST",
-                   Gdk::EventSelection.new(:selection_request).event_type.name)
+                   Gdk::EventSelection.new(:selection_request).type.name)
     end
 
     def test_selection
@@ -513,32 +513,32 @@ class TestGdkEvent < Test::Unit::TestCase
 
     def test_drag_enter
       assert_equal("GDK_DRAG_ENTER",
-                   Gdk::EventDND.new(:drag_enter).event_type.name)
+                   Gdk::EventDND.new(:drag_enter).type.name)
     end
 
     def test_drag_leave
       assert_equal("GDK_DRAG_LEAVE",
-                   Gdk::EventDND.new(:drag_leave).event_type.name)
+                   Gdk::EventDND.new(:drag_leave).type.name)
     end
 
     def test_drag_motion
       assert_equal("GDK_DRAG_MOTION",
-                   Gdk::EventDND.new(:drag_motion).event_type.name)
+                   Gdk::EventDND.new(:drag_motion).type.name)
     end
 
     def test_drag_status
       assert_equal("GDK_DRAG_STATUS",
-                   Gdk::EventDND.new(:drag_status).event_type.name)
+                   Gdk::EventDND.new(:drag_status).type.name)
     end
 
     def test_drop_start
       assert_equal("GDK_DROP_START",
-                   Gdk::EventDND.new(:drop_start).event_type.name)
+                   Gdk::EventDND.new(:drop_start).type.name)
     end
 
     def test_drop_finished
       assert_equal("GDK_DROP_FINISHED",
-                   Gdk::EventDND.new(:drop_finished).event_type.name)
+                   Gdk::EventDND.new(:drop_finished).type.name)
     end
 
     def test_context
@@ -573,12 +573,12 @@ class TestGdkEvent < Test::Unit::TestCase
 
     def test_proximity_in
       assert_equal("GDK_PROXIMITY_IN",
-                   Gdk::EventProximity.new(:proximity_in).event_type.name)
+                   Gdk::EventProximity.new(:proximity_in).type.name)
     end
 
     def test_proximity_out
       assert_equal("GDK_PROXIMITY_OUT",
-                   Gdk::EventProximity.new(:proximity_out).event_type.name)
+                   Gdk::EventProximity.new(:proximity_out).type.name)
     end
 
     def test_time
@@ -596,7 +596,7 @@ class TestGdkEvent < Test::Unit::TestCase
     include TestAnyMethods
 
     def setup
-      @window_state = Gdk::EventWindowState.new
+      @window_state = Gdk::EventWindowState.new(:window_state)
     end
 
     def event
@@ -620,7 +620,7 @@ class TestGdkEvent < Test::Unit::TestCase
     include TestAnyMethods
 
     def setup
-      @setting = Gdk::EventSetting.new
+      @setting = Gdk::EventSetting.new(:setting)
     end
 
     def event
@@ -642,7 +642,7 @@ class TestGdkEvent < Test::Unit::TestCase
 
   class TestOwnerChange < self
     def setup
-      @owner_change = Gdk::EventOwnerChange.new
+      @owner_change = Gdk::EventOwnerChange.new(:owner_change)
     end
 
     def event
@@ -680,7 +680,7 @@ class TestGdkEvent < Test::Unit::TestCase
     include TestAnyMethods
 
     def setup
-      @grab_broken = Gdk::EventGrabBroken.new
+      @grab_broken = Gdk::EventGrabBroken.new(:grab_broken)
     end
 
     def event
@@ -696,9 +696,7 @@ class TestGdkEvent < Test::Unit::TestCase
     end
 
     def test_grab_window
-      assert_nothing_raised do
-        @grab_broken.grab_window
-      end
+      assert_nil(@grab_broken.grab_window)
     end
   end
 end

data/test/test-gdk-keyval.rb

@@ -0,0 +1,21 @@
+# Copyright (C) 2014  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 TestGdkKeyval < Test::Unit::TestCase
+  def test_consntant_name
+    assert_equal("a".unpack("c")[0], Gdk::Keyval::KEY_a)
+  end
+end

data/test/test-gdk-pixbuf.rb

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2014  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 TestGdkPixbuf < Test::Unit::TestCase
+  def test_window
+    gdk_window = Gdk.default_root_window
+    src_x = 0
+    src_y = 0
+    width = 290
+    height = 200
+
+    pixbuf = gdk_window.to_pixbuf(src_x,
+                                  src_y,
+                                  width,
+                                  height)
+    assert_equal([width, height],
+                 [pixbuf.width, pixbuf.height])
+  end
+
+  def test_surface
+    surface = Cairo::ImageSurface.new(:argb32, 290, 200)
+    src_x = 0
+    src_y = 0
+    width = 290
+    height = 200
+
+    pixbuf = surface.to_pixbuf(src_x,
+                               src_y,
+                               width,
+                               height)
+    assert_equal([width, height],
+                 [pixbuf.width, pixbuf.height])
+  end
+end

data/test/test-gdk-rectangle.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2014  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
@@ -17,8 +17,39 @@
 # 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)
+  def test_intersect
+    rectangle1 = Gdk::Rectangle.new(0, 10, 20, 30)
+    rectangle2 = Gdk::Rectangle.new(5, 15, 10, 20)
+    intersected = rectangle1.intersect(rectangle2)
+    assert_equal([
+                   5,
+                   15,
+                   10,
+                   20,
+                 ],
+                 [
+                   intersected.x,
+                   intersected.y,
+                   intersected.width,
+                   intersected.height,
+                 ])
+  end
+
+  def test_union
+    rectangle1 = Gdk::Rectangle.new(0, 10, 20, 30)
+    rectangle2 = Gdk::Rectangle.new(5, 15, 40, 20)
+    unioned_rectangle = rectangle1.union(rectangle2)
+    assert_equal([
+                   0,
+                   10,
+                   45,
+                   30,
+                 ],
+                 [
+                   unioned_rectangle.x,
+                   unioned_rectangle.y,
+                   unioned_rectangle.width,
+                   unioned_rectangle.height,
+                 ])
   end
 end

data/test/test-gdk-rgba.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2014  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
@@ -21,4 +21,9 @@ class TestGdkRGBA < Test::Unit::TestCase
     rgba = Gdk::RGBA.new(0.2, 0.4, 0.6, 0.5)
     assert_equal("rgba(51,102,153,0.5)", rgba.to_s)
   end
+
+  def test_to_a
+    rgba = Gdk::RGBA.new(0.2, 0.4, 0.6, 0.5)
+    assert_equal([0.2, 0.4, 0.6, 0.5], rgba.to_a)
+  end
 end

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

@@ -24,7 +24,7 @@ class TestGdkWindowAttr < Test::Unit::TestCase
     assert_equal([
                    100,
                    100,
-                   Gdk::Window::WindowClass::INPUT_ONLY,
+                   Gdk::Window::Class::INPUT_ONLY,
                    Gdk::Window::Type::TEMP,
                  ],
                  [attrs.width, attrs.height, attrs.wclass, attrs.window_type])