gdk3 3.1.1-x86-mingw32 → 3.1.2-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ae1145fe44c6d63aaaeddb04491ba10d5d69674
-  data.tar.gz: fe797328c7dc9e7f7b9a790eb9645f663fd03ec1
+  metadata.gz: 81e320ed5c76b5ed7681f786cbaee01c197cb8f7
+  data.tar.gz: 913e8476d4e436b210daafa092318db002cf818f
 SHA512:
-  metadata.gz: d80f6cf93c120db9bfcb73d3042f06b2830114d444ae0f17ba70cc537ad087967eea03ba3ba1b29e75470e6023b26615599f97251dbf07bc289ac781cb4b1144
-  data.tar.gz: b4ef3d76ebf343b36ce9fda72db6d542e05e0b62487b8f4ba35d0c1bdf5e23549c78c26ac8b231f6bc4f05ee6d1842d44dbb48f7443aba67359f14569c0d3ab9
+  metadata.gz: d9b107450413c37f8505e0fa8a0d2c7af19c6ea33210f9aacaec9eb9a1593c3574641b17eb4d27a86e7da6c283a75ce4cfe86063297df85c85c40bda88860d89
+  data.tar.gz: f0602c0d42191176d705f345d2f44253adb8fd1fb632ab368a43800b2fa9d44bd3d21fe0ea5a3c01c63a248b1e88494094ce1d11990bc1359fc17889529769db

data/Rakefile

@@ -59,7 +59,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "gtk+",
       :download_site => :gnome,
       :label => "GTK+",
-      :version => "3.22.7",
+      :version => "3.22.12",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -89,7 +89,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "adwaita-icon-theme",
       :download_site => :gnome,
       :label => "adwaita-icon-theme",
-      :version => "3.22.0",
+      :version => "3.24.0",
       :compression_method => "xz",
       :windows => {
         :use_gobject_introspection => false,

data/dependency-check/Rakefile

@@ -0,0 +1,43 @@
+# Copyright (C) 2017  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 "pkg-config"
+require "native-package-installer"
+
+case RUBY_PLATFORM
+when /mingw|mswin/
+  task :default => "nothing"
+else
+  task :default => "dependency:check"
+end
+
+task :nothing do
+end
+
+namespace :dependency do
+  desc "Check dependency"
+  task :check do
+    unless PKGConfig.check_version?("gdk-3.0")
+      unless NativePackageInstaller.install(:altlinux => "libgtk+3-devel",
+                                            :debian => "libgtk-3-dev",
+                                            :fedora => "gtk3-devel",
+                                            :homebrew => "gtk+3",
+                                            :macports => "gtk3")
+        exit(false)
+      end
+    end
+  end
+end

data/lib/gdk3.rb

@@ -28,6 +28,7 @@ vendor_girepository_dir = vendor_dir + "lib" + "girepository-1.0"
 GObjectIntrospection.prepend_typelib_path(vendor_girepository_dir)
 
 require "gdk3/loader"
+require "gdk3/x11-loader"
 
 module Gdk
   LOG_DOMAIN = "Gdk"
@@ -53,7 +54,9 @@ module Gdk
         remove_method(:const_missing)
       end
       loader = Loader.new(self)
-      loader.load("Gdk")
+      loader.load
+      x11_loader = X11Loader.new(self)
+      x11_loader.load
       if Object.const_defined?(:Gtk) and Gtk.respond_to?(:init)
         Gtk.init
       end

data/lib/gdk3/event-readers.rb

@@ -0,0 +1,117 @@
+# Copyright (C) 2017  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
+
+module Gdk
+  module EventAxisReader
+    def get_axis(type)
+      found, value = super(type)
+      if found
+        value
+      else
+        nil
+      end
+    end
+  end
+
+  module EventButtonReader
+    def button
+      found, value = super
+      if found
+        value
+      else
+        nil
+      end
+    end
+  end
+
+  module EventStateReader
+    def state
+      found, value = super
+      if found
+        value
+      else
+        nil
+      end
+    end
+  end
+
+  module EventCoordsReader
+    def coords
+      found, x, y = super
+      if found
+        [x, y]
+      else
+        nil
+      end
+    end
+
+    def x
+      (coords || [])[0]
+    end
+
+    def y
+      (coords || [])[1]
+    end
+
+    def get_distance(other_event)
+      calculated, distance = Event.get_distance(self, other_event)
+      if calculated
+        distance
+      else
+        nil
+      end
+    end
+
+    def get_angle(other_event)
+      calculated, angle = Event.get_angle(self, other_event)
+      if calculated
+        angle
+      else
+        nil
+      end
+    end
+
+    def center
+      calculated, x, y = super
+      if calculated
+        [x, y]
+      else
+        nil
+      end
+    end
+  end
+
+  module EventRootCoordsReader
+    def root_coords
+      found, x, y = super
+      if found
+        [x, y]
+      else
+        nil
+      end
+    end
+
+    def x_root
+      (root_coords || [])[0]
+    end
+    alias_method :root_x, :x_root
+
+    def y_root
+      (root_coords || [])[1]
+    end
+    alias_method :root_y, :y_root
+  end
+end

data/lib/gdk3/event.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2017  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
@@ -28,6 +28,13 @@ module Gdk
     end
   end
 
+  class EventButton
+    def click_count
+      _, number = get_click_count
+      number
+    end
+  end
+
   class EventFocus
     alias_method :in_raw=, :in=
     def in=(value)
@@ -45,4 +52,50 @@ module Gdk
       not in_raw.zero?
     end
   end
+
+  class EventKey
+    alias_method :keyval_raw, :keyval
+    def keyval
+      found, value = keyval_raw
+      if found
+        value
+      else
+        nil
+      end
+    end
+
+    alias_method :keycode_raw, :keycode
+    def keycode
+      found, value = keycode_raw
+      if found
+        value
+      else
+        nil
+      end
+    end
+  end
+
+  class EventScroll
+    def direction
+      found, value = scroll_direction
+      if found
+        value
+      else
+        nil
+      end
+    end
+
+    def deltas
+      found, x, y = scroll_deltas
+      if found
+        [x, y]
+      else
+        nil
+      end
+    end
+
+    if method_defined?(:scroll_stop_event?)
+      alias_method :stop_event?, :scroll_stop_event?
+    end
+  end
 end

data/lib/gdk3/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2017  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
@@ -16,6 +16,10 @@
 
 module Gdk
   class Loader < GObjectIntrospection::Loader
+    def load
+      super("Gdk")
+    end
+
     private
     def window_class
       @window_class ||= @base_module.const_get(:Window)
@@ -34,6 +38,7 @@ module Gdk
       setup_pending_rectangle_functions
       define_keyval_module
       define_selection_module
+      require_pre_libraries
     end
 
     def define_keyval_module
@@ -46,10 +51,14 @@ module Gdk
       @base_module.const_set("Selection", @selection_module)
     end
 
+    def require_pre_libraries
+      require "gdk3/event-readers"
+    end
+
     def post_load(repository, namespace)
       apply_pending_constants
       apply_pending_rectangle_functions
-      require_libraries
+      require_post_libraries
       convert_event_classes
       define_selection_constants
     end
@@ -111,7 +120,7 @@ module Gdk
       nil
     end
 
-    def require_libraries
+    def require_post_libraries
       require "gdk3/atom"
       require "gdk3/color"
       require "gdk3/cursor"
@@ -222,8 +231,11 @@ module Gdk
         when "request_motions"
           define_method(info, event_motion_class, "request")
         else
-          super # TODO
+          # ignore because moved to Gdk::Event
         end
+      when /\Aevents_/
+        method_name = rubyish_method_name(info, :prefix => "events_")
+        define_singleton_method(event_class, method_name, info)
       when /\Acairo_/
         name = $POSTMATCH
         case name
@@ -289,5 +301,39 @@ module Gdk
         super
       end
     end
+
+    def load_field(info, i, field_info, klass)
+      return super unless klass.name.start_with?("Gdk::Event")
+
+      field_name = field_info.name
+      if klass.name == "Gdk::Event"
+        super if field_name == "type"
+        return
+      end
+
+      case field_name
+      when "window", "direction"
+        super(info, i, field_info, klass, :readable => false)
+      when "axes"
+        klass.__send__(:prepend, EventAxisReader)
+      when "button"
+        klass.__send__(:prepend, EventButtonReader)
+      when "state"
+        case klass.name
+        when "Gdk::EventProperty", "Gdk::EventVisibility"
+          super
+        else
+          klass.__send__(:prepend, EventStateReader)
+        end
+      when "x"
+        klass.__send__(:prepend, EventCoordsReader)
+      when "x_root"
+        klass.__send__(:prepend, EventRootCoordsReader)
+      else
+        unless klass.method_defined?(field_name)
+          super
+        end
+      end
+    end
   end
 end

data/lib/gdk3/x11-loader.rb

@@ -0,0 +1,27 @@
+# Copyright (C) 2017  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
+
+module Gdk
+  class X11Loader < GObjectIntrospection::Loader
+    def load
+      begin
+        super("GdkX11")
+      rescue GObjectIntrospection::RepositoryError::TypelibNotFound
+        # Ignore. Some environments such as Windows don't have it.
+      end
+    end
+  end
+end

data/test/test-gdk-event.rb

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2013-2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2017  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
@@ -180,10 +178,8 @@ class TestGdkEvent < Test::Unit::TestCase
       assert_kind_of(Float, @touch.y)
     end
 
-    def test_axes
-      assert_nothing_raised do
-        @touch.axes
-      end
+    def test_axis
+      assert_kind_of(Numeric, @touch.get_axis(:x))
     end
 
     def test_state
@@ -409,11 +405,11 @@ class TestGdkEvent < Test::Unit::TestCase
     end
 
     def test_x
-      assert_kind_of(Integer, @configure.x)
+      assert_kind_of(Numeric, @configure.x)
     end
 
     def test_y
-      assert_kind_of(Integer, @configure.y)
+      assert_kind_of(Numeric, @configure.y)
     end
 
     def test_width
@@ -552,11 +548,11 @@ class TestGdkEvent < Test::Unit::TestCase
     end
 
     def test_x_root
-      assert_kind_of(Integer, @dnd.x_root)
+      assert_kind_of(Numeric, @dnd.x_root)
     end
 
     def test_y_root
-      assert_kind_of(Integer, @dnd.y_root)
+      assert_kind_of(Numeric, @dnd.y_root)
     end
   end