gdk3 3.0.9-x86-mingw32 → 3.1.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ce9763ff44628d6e835b1efd25e07f6ed1ef9d4
-  data.tar.gz: c8f85de3db7b56143a8d9ba851350725a1bc114c
+  metadata.gz: 64a9ed5757d53521623c913a122cbc409ed903e0
+  data.tar.gz: af9484c244655829074feba642fbe49add6e2e07
 SHA512:
-  metadata.gz: 07d90416ce982bfe00b3d425008c3de195f6278dc9645ae51d49a079903b89e1f1c4c1cbac13dd060b673e38e533f178c6c0039b43996a9122a19efa1ed8e7df
-  data.tar.gz: 36e2c4fafef455e7092decccddacc4449f7e6ce287b654a0bca06982a0a79106c93858a58311acf12f995d8be581bda88f5f86504ee2ee4e6dc19e45d747b89c
+  metadata.gz: 748f5d6198b2aa65be855321a7a08def6401678159707789c120359810cf4f8119768c13451025853b2c886a8071c84026882cc47d76fc2b9d3432e67058b33f
+  data.tar.gz: 7af559d0c02a0efe1d070a70845e810a6efe6b88f548a4f986500823fe463e2146f7739cb80d25489ea02c81aecbdb803b63fb6b2d1133fe09d39f714d96ee26

data/Rakefile

@@ -59,7 +59,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "gtk+",
       :download_site => :gnome,
       :label => "GTK+",
-      :version => "3.20.8",
+      :version => "3.22.3",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -67,6 +67,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
           "--with-included-immodules",
         ],
         :patches => [
+          "gtk+-3.22.3-add-missing-win32-winnt.diff",
         ],
         :need_autoreconf => true,
         :build_concurrently => false,
@@ -89,7 +90,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "adwaita-icon-theme",
       :download_site => :gnome,
       :label => "adwaita-icon-theme",
-      :version => "3.20",
+      :version => "3.22.0",
       :compression_method => "xz",
       :windows => {
         :use_gobject_introspection => false,

data/lib/gdk3.rb

@@ -46,6 +46,7 @@ module Gdk
       end
     end
 
+    @@init_hooks = []
     def init
       class << self
         remove_method(:init)
@@ -56,6 +57,14 @@ module Gdk
       if Object.const_defined?(:Gtk) and Gtk.respond_to?(:init)
         Gtk.init
       end
+
+      @@init_hooks.each do |hook|
+        hook.call
+      end
+    end
+
+    def on_init(&block)
+      @@init_hooks << block
     end
 
     def cairo_available?

data/lib/gdk3/event.rb

@@ -29,6 +29,16 @@ module Gdk
   end
 
   class EventFocus
+    alias_method :in_raw=, :in=
+    def in=(value)
+      if value == true
+        value = 1
+      elsif !value
+        value = 0
+      end
+      self.in_raw = value
+    end
+
     alias_method :in_raw, :in
     remove_method :in
     def in?

data/lib/gdk3/loader.rb

@@ -54,12 +54,6 @@ module Gdk
       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
@@ -82,7 +76,7 @@ module Gdk
       get_type_info = @pending_rectangle_get_type_function
       if get_type_info
         rectangle_class = load_cairo_rectangle_int
-        gtype = get_type_info.invoke({:arguments => []})
+        gtype = get_type_info.invoke([])
         self.class.register_boxed_class_converter(gtype) do |rectangle|
           rectangle_class
         end

data/vendor/local/include/gtk-3.0/gdk/gdk.h

@@ -33,10 +33,13 @@
 #include <gdk/gdkcairo.h>
 #include <gdk/gdkcursor.h>
 #include <gdk/gdkdevice.h>
+#include <gdk/gdkdevicepad.h>
+#include <gdk/gdkdevicetool.h>
 #include <gdk/gdkdevicemanager.h>
 #include <gdk/gdkdisplay.h>
 #include <gdk/gdkdisplaymanager.h>
 #include <gdk/gdkdnd.h>
+#include <gdk/gdkdrawingcontext.h>
 #include <gdk/gdkenumtypes.h>
 #include <gdk/gdkevents.h>
 #include <gdk/gdkframeclock.h>
@@ -45,6 +48,7 @@
 #include <gdk/gdkkeys.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkmain.h>
+#include <gdk/gdkmonitor.h>
 #include <gdk/gdkpango.h>
 #include <gdk/gdkpixbuf.h>
 #include <gdk/gdkproperty.h>

data/vendor/local/include/gtk-3.0/gdk/gdkcairo.h

@@ -25,13 +25,15 @@
 #include <gdk/gdkversionmacros.h>
 #include <gdk/deprecated/gdkcolor.h>
 #include <gdk/gdkrgba.h>
+#include <gdk/gdkdrawingcontext.h>
 #include <gdk/gdkpixbuf.h>
 #include <pango/pangocairo.h>
 
 G_BEGIN_DECLS
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_22_FOR(gdk_window_begin_draw_frame() and gdk_drawing_context_get_cairo_context())
 cairo_t  * gdk_cairo_create             (GdkWindow          *window);
+
 GDK_AVAILABLE_IN_ALL
 gboolean   gdk_cairo_get_clip_rectangle (cairo_t            *cr,
                                          GdkRectangle       *rect);
@@ -81,6 +83,8 @@ void       gdk_cairo_draw_from_gl (cairo_t              *cr,
                                    int                   width,
                                    int                   height);
 
+GDK_AVAILABLE_IN_3_22
+GdkDrawingContext *     gdk_cairo_get_drawing_context   (cairo_t *cr);
 
 G_END_DECLS
 

data/vendor/local/include/gtk-3.0/gdk/gdkdevice.h

@@ -47,6 +47,11 @@ typedef struct _GdkTimeCoord GdkTimeCoord;
  *     as a touchscreen or tablet. This device type has been added in 3.4.
  * @GDK_SOURCE_TOUCHPAD: the device is an indirect touch device, such
  *     as a touchpad. This device type has been added in 3.4.
+ * @GDK_SOURCE_TRACKPOINT: the device is a trackpoint. This device type has been
+ *     added in 3.22
+ * @GDK_SOURCE_TABLET_PAD: the device is a "pad", a collection of buttons,
+ *     rings and strips found in drawing tablets. This device type has been
+ *     added in 3.22.
  *
  * An enumeration describing the type of an input device in general terms.
  */
@@ -58,7 +63,9 @@ typedef enum
   GDK_SOURCE_CURSOR,
   GDK_SOURCE_KEYBOARD,
   GDK_SOURCE_TOUCHSCREEN,
-  GDK_SOURCE_TOUCHPAD
+  GDK_SOURCE_TOUCHPAD,
+  GDK_SOURCE_TRACKPOINT,
+  GDK_SOURCE_TABLET_PAD
 } GdkInputSource;
 
 /**
@@ -80,33 +87,6 @@ typedef enum
   GDK_MODE_WINDOW
 } GdkInputMode;
 
-/**
- * GdkAxisUse:
- * @GDK_AXIS_IGNORE: the axis is ignored.
- * @GDK_AXIS_X: the axis is used as the x axis.
- * @GDK_AXIS_Y: the axis is used as the y axis.
- * @GDK_AXIS_PRESSURE: the axis is used for pressure information.
- * @GDK_AXIS_XTILT: the axis is used for x tilt information.
- * @GDK_AXIS_YTILT: the axis is used for y tilt information.
- * @GDK_AXIS_WHEEL: the axis is used for wheel information.
- * @GDK_AXIS_LAST: a constant equal to the numerically highest axis value.
- *
- * An enumeration describing the way in which a device
- * axis (valuator) maps onto the predefined valuator
- * types that GTK+ understands.
- */
-typedef enum
-{
-  GDK_AXIS_IGNORE,
-  GDK_AXIS_X,
-  GDK_AXIS_Y,
-  GDK_AXIS_PRESSURE,
-  GDK_AXIS_XTILT,
-  GDK_AXIS_YTILT,
-  GDK_AXIS_WHEEL,
-  GDK_AXIS_LAST
-} GdkAxisUse;
-
 /**
  * GdkDeviceType:
  * @GDK_DEVICE_TYPE_MASTER: Device is a master (or virtual) device. There will
@@ -282,6 +262,9 @@ const gchar *gdk_device_get_product_id      (GdkDevice *device);
 GDK_AVAILABLE_IN_3_20
 GdkSeat     *gdk_device_get_seat            (GdkDevice *device);
 
+GDK_AVAILABLE_IN_3_22
+GdkAxisFlags gdk_device_get_axes            (GdkDevice *device);
+
 G_END_DECLS
 
 #endif /* __GDK_DEVICE_H__ */

data/vendor/local/include/gtk-3.0/gdk/gdkdevicepad.h

@@ -0,0 +1,74 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2016 Red Hat
+ *
+ * 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 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Carlos Garnacho <carlosg@gnome.org>
+ */
+
+#ifndef __GDK_DEVICE_PAD_H__
+#define __GDK_DEVICE_PAD_H__
+
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
+#include <gdk/gdkversionmacros.h>
+#include <gdk/gdktypes.h>
+
+G_BEGIN_DECLS
+
+#define GDK_TYPE_DEVICE_PAD         (gdk_device_pad_get_type ())
+#define GDK_DEVICE_PAD(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_DEVICE_PAD, GdkDevicePad))
+#define GDK_IS_DEVICE_PAD(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_DEVICE_PAD))
+
+typedef struct _GdkDevicePad GdkDevicePad;
+typedef struct _GdkDevicePadInterface GdkDevicePadInterface;
+
+/**
+ * GdkDevicePadFeature:
+ * @GDK_DEVICE_PAD_FEATURE_BUTTON: a button
+ * @GDK_DEVICE_PAD_FEATURE_RING: a ring-shaped interactive area
+ * @GDK_DEVICE_PAD_FEATURE_STRIP: a straight interactive area
+ *
+ * A pad feature.
+ */
+typedef enum {
+  GDK_DEVICE_PAD_FEATURE_BUTTON,
+  GDK_DEVICE_PAD_FEATURE_RING,
+  GDK_DEVICE_PAD_FEATURE_STRIP
+} GdkDevicePadFeature;
+
+GDK_AVAILABLE_IN_3_22
+GType gdk_device_pad_get_type          (void) G_GNUC_CONST;
+
+GDK_AVAILABLE_IN_3_22
+gint  gdk_device_pad_get_n_groups      (GdkDevicePad *pad);
+
+GDK_AVAILABLE_IN_3_22
+gint  gdk_device_pad_get_group_n_modes (GdkDevicePad *pad,
+                                        gint          group_idx);
+
+GDK_AVAILABLE_IN_3_22
+gint  gdk_device_pad_get_n_features    (GdkDevicePad        *pad,
+                                        GdkDevicePadFeature  feature);
+
+GDK_AVAILABLE_IN_3_22
+gint  gdk_device_pad_get_feature_group (GdkDevicePad        *pad,
+                                        GdkDevicePadFeature  feature,
+                                        gint                 feature_idx);
+
+G_END_DECLS
+
+#endif /* __GDK_DEVICE_PAD_H__ */

data/vendor/local/include/gtk-3.0/gdk/gdkdevicetool.h

@@ -0,0 +1,78 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 2009 Carlos Garnacho <carlosg@gnome.org>
+ *
+ * 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 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GDK_DEVICE_TOOL_H__
+#define __GDK_DEVICE_TOOL_H__
+
+#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdk.h> can be included directly."
+#endif
+
+#include <gdk/gdkversionmacros.h>
+#include <gdk/gdktypes.h>
+
+
+G_BEGIN_DECLS
+
+#define GDK_TYPE_DEVICE_TOOL    (gdk_device_tool_get_type ())
+#define GDK_DEVICE_TOOL(o)      (G_TYPE_CHECK_INSTANCE_CAST ((o), GDK_TYPE_DEVICE_TOOL, GdkDeviceTool))
+#define GDK_IS_DEVICE_TOOL(o)   (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDK_TYPE_DEVICE_TOOL))
+
+typedef struct _GdkDeviceTool GdkDeviceTool;
+
+/**
+ * GdkDeviceToolType:
+ * @GDK_DEVICE_TOOL_TYPE_UNKNOWN: Tool is of an unknown type.
+ * @GDK_DEVICE_TOOL_TYPE_PEN: Tool is a standard tablet stylus.
+ * @GDK_DEVICE_TOOL_TYPE_ERASER: Tool is standard tablet eraser.
+ * @GDK_DEVICE_TOOL_TYPE_BRUSH: Tool is a brush stylus.
+ * @GDK_DEVICE_TOOL_TYPE_PENCIL: Tool is a pencil stylus.
+ * @GDK_DEVICE_TOOL_TYPE_AIRBRUSH: Tool is an airbrush stylus.
+ * @GDK_DEVICE_TOOL_TYPE_MOUSE: Tool is a mouse.
+ * @GDK_DEVICE_TOOL_TYPE_LENS: Tool is a lens cursor.
+ *
+ * Indicates the specific type of tool being used being a tablet. Such as an
+ * airbrush, pencil, etc.
+ *
+ * Since: 3.22
+ */
+typedef enum {
+  GDK_DEVICE_TOOL_TYPE_UNKNOWN,
+  GDK_DEVICE_TOOL_TYPE_PEN,
+  GDK_DEVICE_TOOL_TYPE_ERASER,
+  GDK_DEVICE_TOOL_TYPE_BRUSH,
+  GDK_DEVICE_TOOL_TYPE_PENCIL,
+  GDK_DEVICE_TOOL_TYPE_AIRBRUSH,
+  GDK_DEVICE_TOOL_TYPE_MOUSE,
+  GDK_DEVICE_TOOL_TYPE_LENS,
+} GdkDeviceToolType;
+
+GDK_AVAILABLE_IN_3_22
+GType gdk_device_tool_get_type (void) G_GNUC_CONST;
+
+GDK_AVAILABLE_IN_3_22
+guint64 gdk_device_tool_get_serial (GdkDeviceTool *tool);
+
+GDK_AVAILABLE_IN_3_22
+guint64 gdk_device_tool_get_hardware_id (GdkDeviceTool *tool);
+
+GDK_AVAILABLE_IN_3_22
+GdkDeviceToolType gdk_device_tool_get_tool_type (GdkDeviceTool *tool);
+
+G_END_DECLS
+
+#endif /* __GDK_DEVICE_TOOL_H__ */

data/vendor/local/include/gtk-3.0/gdk/gdkdisplay.h

@@ -31,6 +31,7 @@
 #include <gdk/gdkevents.h>
 #include <gdk/gdkdevicemanager.h>
 #include <gdk/gdkseat.h>
+#include <gdk/gdkmonitor.h>
 
 G_BEGIN_DECLS
 
@@ -51,7 +52,7 @@ const gchar * gdk_display_get_name         (GdkDisplay *display);
 
 GDK_DEPRECATED_IN_3_10
 gint        gdk_display_get_n_screens      (GdkDisplay  *display);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_20
 GdkScreen * gdk_display_get_screen         (GdkDisplay  *display,
                                             gint         screen_num);
 GDK_AVAILABLE_IN_ALL
@@ -178,6 +179,22 @@ GdkSeat * gdk_display_get_default_seat (GdkDisplay *display);
 GDK_AVAILABLE_IN_3_20
 GList   * gdk_display_list_seats       (GdkDisplay *display);
 
+GDK_AVAILABLE_IN_3_22
+int          gdk_display_get_n_monitors        (GdkDisplay *display);
+GDK_AVAILABLE_IN_3_22
+GdkMonitor * gdk_display_get_monitor           (GdkDisplay *display,
+                                                int         monitor_num);
+GDK_AVAILABLE_IN_3_22
+GdkMonitor * gdk_display_get_primary_monitor   (GdkDisplay *display);
+GDK_AVAILABLE_IN_3_22
+GdkMonitor * gdk_display_get_monitor_at_point  (GdkDisplay *display,
+                                                int         x,
+                                                int         y);
+GDK_AVAILABLE_IN_3_22
+GdkMonitor * gdk_display_get_monitor_at_window (GdkDisplay *display,
+                                                GdkWindow  *window);
+
+
 G_END_DECLS
 
 #endif  /* __GDK_DISPLAY_H__ */