gtk4 3.5.0 → 4.0.1

data/lib/gtk4/stack.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  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,39 +16,35 @@
 
 module Gtk
   class Stack
-    if method_defined?(:set_visible_child)
-      alias_method :set_visible_child_raw, :set_visible_child
-      def set_visible_child(widget_or_name, transition_type=nil)
-        case widget_or_name
-        when String
-          name = widget_or_name
-        else
-          widget = widget_or_name
-        end
+    alias_method :set_visible_child_raw, :set_visible_child
+    def set_visible_child(widget_or_name, transition_type=nil)
+      case widget_or_name
+      when String
+        name = widget_or_name
+      else
+        widget = widget_or_name
+      end
 
-        if widget
-          set_visible_child_raw(widget)
+      if widget
+        set_visible_child_raw(widget)
+      else
+        if transition_type
+          set_visible_child_full(name, transition_type)
         else
-          if transition_type
-            set_visible_child_full(name, transition_type)
-          else
-            set_visible_child_name(name)
-          end
+          set_visible_child_name(name)
         end
       end
     end
 
-    if method_defined?(:add_titled) and method_defined?(:add_named)
-      def add(widget, name=nil, title=nil)
-        if title
-          add_titled(widget, name, title)
-        elsif name
-          add_named(widget, name)
-        else
-          super(widget)
-        end
-        self
+    def add(widget, name=nil, title=nil)
+      if title
+        add_titled(widget, name, title)
+      elsif name
+        add_named(widget, name)
+      else
+        add_child(widget)
       end
+      self
     end
   end
 end

data/lib/gtk4/style-context.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
@@ -17,10 +17,26 @@
 module Gtk
   class StyleContext
     class << self
-      alias_method :reset_widgets_raw, :reset_widgets
-      def reset_widgets(screen=nil)
-        reset_widgets_raw(screen || Gdk::Screen.default)
+      def resolve_priority(priority)
+        case priority
+        when Symbol, String
+          StyleProvider.const_get("PRIORITY_#{priority.to_s.upcase}")
+        else
+          priority || StyleProvider::PRIORITY_APPLICATION
+        end
       end
+
+      alias_method :add_provider_for_display_raw, :add_provider_for_display
+      def add_provider_for_display(display, provider, priority=nil)
+        priority = resolve_priority(priority)
+        add_provider_for_display_raw(display, provider, priority)
+      end
+    end
+
+    alias_method :add_provider_raw, :add_provider
+    def add_provider(provider, priority=nil)
+      priority = self.class.resolve_priority(priority)
+      add_provider_raw(provider, priority)
     end
   end
 end

data/lib/gtk4/text-buffer.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2017  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-20122  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
@@ -22,7 +22,8 @@ module Gtk
       return nil unless succeeded
 
       properties.each do |name, value|
-        tag.__send__("#{name}=", value)
+        property_name = name.to_s.gsub(/-/, "_")
+        tag.__send__("#{property_name}=", value)
       end
 
       tag
@@ -94,7 +95,7 @@ module Gtk
     end
 
     alias_method :insert_raw,              :insert
-    alias_method :insert_pixbuf_raw,       :insert_pixbuf
+    alias_method :insert_paintable_raw,    :insert_paintable
     alias_method :insert_child_anchor_raw, :insert_child_anchor
     def insert(iter, target, *args)
       options = nil
@@ -129,8 +130,10 @@ module Gtk
         insert_interactive(iter, target, default_editable)
       else
         case target
+        when Gdk::Paintable
+          insert_paintable_raw(iter, target)
         when GdkPixbuf::Pixbuf
-          insert_pixbuf_raw(iter, target)
+          insert_paintable_raw(iter, target)
         when TextChildAnchor
           insert_text_child_anchor_raw(iter, target)
         when GLib::Bytes
@@ -143,7 +146,13 @@ module Gtk
       if tags
         start_iter = get_iter_at(:offset => start_offset)
         tags.each do |tag|
-          tag = tag_table.lookup(tag) if tag.is_a?(String)
+          if tag.is_a?(String)
+            resolved_tag = tag_table.lookup(tag)
+            if resolved_tag.nil?
+              raise ArgumentError "unknown tag: #{tag.inspect}"
+            end
+            tag = resolved_tag
+          end
           apply_tag(tag, start_iter, iter)
         end
       end
@@ -198,11 +207,6 @@ module Gtk
       end
     end
 
-    alias_method :serialize_raw, :serialize
-    def serialize(*arguments)
-      serialize_raw(*arguments).pack("C*")
-    end
-
     alias_method :selection_bounds_raw, :selection_bounds
     def selection_bounds
       selected, start_iter, end_iter = selection_bounds_raw

data/lib/gtk4/{style-properties.rb → tree-model-sort.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# Copyright (C) 2019  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,14 +15,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Gtk
-  class StyleProperties
-    alias_method :get_property_raw, :get_property
-    def get_property(key, state)
-      found, property = get_property_raw(key, state)
-      if found
-        property.value
-      else
-        nil
+  class TreeModelSort
+    if TreeModel.method_defined?(:sort_new_with_model)
+      class << self
+        def new(model)
+          model.sort_new_with_model
+        end
       end
     end
   end

data/lib/gtk4/tree-model.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
@@ -107,6 +107,26 @@ module Gtk
 
     alias_method :create_filter, :filter_new
 
+    alias_method :each_raw, :each
+    def each
+      return to_enum(__method__) unless block_given?
+      exception = nil
+      each_raw do |model, path, iter|
+        stop = true
+        # TODO: This doesn't return 'stop' to GTK when caller uses 'break'.
+        begin
+          iter.model = model
+          yield(model, path, iter)
+          stop = false
+        rescue Exception => e
+          exception = e
+        end
+        stop
+      end
+      raise exception if exception
+      self
+    end
+
     private
     def setup_iter(iter)
       iter.model = self

data/lib/gtk4/{target-list.rb → tree-sortable.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2015  Ruby-GNOME2 Project Team
+# 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
@@ -15,16 +15,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Gtk
-  class TargetList
-    alias_method :find_raw, :find
-    def find(target)
-      target = Gdk::Atom.intern(target) if target.is_a?(String)
-
-      found, info = find_raw(target)
-      if found
-        info
-      else
-        nil
+  module TreeSortable
+    alias_method :set_sort_func_raw, :set_sort_func
+    def set_sort_func(sort_column_id)
+      set_sort_func_raw(sort_column_id) do |model, iter1, iter2|
+        iter1.model = model
+        iter2.model = model
+        yield(model, iter1, iter2)
       end
     end
   end

data/lib/gtk4/tree-view-column.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2016  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
@@ -57,5 +57,13 @@ module Gtk
       key = key.to_s if key.is_a?(Symbol)
       add_attribute_raw(renderer, key, value)
     end
+
+    alias_method :set_cell_data_func_raw, :set_cell_data_func
+    def set_cell_data_func(cell)
+      set_cell_data_func_raw(cell) do |column, cell, model, iter|
+        iter.model = model
+        yield(column, cell, model, iter)
+      end
+    end
   end
 end

data/lib/gtk4/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018  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
@@ -20,7 +20,7 @@ module Gtk
 
     class << self
       def or_later?(major, minor, micro=nil)
-        error_message = Gtk.check_version(major, minor, micro)
+        error_message = Gtk.check_version(major, minor, micro || 0)
         error_message.nil?
       end
     end

data/lib/gtk4/widget.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2016  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
@@ -17,9 +17,6 @@
 module Gtk
   class Widget
     class << self
-      def init
-      end
-
       def have_template?
         @have_template ||= false
       end
@@ -38,6 +35,8 @@ module Gtk
           else
             set_template_raw(data)
           end
+          @scope = Gtk::RubyBuilderScope.new
+          set_template_scope(@scope)
           @have_template = true
         end
 
@@ -49,63 +48,24 @@ module Gtk
           attr_reader(name)
         end
       end
-
-      alias_method :set_connect_func_raw, :set_connect_func
-      def set_connect_func(&block)
-        set_connect_func_raw do |*args|
-          Builder.connect_signal(*args, &block)
-        end
-      end
     end
 
-    alias_method :events_raw, :events
-    def events
-      Gdk::EventMask.new(events_raw)
-    end
-
-    alias_method :add_events_raw, :add_events
-    def add_events(new_events)
-      unless new_events.is_a?(Gdk::EventMask)
-        new_events = Gdk::EventMask.new(new_events)
-      end
-      add_events_raw(new_events.to_i)
-    end
-
-    alias_method :set_events_raw, :set_events
-    def set_events(new_events)
-      unless new_events.is_a?(Gdk::EventMask)
-        new_events = Gdk::EventMask.new(new_events)
+    alias_method :set_size_request_raw, :set_size_request
+    def set_size_request(*args)
+      case args.size
+      when 1
+        options = args[0]
+        raise ArgumentError, ":width is missing" unless options.key?(:width)
+        width = options[:width]
+        raise ArgumentError, ":height is missing" unless options.key?(:height)
+        height = options[:height]
+      when 2
+        width, height = args
+      else
+        message = "wrong number of arguments (given #{args.size}, expected 1..2)"
+        raise ArgumentError, message
       end
-      set_events_raw(new_events.to_i)
-    end
-
-    alias_method :events_raw=, :events=
-    alias_method :events=, :set_events
-
-    alias_method :drag_source_set_raw, :drag_source_set
-    def drag_source_set(flags, targets, actions)
-      targets = ensure_drag_targets(targets)
-      drag_source_set_raw(flags, targets, actions)
-    end
-
-    alias_method :drag_dest_set_raw, :drag_dest_set
-    def drag_dest_set(flags, targets, actions)
-      targets = ensure_drag_targets(targets)
-      drag_dest_set_raw(flags, targets, actions)
-    end
-
-    alias_method :style_get_property_raw, :style_get_property
-    def style_get_property(name)
-      property = self.class.find_style_property(name)
-      value = GLib::Value.new(property.value_type)
-      style_get_property_raw(name, value)
-      value.value
-    end
-
-    alias_method :render_icon_pixbuf_raw, :render_icon_pixbuf
-    def render_icon_pixbuf(stock_id, size)
-      size = IconSize.new(size) unless size.is_a?(IconSize)
-      render_icon_pixbuf_raw(stock_id, size)
+      set_size_request_raw(width, height)
     end
 
     alias_method :translate_coordinates_raw, :translate_coordinates
@@ -118,6 +78,32 @@ module Gtk
       end
     end
 
+    alias_method :style_context_raw, :style_context
+    def style_context
+      @style_context ||= style_context_raw
+    end
+
+    alias_method :insert_action_group_raw, :insert_action_group
+    def insert_action_group(name, group)
+      insert_action_group_raw(name, group)
+      @action_groups ||= {}
+      if group.nil?
+        @action_groups.delete(name)
+      else
+        @action_groups[name] = group
+      end
+    end
+
+    def children
+      _children = []
+      child = first_child
+      while child
+        _children << child
+        child = child.next_sibling
+      end
+      _children
+    end
+
     private
     def initialize_post
       klass = self.class
@@ -130,18 +116,5 @@ module Gtk
         instance_variable_set("@#{name}", get_template_child(gtype, name))
       end
     end
-
-    def ensure_drag_targets(targets)
-      return targets unless targets.is_a?(Array)
-
-      targets.collect do |target|
-        case target
-        when Array
-          TargetEntry.new(*target)
-        else
-          target
-        end
-      end
-    end
   end
 end

data/lib/gtk4.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2018  Ruby-GNOME2 Project Team
+# Copyright (C) 2006-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
@@ -14,12 +14,9 @@
 # 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 "atk"
 require "gdk4"
-require "gio2"
 
-require "gtk4/loader"
+require_relative "gtk4/loader"
 
 module Gtk
   LOG_DOMAIN = "Gtk"
@@ -31,34 +28,6 @@ module Gtk
   class InitError < Error
   end
 
-  class << self
-    def const_missing(name)
-      init()
-      if const_defined?(name)
-        const_get(name)
-      else
-        super
-      end
-    end
-
-    def method_missing(name, *args, &block)
-      init()
-      if respond_to?(name)
-        __send__(name, *args, &block)
-      else
-        super
-      end
-    end
-
-    def init(*argv)
-      class << self
-        remove_method(:init)
-        remove_method(:const_missing)
-        remove_method(:method_missing)
-      end
-      Gdk.init if Gdk.respond_to?(:init)
-      loader = Loader.new(self, argv)
-      loader.load
-    end
-  end
+  loader = Loader.new(self)
+  loader.load
 end

data/sample/demos/README.md

@@ -0,0 +1,4 @@
+# Ruby/GTK4 demos
+
+There are scripts ported from
+https://gitlab.gnome.org/GNOME/gtk/-/tree/main/demos .

data/sample/examples/README.md

@@ -0,0 +1,4 @@
+# Ruby/GTK4 examples
+
+There are scripts ported from
+https://gitlab.gnome.org/GNOME/gtk/-/tree/main/examples .

data/sample/getting-started/README.md

@@ -0,0 +1,4 @@
+# Ruby/GTK4 getting started
+
+There are scripts ported from
+https://docs.gtk.org/gtk4/getting_started.html .