gtk4 3.5.0 → 4.0.1

data/lib/gtk4/dialog.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2022  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -38,16 +38,6 @@ module Gtk
       add_buttons(*buttons) if buttons
     end
 
-    alias_method :run_raw, :run
-    def run
-      response_id = run_raw
-      if response_id < 0
-        ResponseType.new(response_id)
-      else
-        response_id
-      end
-    end
-
     def add_buttons(*buttons)
       buttons.each do |text, response_id|
         add_button(text, response_id)
@@ -56,21 +46,20 @@ module Gtk
 
     alias_method :add_button_raw, :add_button
     def add_button(text, response_id)
-      case response_id
-      when Symbol
-        response_id = ResponseType.new(response_id)
-      end
-      add_button_raw(text, response_id)
+      add_button_raw(text, ResponseType.resolve(response_id))
     end
 
     alias_method :get_widget_for_response_raw, :get_widget_for_response
     def get_widget_for_response(response_id)
-      case response_id
-      when Symbol
-        response_id = ResponseType.new(response_id)
-      end
-      get_widget_for_response_raw(response_id)
+      get_widget_for_response_raw(ResponseType.resolve(response_id))
+    end
+
+    alias_method :set_default_response_raw, :set_default_response
+    def set_default_response(response_id)
+      set_default_response_raw(ResponseType.resolve(response_id))
     end
+    alias_method :default_response_raw=, :default_response=
+    alias_method :default_response=, :set_default_response
 
     if method_defined?(:use_header_bar)
       alias_method :use_header_bar_raw, :use_header_bar

data/lib/gtk4/{action.rb → entry.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2018  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
@@ -15,13 +15,16 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Gtk
-  class Action
-    alias_method :initialize_raw, :initialize
-    def initialize(name, options={})
-      initialize_raw(name,
-                     options[:label],
-                     options[:tooltip],
-                     options[:stock_id])
+  class Entry
+    # TODO: It's workaround for a GTK+ problem:
+    # It should be removed when GTK+ fix the problem.
+    # https://github.com/ruby-gnome2/ruby-gnome2/issues/1176
+    alias_method :set_attributes_raw, :set_attributes
+    def set_attributes(attrs)
+      attrs ||= Pango::AttrList.new
+      set_attributes_raw(attrs)
     end
+    remove_method :attributes=
+    alias_method :attributes=, :set_attributes
   end
 end

data/lib/gtk4/{gdk-drag-context.rb → gdk-display.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2019  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
@@ -15,15 +15,17 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Gdk # Not Gtk!
-  class DragContext
-    alias_method :finish_raw, :finish
-    def finish(options={})
-      success = options[:success]
-      success = true if success.nil?
-      delete = options[:delete]
-      delete = false if delete.nil?
-      time = options[:time] || Gdk::CURRENT_TIME
-      finish_raw(success, delete, time)
+  class Display
+    def add_style_provider(provider, priority=nil)
+      Gtk::StyleContext.add_provider_for_display(self, provider, priority)
+    end
+
+    def remove_style_provider(provider)
+      Gtk::StyleContext.remove_provider_for_display(self, provider)
+    end
+
+    def icon_theme
+      Gtk::IconTheme.get_for_display(self)
     end
   end
 end

data/lib/gtk4/icon-theme.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2022  Ruby-GNOME 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,22 +16,19 @@
 
 module Gtk
   class IconTheme
-    alias_method :choose_icon_raw, :choose_icon
-    def choose_icon(icon_names, size, flags=nil)
-      icon_names = [icon_names] unless icon_names.is_a?(Array)
-      flags ||= 0
-      choose_icon_raw(icon_names, size, flags)
-    end
-
     alias_method :lookup_icon_raw, :lookup_icon
-    def lookup_icon(icon, size, flags=nil)
+    def lookup_icon(icon, size, scale: 1, direction: :none, flags: nil)
       case icon
       when String, Symbol
-        flags ||= :generic_fallback
-        lookup_icon_raw(icon.to_s, size, flags)
+        flags ||= 0
+        lookup_icon_raw(icon.to_s, nil, size, scale, direction, flags)
+      when Array
+        icon, *fallbacks = *icon
+        flags ||= 0
+        lookup_icon_raw(icon.to_s, fallbacks, size, scale, direction, flags)
       else
         flags ||= 0
-        lookup_by_gicon(icon, size, flags)
+        lookup_by_gicon(icon, size, scale, direction, flags)
       end
     end
   end

data/lib/gtk4/image.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2022  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,96 +20,52 @@ module Gtk
     # Creates a Gtk::Image. The source of the image depends on the options
     # given.
     #
-    # @param Hash{Symbol => Gtk::Stock, String, Gtk::IconSet, Gio::Icon,
-    #                       GdkPixbuf::Pixbuf, GdkPixbuf::PixbufAnimation, Cairo::Surface,
-    #                       Fixnum}
+    # @param Hash{Symbol => String, Gio::Icon, GdkPixbuf::Pixbuf}
     #
     # @example Create an empty image.
     #   image = Gtk::Image.new
     #
     # @example Create an image from a file.
-    #   image = Gtk::Image.new :file => 'path/to/the/image.png'
-    #
-    # @example Create an image from stock.
-    #   image = Gtk::Image.new :stock => Gtk::Stock::OPEN, :size => :dialog
+    #   image = Gtk::Image.new(file: 'path/to/the/image.png')
     #
     # @example Create an image from icon name.
-    #   image = Gtk::Image.new :icon_name => 'gtk-open', :size => :dialog
+    #   image = Gtk::Image.new(icon_name: 'gtk-open')
     #
     # @example Create an image from a Gio::Icon, that itself is loaded from a
     #          file.
     #   icon = Gio::Icon.new_for_string 'path/to/the/image.png'
-    #   image = Gtk::Image.new :icon => icon, :size => :dialog
+    #   image = Gtk::Image.new(icon: icon)
     #
     # @example Create an image from from a Gio::Icon that is an Gio::ThemedIcon.
     #   icon = Gio::ThemedIcon.new 'gtk-open'
-    #   image = Gtk::Image.new :icon => icon, :size => :dialog
+    #   image = Gtk::Image.new(icon: icon)
     #
     # @example Create an image from a GdkPixbuf::Pixbuf.
     #   pixbuf = GdkPixbuf::Pixbuf.new(:file => 'path/to/the/image.png')
-    #   image = Gtk::Image.new :pixbuf => pixbuf
-    #
-    # @example Create an image from an Gtk::IconSet, that itself is created
-    #          from a GdkPixbuf::Pixbuf.
-    #   pixbuf = GdkPixbuf::Pixbuf.new(:file => 'path/to/the/image.png')
-    #   iconSet = Gtk::IconSet.new pixbuf
-    #   image = Gtk::Image.new :icon_set => iconSet, :size => :dialog
-    #
-    # @example Create an image from a GdkPixbuf::PixbufAnimation
-    #   pixAnim = GdkPixbuf::PixbufAnimation.new 'anim.gif'
-    #   image = Gtk::Image.new :animation => pixAnim
+    #   image = Gtk::Image.new(pixbuf: pixbuf)
     #
     # @example Create an image from a file in a resource file
     #   resource = Gio::Resource.load(a_resource_file)
     #   Gio::Resources.register(resource)
     #   resource_path = "/path/to/image.png"
-    #   image = Gtk::Image.new :resource => resource_path
-    #
-    # @example Create an image from a Cairo::Surface that is a
-    #          Cairo::ImageSurface.
-    #   surface = Cairo::ImageSurface.new :RGB24, 60, 60
-    #   context = Cairo::Context.new surface
-    #   context.set_source_rgb 0, 1, 0
-    #   context.rectangle 10, 10, 40, 40
-    #   context.fill.stroke
-    #   image = Gtk::Image.new :surface => surface
+    #   image = Gtk::Image.new(resource: resource_path)
     def initialize(options={})
-      stock     = options[:stock] || nil
       icon_name = options[:icon_name] || nil
-      icon_set  = options[:icon_set] || nil
       icon      = options[:icon] || options[:gicon] || nil
       file      = options[:file] || nil
       pixbuf    = options[:pixbuf] || nil
-      animation = options[:animation] || nil
-      resource  = options[:resource] ||nil
-      surface   = options[:surface] || nil
-      size      = options[:size] || nil
-
-      case size
-      when String, Symbol
-        size = IconSize.new(size)
-      else
-        size ||= IconSize::BUTTON
-      end
+      resource  = options[:resource] || nil
 
-      if stock
-        initialize_new_from_stock(stock, size)
-      elsif icon_name
-        initialize_new_from_icon_name(icon_name, size)
-      elsif icon_set
-        initialize_new_from_icon_set(icon_set, size)
+      if icon_name
+        initialize_new_from_icon_name(icon_name)
       elsif icon
-        initialize_new_from_gicon(icon, size)
+        initialize_new_from_gicon(icon)
       elsif file
         initialize_new_from_file(file)
       elsif pixbuf
         initialize_new_from_pixbuf(pixbuf)
-      elsif animation
-        initialize_new_from_animation(animation)
       elsif resource
         initialize_new_from_resource(resource)
-      elsif surface
-        initialize_new_from_surface(surface)
       else
         initialize_raw
       end

data/lib/gtk4/list-store.rb

@@ -59,5 +59,13 @@ module Gtk
       setup_iter(iter)
       iter
     end
+
+    alias_method :set_column_types_raw, :set_column_types
+    def set_column_types(*types)
+      if types.size == 1 and types[0].is_a?(Array)
+        types = types[0]
+      end
+      set_column_types_raw(types)
+    end
   end
 end

data/lib/gtk4/loader.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2022  Ruby-GNOME 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,31 +16,23 @@
 
 module Gtk
   class Loader < GObjectIntrospection::Loader
-    def initialize(base_module, init_arguments)
-      super(base_module)
-      @init_arguments = init_arguments
-    end
-
     def load
       self.version = "4.0"
       super("Gtk")
     end
 
     private
-
     def pre_load(repository, namespace)
       call_init_function(repository, namespace)
       define_version_module
+      define_methods_modules
+      setup_pending_constants
     end
 
     def call_init_function(repository, namespace)
       init_check = repository.find(namespace, "init_check")
-      arguments = [
-        [$0] + @init_arguments,
-      ]
-      succeeded, argv = init_check.invoke(arguments)
-      @init_arguments.replace(argv[1..-1]) unless argv.nil?
-      raise InitError, "failed to initialize GTK+" unless succeeded
+      succeeded = init_check.invoke([])
+      raise InitError, "failed to initialize GTK" unless succeeded
     end
 
     def define_version_module
@@ -48,25 +40,102 @@ module Gtk
       @base_module.const_set("Version", @version_module)
     end
 
+    def define_methods_modules
+      @widget_methods_module =
+        define_methods_module(:WidgetMethods)
+    end
+
+    def apply_methods_modules
+      apply_methods_module(@widget_methods_module,
+                           @base_module::Widget)
+    end
+
+    def level_bar_class
+      @level_bar_class ||= @base_module.const_get(:LevelBar)
+    end
+
+    def style_provider_module
+      @style_provider_module ||= @base_module.const_get(:StyleProvider)
+    end
+
     def post_load(repository, namespace)
+      apply_pending_constants
+      apply_methods_modules
+      require_extension
       require_libraries
     end
 
+    def require_extension
+      require "gtk4.so"
+    end
+
     def require_libraries
-      require "gtk4/box"
-      require "gtk4/builder"
-      require "gtk4/button"
-      require "gtk4/dialog"
-      require "gtk4/menu-item"
-      require "gtk4/message-dialog"
-      require "gtk4/version"
-      require "gtk4/window"
+      require_relative "gdk-display"
+
+      require_relative "about-dialog"
+      require_relative "application"
+      require_relative "binding-set"
+      require_relative "border"
+      require_relative "box"
+      require_relative "button"
+      require_relative "builder"
+      require_relative "cell-layout"
+      require_relative "color-chooser-dialog"
+      require_relative "combo-box"
+      require_relative "combo-box-text"
+      require_relative "css-provider"
+      require_relative "dialog"
+      require_relative "entry"
+      require_relative "entry-buffer"
+      require_relative "file-chooser-dialog"
+      require_relative "font-chooser-dialog"
+      require_relative "gesture-multi-press"
+      require_relative "icon-theme"
+      require_relative "icon-view"
+      require_relative "image"
+      require_relative "label"
+      require_relative "level-bar"
+      require_relative "list-store"
+      require_relative "message-dialog"
+      require_relative "paned"
+      require_relative "response-type"
+      require_relative "scale-button"
+      require_relative "scrolled-window"
+      require_relative "search-bar"
+      require_relative "spin-button"
+      require_relative "show-uri"
+      require_relative "stack"
+      require_relative "style-context"
+      require_relative "text-buffer"
+      require_relative "text-iter"
+      require_relative "text-tag"
+      require_relative "text-tag-table"
+      require_relative "text-view"
+      require_relative "toggle-button"
+      require_relative "tree-iter"
+      require_relative "tree-model"
+      require_relative "tree-model-filter"
+      require_relative "tree-model-sort"
+      require_relative "tree-path"
+      require_relative "tree-selection"
+      require_relative "tree-sortable"
+      require_relative "tree-store"
+      require_relative "tree-view"
+      require_relative "tree-view-column"
+      require_relative "version"
+      require_relative "widget"
+
+      require_relative "deprecated"
     end
 
-    def load_constant_info(info)
-      case info.name
-      when /_VERSION\z/
-        @version_module.const_set($PREMATCH, info.value)
+    def load_function_info(info)
+      name = info.name
+      case name
+      when "init", "init_check"
+        # ignore
+      when /\Atest_widget_/
+        name = $POSTMATCH
+        define_method(info, @widget_methods_module, name)
       else
         super
       end
@@ -75,11 +144,68 @@ module Gtk
     def rubyish_method_name(function_info, options={})
       name = function_info.name
       case name
-      when /\Alist_(child_properties|style_properties)\z/
-        $1
+      when "list_toplevels"
+        # To avoid conflict with gtk_window_get_toplevels()
+        name
+      else
+        super
+      end
+    end
+
+    def load_method_info(info, klass, method_name)
+      case klass.name
+      when "Gtk::Builder"
+        case method_name
+        when "get_type_from_name"
+          method_name = "get_type"
+        end
+      when "Gtk::Image"
+        method_name = method_name.gsub(/\Agicon/, "icon")
+      when "Gtk::TreePath"
+        case method_name
+        when "next", "prev", "up", "down"
+          method_name += "!"
+        end
+      when "Gtk::TreeSelection"
+        case method_name
+        when "selected_foreach"
+          method_name = "each"
+        end
+      when "Gtk::TreeView"
+        case method_name
+        when "row_expanded"
+          method_name += "?"
+        end
+      end
+      super(info, klass, method_name)
+    end
+
+    def load_constant_info(info)
+      case info.name
+      when /_VERSION\z/
+        @version_module.const_set($PREMATCH, info.value)
+      when /\ALEVEL_BAR_/
+        @pending_constants << info
+      when /\ASTYLE_PROVIDER_/
+        @pending_constants << info
       else
         super
       end
     end
+
+    def setup_pending_constants
+      @pending_constants = []
+    end
+
+    def apply_pending_constants
+      @pending_constants.each do |info|
+        case info.name
+        when /\ALEVEL_BAR_/
+          level_bar_class.const_set($POSTMATCH, info.value)
+        when /\ASTYLE_PROVIDER_/
+          style_provider_module.const_set($POSTMATCH, info.value)
+        end
+      end
+    end
   end
 end

data/lib/gtk4/message-dialog.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2018  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

data/lib/gtk4/paned.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2022  Ruby-GNOME 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,22 +16,28 @@
 
 module Gtk
   class Paned
-    alias_method :pack1_raw, :pack1
-    def pack1(child, options={})
+    alias_method :set_start_child_raw, :set_start_child
+    def set_start_child(child, options=nil)
+      set_start_child_raw(child)
+      return self unless options
+
       resize = options[:resize]
-      resize = false if resize.nil?
+      set_resize_start_child(resize) unless resize.nil?
       shrink = options[:shrink]
-      shrink = true if shrink.nil?
-      pack1_raw(child, resize, shrink)
+      set_shrink_start_child(shrink) unless shrink.nil?
+      self
     end
 
-    alias_method :pack2_raw, :pack2
-    def pack2(child, options={})
+    alias_method :set_end_child_raw, :set_end_child
+    def set_end_child(child, options=nil)
+      set_end_child_raw(child)
+      return self unless options
+
       resize = options[:resize]
-      resize = true if resize.nil?
+      set_resize_end_child(resize) unless resize.nil?
       shrink = options[:shrink]
-      shrink = true if shrink.nil?
-      pack2_raw(child, resize, shrink)
+      set_shrink_end_child(shrink) unless shrink.nil?
+      self
     end
   end
 end

data/lib/gtk4/{clipboard.rb → response-type.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2020  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,11 +15,16 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Gtk
-  class Clipboard
-    alias_method :set_text_raw, :set_text
-    def set_text(text)
-      set_text_raw(text, text.bytesize)
+  class ResponseType
+    class << self
+      def resolve(id)
+        case id
+        when Symbol
+          new(id)
+        else
+          id
+        end
+      end
     end
-    alias_method :text=, :set_text
   end
 end

data/lib/gtk4/ruby-builder-scope.rb

@@ -0,0 +1,47 @@
+# Copyright (C) 2022  Ruby-GNOME 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 Gtk
+  class RubyBuilderScope < GLib::Object
+    type_register
+
+    include Gtk::BuilderScope
+
+    def virtual_do_get_type_from_name(builder, type_name)
+      GLib::Type.try_convert(type_name)
+    end
+
+    def virtual_do_get_type_from_function(builder, function_name)
+      builder.__send__(normalize_name(function_name))
+    end
+
+    def virtual_do_create_closure(builder,
+                                  function_name,
+                                  flags,
+                                  object)
+      object ||= builder.current_object || builder
+      method_name = normalize_name(function_name)
+      GLib::Closure.new do |*args|
+        object.__send__(method_name, *args)
+      end
+    end
+
+    private
+    def normalize_name(name)
+      name.gsub(/[-\s]+/, "_")
+    end
+  end
+end

data/lib/gtk4/scale-button.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2015-2022  Ruby-GNOME Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -18,18 +18,11 @@ module Gtk
   class ScaleButton
     alias_method :initialize_raw, :initialize
     def initialize(options={})
-      icon_size = options[:icon_size] || :button
-      min       = options[:min]       || 0
-      max       = options[:max]       || 100
-      step      = options[:step]      || 2
-      icons     = options[:icons]     || nil
-
-      case icon_size
-      when Symbol, String
-        icon_size = IconSize.new(icon_size.to_s)
-      end
-
-      initialize_raw(icon_size, min, max, step, icons)
+      min       = options[:min]   || 0
+      max       = options[:max]   || 100
+      step      = options[:step]  || 2
+      icons     = options[:icons] || nil
+      initialize_raw(min, max, step, icons)
     end
   end
 end