gdk3 2.2.5-x86-mingw32 → 3.0.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b7e6f66703f794b9d660f9d761e0d4d33e50367
-  data.tar.gz: 91acbb25b76c5b4d85044a127dcbb4176bf3b418
+  metadata.gz: c21acd7ce4c348cf8369608327641dd087a2b14c
+  data.tar.gz: a1350e9def2be9cdb4cc124e12b7744c6aa483d5
 SHA512:
-  metadata.gz: 124fd9a8bc27f4f499a7e9d126e0b8a31f6962f48cb42a15ea6c5bbe5643c2618f4e905ba56e1a237f69371b12d3661b50bc300cb20e1b418c73fcaf682460c0
-  data.tar.gz: a5eb18427897f7f7b415acac96902e8eec737e6d62ca13eee42a8ba9d2be803d6b8ddebbf0c4bdaeec25d37bff84b1baf1a3af9e2322537c39a3aaa94c581666
+  metadata.gz: 3ba41eded72f5ff9586ee4063af5e01a3fdf2dff594f3b6b42285a3d24d08089e4ef190a7e95607d6134407e5a5fd91b5ef3f19d436765e07c8dba9accebeb35
+  data.tar.gz: 9e85292268cc6606a32a94ed9dd90542d6da243f73ebeb12c83cda7ec2356d9a77d3e1f7c685bbbbe80f69b5e3aea6e097a8f89e19d321a0f02cd9524d733350

data/Rakefile

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2011-2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2011-2015  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
@@ -43,17 +43,32 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
     "gdk_pixbuf2",
   ]
   package.external_packages = [
+    {
+      :name => "libepoxy",
+      :download_base_url => "https://github.com/anholt/libepoxy/releases/download/v1.3.1",
+      :label => "Epoxy",
+      :version => "1.3.1",
+      :compression_method => "bz2",
+      :windows => {
+        :configure_args => [
+        ],
+        :built_file => "bin/libepoxy-0.dll",
+      },
+    },
     {
       :name => "gtk+",
       :download_site => :gnome,
       :label => "GTK+",
-      :version => "3.14.6",
+      :version => "3.16.6",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
           "--enable-introspection",
           "--with-included-immodules",
         ],
+        :patches => [
+          "gtk+-3.16.6-add-missing-exeext.diff",
+        ],
         :need_autoreconf => true,
         :build_concurrently => false,
         :built_file => "bin/libgdk-3-0.dll",
@@ -63,7 +78,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "adwaita-icon-theme",
       :download_site => :gnome,
       :label => "adwaita-icon-theme",
-      :version => "3.14.1",
+      :version => "3.16.2",
       :compression_method => "xz",
       :windows => {
         :configure_args => [],

data/lib/gdk3.rb

@@ -53,6 +53,9 @@ module Gdk
       end
       loader = Loader.new(self)
       loader.load("Gdk")
+      if Object.const_defined?(:Gtk) and Gtk.respond_to?(:init)
+        Gtk.init
+      end
     end
 
     def cairo_available?

data/lib/gdk3/cursor.rb

@@ -0,0 +1,31 @@
+# Copyright (C) 2015  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 Cursor
+    alias_method :initialize_raw, :initialize
+    def initialize(*args)
+      if args.last.is_a?(Hash)
+        options = args.pop
+      else
+        options = {}
+      end
+      display = options[:display] || Display.default
+
+      initialize_raw(display, *args)
+    end
+  end
+end

data/lib/gdk3/deprecated.rb

@@ -9,7 +9,7 @@ module Gdk
 
   class Cursor
     extend GLib::Deprecatable
-    define_deprecated_enums :Type
+    define_deprecated_enums :CursorType
     define_deprecated_method :pixmap?, :warn => "Don't use this method." do |_self|
       false
     end
@@ -21,7 +21,14 @@ module Gdk
   class Device
     extend GLib::Deprecatable
     define_deprecated_enums :AxisUse, 'AXIS'
-    define_deprecated_enums :ExtensionMode, 'EXTENSION_EVENTS'
+    define_deprecated_const "EXTENSION_EVENTS_NONE",
+                            :raise => "No longer available in GDK3."
+    define_deprecated_const "EXTENSION_EVENTS_ALL",
+                            :raise => "No longer available in GDK3."
+    define_deprecated_const "EXTENSION_EVENTS_CURSOR",
+                            :raise => "No longer available in GDK3."
+    define_deprecated_const "ExtensionMode",
+                            :raise => "No longer available in GDK3."
     define_deprecated_enums :InputMode, 'MODE'
     define_deprecated_enums :InputSource, 'SOURCE'
   end
@@ -39,8 +46,10 @@ module Gdk
 
   class DragContext
     extend GLib::Deprecatable
-    define_deprecated_flags :Action, 'ACTION'
-    define_deprecated_enums :Protocol, 'PROTO'
+    define_deprecated_flags :DragAction, 'ACTION'
+    define_deprecated_const :Action, "Gdk::DragAction"
+    define_deprecated_enums :DragProtocol, 'PROTO'
+    define_deprecated_const :Protocol, "Gdk::DragProtocol"
     define_deprecated_singleton_method :drag_begin, :warn => "Use 'Gdk::Window#drag_begin'." do |_self, window, targets|
       window.drag_begin(targets)
     end
@@ -53,13 +62,19 @@ module Gdk
 
   class Event
     extend GLib::Deprecatable
+
+    define_deprecated_const :CURRENT_TIME, "Gdk::CURRENT_TIME"
+
     define_deprecated_const :Mask, "Gdk::EventMask"
+    define_deprecated_enums "Gdk::EventMask"
+
     define_deprecated_const :Type, "Gdk::EventType"
+    define_deprecated_enums "Gdk::EventType"
   end
 
   class EventCrossing
     extend GLib::Deprecatable
-    define_deprecated_enums :Mode
+    define_deprecated_enums :CrossingMode
     define_deprecated_enums :NotifyType, 'NOTIFY'
   end
 
@@ -70,22 +85,23 @@ module Gdk
 
   class EventProperty
     extend GLib::Deprecatable
-    define_deprecated_enums :State, 'PROPERTY'
+    define_deprecated_enums :PropertyState, 'PROPERTY'
   end
 
   class EventScroll
     extend GLib::Deprecatable
-    define_deprecated_enums :Direction
+    define_deprecated_enums :ScrollDirection
   end
 
   class EventSetting
     extend GLib::Deprecatable
-    define_deprecated_enums :Action, 'ACTION'
+    define_deprecated_enums :SettingAction, 'ACTION'
   end
 
   class EventVisibility
     extend GLib::Deprecatable
-    define_deprecated_enums :State
+    define_deprecated_enums :VisibilityState
+    define_deprecated_const :State, "Gdk::VisibilityState"
   end
 
   class EventWindowState
@@ -126,24 +142,35 @@ module Gdk
   class Visual
     extend GLib::Deprecatable
     define_deprecated_enums :ByteOrder
-    define_deprecated_enums :Type
+    define_deprecated_enums :VisualType
+    define_deprecated_const :Type, "Gdk::VisualType"
   end
 
   class Window
     extend GLib::Deprecatable
 
     define_deprecated_const :Gravity, "Gdk::Gravity"
+    define_deprecated_enums "Gdk::Gravity"
     define_deprecated_const :AttributesType, "Gdk::WindowAttributesType"
+    define_deprecated_enums "Gdk::WindowAttributesType"
     define_deprecated_const :Edge, "Gdk::WindowEdge"
+    define_deprecated_enums "Gdk::WindowEdge"
     define_deprecated_const :FilterReturn, "Gdk::FilterReturn"
+    define_deprecated_enums "Gdk::FilterReturn"
     define_deprecated_const :Hints, "Gdk::WindowHints"
+    define_deprecated_enums "Gdk::WindowHints"
     define_deprecated_const :ModifierType, "Gdk::ModifierType"
+    define_deprecated_enums "Gdk::ModifierType"
     define_deprecated_const :Type, "Gdk::WindowType"
+    define_deprecated_enums "Gdk::WindowType"
     define_deprecated_const :TypeHint, "Gdk::WindowTypeHint"
-    define_deprecated_const :WindowClass, "Gdk::WindowWindowClass"
+    define_deprecated_enums "Gdk::WindowTypeHint"
     define_deprecated_const :Class, "Gdk::WindowWindowClass"
+    define_deprecated_enums "Gdk::WindowWindowClass"
     define_deprecated_const :WMDecoration, "Gdk::WMDecoration"
+    define_deprecated_enums "Gdk::WMDecoration"
     define_deprecated_const :WMFunction, "Gdk::WMFunction"
+    define_deprecated_enums "Gdk::WMFunction"
     define_deprecated_const :PARENT_RELATIVE, "Gdk::PARENT_RELATIVE"
     define_deprecated_method :clear, :warn => "Don't use this method."
     define_deprecated_method :clear_area, :warn => "Don't use this method."
@@ -151,6 +178,9 @@ module Gdk
     define_deprecated_method :shape_combine_mask, :warn => "Don't use this method."
     define_deprecated_method :input_shape_combine_mask, :warn => "Don't use this method."
     define_deprecated_method :set_back_pixmap, :warn => "Don't use this method."
+    define_deprecated_method :size, :warn => "Use #width and #height instead." do |_self|
+      [_self.width, _self.height]
+    end
   end
 
   class WindowAttr

data/lib/gdk3/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2013-2015  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
@@ -29,12 +29,9 @@ module Gdk
       @event_motion_class ||= @base_module.const_get(:EventMotion)
     end
 
-    def rectangle_class
-      @rectangle_class ||= @base_module.const_get(:Rectangle)
-    end
-
     def pre_load(repository, namespace)
       setup_pending_constants
+      setup_pending_rectangle_functions
       define_keyval_module
       define_selection_module
       load_cairo_rectangle_int
@@ -56,6 +53,7 @@ module Gdk
                                       "Rectangle",
                                       @base_module,
                                       :size => info.size)
+      @rectangle_class = klass
       load_fields(info, klass)
       load_methods(info, klass)
     end
@@ -72,11 +70,18 @@ module Gdk
 
     def post_load(repository, namespace)
       apply_pending_constants
+      apply_pending_rectangle_functions
       require_libraries
       convert_event_classes
       define_selection_constants
     end
 
+    def initialize_post(object)
+      super
+      return unless object.is_a?(GLib::Object)
+      self.class.reference_gobject(object, :sink => true)
+    end
+
     def setup_pending_constants
       @pending_constants = []
     end
@@ -90,12 +95,32 @@ module Gdk
       end
     end
 
+    def setup_pending_rectangle_functions
+      @pending_rectangle_get_type_function = nil
+      @pending_rectangle_functions = []
+    end
+
+    def apply_pending_rectangle_functions
+      get_type_info = @pending_rectangle_get_type_function
+      gtype = get_type_info.invoke({:arguments => []})
+      self.class.register_boxed_class_converter(gtype) do |rectangle|
+        @rectangle_class
+      end
+
+      @pending_rectangle_functions.each do |info|
+        name = info.name
+        define_method(info, @rectangle_class, name.gsub(/\Arectangle_/, ""))
+      end
+    end
+
     def require_libraries
       require "gdk3/atom"
       require "gdk3/color"
+      require "gdk3/cursor"
       require "gdk3/event"
       require "gdk3/rectangle"
       require "gdk3/rgba"
+      require "gdk3/screen"
       require "gdk3/window"
       require "gdk3/window-attr"
 
@@ -167,18 +192,19 @@ module Gdk
         "TYPE_STRING"     => "STRING",
       }
       selections.each do |key, value|
-        # TODO: Gdk::Atom.intern is not working yet.
-        #@selection_module.const_set(key, Gdk::Atom.intern(value))
+        @selection_module.const_set(key, Gdk::Atom.intern(value))
       end
     end
 
     def load_function_info(info)
       name = info.name
       case name
+      when "rectangle_get_type"
+        @pending_rectangle_get_type_function = info
+      when /\Arectangle_/
+        @pending_rectangle_functions << info
       when "init", /_get_type\z/
         # ignore
-      when /\Arectangle_/
-        define_method(info, rectangle_class, $POSTMATCH)
       when /\Apixbuf_/
         target_class = nil
         case $POSTMATCH
@@ -220,6 +246,10 @@ module Gdk
         end
       when /\Akeyval_/
         name = rubyish_method_name(info, :prefix => "keyval_")
+        case name
+        when "name"
+          name = "to_name"
+        end
         define_module_function(@keyval_module, name, info)
       else
         super

data/lib/gdk3/rectangle.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2015  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
@@ -34,5 +34,21 @@ module Gdk
         nil
       end
     end
+
+    def inspect
+      super.gsub(/>\z/) do
+        " x=#{x.inspect} y=#{y.inspect} " +
+          "width=#{width.inspect} height=#{height.inspect}>"
+      end
+    end
+
+    def to_a
+      [x, y, width, height]
+    end
+
+    def ==(other)
+      other.is_a?(self.class) and
+        self.to_a == other.to_a
+    end
   end
 end

data/lib/gdk3/rgba.rb

@@ -16,13 +16,34 @@
 
 module Gdk
   class RGBA
+    class << self
+      def parse(spec)
+        rgba = new
+        unless rgba.parse(spec)
+          available_formats = [
+            "COLOR_NAME",
+            "\#RGB",
+            "\#RRGGBB",
+            "\#RRRGGGBBB",
+            "\#RRRRGGGGBBBB",
+            "rgb(R, G, B)",
+            "rgba(R, G, B, A)",
+          ]
+          message = "invalid RGBA format: #{spec.inspect} "
+          message << "(available formats: #{available_formats.join(', ')})"
+          raise ArgumentError, message
+        end
+        rgba
+      end
+    end
+
     alias_method :initialize_raw, :initialize
-    def initialize(red, green, blue, alpha)
+    def initialize(red=nil, green=nil, blue=nil, alpha=nil)
       initialize_raw
-      self.red = red
-      self.green = green
-      self.blue = blue
-      self.alpha = alpha
+      self.red = red if red
+      self.green = green if green
+      self.blue = blue if blue
+      self.alpha = alpha || 1.0
     end
 
     def to_a

data/lib/gdk3/screen.rb

@@ -0,0 +1,40 @@
+# Copyright (C) 2015  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 Screen
+    alias_method :get_setting_raw, :get_setting
+    def get_setting(key, type=nil)
+      value = GLib::Value.new(type || GLib::Type::STRING)
+      found = get_setting_raw(key, value)
+      if found
+        value
+      else
+        nil
+      end
+    end
+
+    def get_monitor(window_or_x, y=nil)
+      if window_or_x.is_a?(Window)
+        window = window_or_x
+        get_monitor_at_window(window)
+      else
+        x = window_or_x
+        get_monitor_at_point(x, y)
+      end
+    end
+  end
+end