white_gold 0.0.3 → 0.1.0

data/lib/white_gold/tgui-abi.rb

@@ -29,7 +29,7 @@ module Tgui
       'float y'
     ]
 
-    Vector2u = struct [
+    Vector2i = struct [
       'int x',
       'int y'
     ]
@@ -43,7 +43,7 @@ module Tgui
   end
 
   Vector2f = Abi::Vector2f
-  Vector2u = Abi::Vector2u
+  Vector2i = Abi::Vector2i
   UIntRect = Abi::UIntRect
 end
 
@@ -56,6 +56,8 @@ class ExternObject
     :size_bottom_left, :size_top_right, :size_horizontal, :size_vertical,
     :crosshair, :help, :not_allowed
 
+  abi_bit_enum "WindowStyle", :none, :titlebar, :resize, :close, :fullscreen, :topmost, default: 7
+
 end
 
 def each_file_ancestor base, dir, &b
@@ -69,21 +71,20 @@ def each_file_ancestor base, dir, &b
   end
 end
 
-each_file_ancestor File.dirname(__FILE__), "dsl" do |dsl_file|
-  require_relative dsl_file
+each_file_ancestor File.dirname(__FILE__), "dsl" do |file|
+  require_relative file
+end
+each_file_ancestor File.dirname(__FILE__), "convention/widget" do |file|
+  require_relative file
 end
 
 # ABI loader should be required after dsl directory files because of class hierarchy
 require_relative 'generated/tgui-abi-loader.gf'
+require_relative 'convention/widget_class_aliases'
 require_relative 'convention/container_widgets'
 require_relative 'convention/theme_attributes'
 
 class ExternObject
-  class << self
-    def finalizer pointer
-      Tgui::Util.free(pointer)
-    end
-  end
 
   abi_packer Object do |o|
     o = o.first if o.is_a? Array
@@ -155,7 +156,7 @@ class ExternObject
     when Numeric then Unit.nominate o
     when :center then "(parent.innersize - size) / 2"
     when :begin then "0"
-    when :end then "parent.innersize - size / 2"
+    when :end then "parent.innersize - size"
     else raise "Invalid value `#{o}` given"
     end
   end
@@ -172,24 +173,29 @@ class ExternObject
     [abi_pack_float(x), abi_pack_float(y)]
   end
 
-  abi_packer Tgui::Abi::Vector2u do |o|
-    case o
-    when Array
-      raise "Invalid array size excepted: #{2}, given: #{o.size}" if o.size != 2
-      return o.map{ abi_pack_integer _1 }
-    else
-      raise "Unable to make Vector2u from #{o}"
+  abi_packer Tgui::Abi::Vector2i do |*arg|
+    case arg.size
+    when 1
+      a = arg.first
+      x = y = a
+    when 2
+      x, y = *arg
+    else raise "Unsupported argument #{arg}"
     end
+    [abi_pack_integer(x), abi_pack_integer(y)]
   end
 
-  abi_packer Tgui::Abi::UIntRect do |o|
-    case o
-    when Array
-      raise "Invalid array size excepted: #{4}, given: #{o.size}" if o.size != 4
-      return o.map{ abi_pack_integer _1 }
-    else
-      raise "Unable to make UIntRect from #{o}"
+  abi_packer Tgui::Abi::UIntRect do |*arg|
+    case arg.size
+    when 1
+      a = [arg.first] * 4
+    when 2
+      a = [arg[0], arg[0], arg[1], arg[1]]
+    when 4
+      a = arg
+    else raise "Unsupported argument #{arg}"
     end
+    a.map{ abi_pack_integer _1 }
   end
 
   abi_packer Tgui::Color
@@ -201,11 +207,10 @@ class ExternObject
     a = []
     (0..).each do |i|
       i *= 4
-      ch = (o[i]) | (o[i + 1] << 8) | (o[i + 2] << 16) | (o[i + 3] << 24)
+      ch = (o[i] & 0xFF) | ((o[i + 1] & 0xFF) << 8) | ((o[i + 2] & 0xFF) << 16) | ((o[i + 3] & 0xFF) << 24)
       break if ch == 0
       a << ch
     end
-    raise "deleted string!" if a[0] == 572653601
     a.pack("N*").encode("UTF-8", "UTF-32BE")
   end
 
@@ -224,7 +229,7 @@ class ExternObject
   vector2f_unpacker = proc do |o|
     v = Tgui::Vector2f.new o
     r = [v.x, v.y]
-    Util.free(o)
+    Tgui::Util.delete_vector2f(o)
     r
   end
 
@@ -234,17 +239,17 @@ class ExternObject
 
   abi_unpacker Tgui::Vector2f, &vector2f_unpacker
 
-  abi_unpacker Tgui::Vector2u do |o|
-    v = Tgui::Vector2u.new o
+  abi_unpacker Tgui::Vector2i do |o|
+    v = Tgui::Vector2i.new o
     r = [v.x, v.y]
-    Util.free(o)
+    Tgui::Util.delete_vector2i(o)
     r
   end
 
   abi_unpacker Tgui::UIntRect do |o|
     v = Tgui::UIntRect.new o
     r = [v.left, v.top, v.width, v.height]
-    Util.free(o)
+    Tgui::Util.delete_u_int_rect(o)
     r
   end
 

data/lib/white_gold/version.rb

@@ -1,3 +1,3 @@
 class WhiteGold
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/lib/white_gold.rb

@@ -1,11 +1,11 @@
 require_relative 'white_gold/master'
+require_relative 'white_gold/path/array.path'
 include Tgui
 
 @white_gold_instance = WhiteGold.new
 
 class << self 
-  include BangNestedCaller
-  include BangDef
+  include Extree
 
   def go page
     @white_gold_instance.go page.is_a?(Symbol) ? proc{ send(page) } : page
@@ -17,19 +17,20 @@ class << self
 
   def respond_to? name
     super || 
-    (name.end_with?("!") && bang_respond_to?(name[...-1])) ||
+    (name.end_with?("!") && extree_respond_to?(name[...-1])) ||
     @white_gold_instance.page.respond_to?(name)
   end
 
   def method_missing name, *a, **na, &b
     if name.end_with? "!"
-      bang_method_missing name[...-1], *a, **na, &b
+      extree_method_missing name[...-1], *a, **na, &b
     elsif @white_gold_instance.page.respond_to? name
       @white_gold_instance.page.send name, *a, **na, &b
     else super
     end
   end
 end
+extend Extree::Branch
 
 def! :run do |page = nil|
   go page if page
@@ -37,7 +38,7 @@ def! :run do |page = nil|
   @white_gold_instance = nil
 end
 
-@white_gold_instance.init
+@white_gold_instance.init window_size: $window_size, window_style: $window_style
 @white_gold_instance.load_page Page
 if $0 != 'irb'
   at_exit do
@@ -45,4 +46,5 @@ if $0 != 'irb'
   end
 end
 
-BangNestedCaller.push self
+Extree::Seed.open_scope self
+Extree::Seed.push self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: white_gold
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Łukasz Pomietło
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-14 00:00:00.000000000 Z
+date: 2024-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fiddle
@@ -24,10 +24,38 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: extree
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: procify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: |2
       Ruby gem for building pure ruby graphical user interface.
       Uses TGUI & SFML as a backend.
-      Dedicated to creating single-file applications and learning programming.
+      Dedicated to creating simple applications and learning programming.
 email: oficjalnyadreslukasza@gmail.com
 executables: []
 extensions: []
@@ -55,18 +83,13 @@ files:
 - lib/white_gold/abi/interface/interface_composed_out.rb
 - lib/white_gold/abi/interface/interface_single_out.rb
 - lib/white_gold/abi/packer.rb
-- lib/white_gold/abi/reducer.rb
 - lib/white_gold/abi/unpacker.rb
 - lib/white_gold/convention/api_child.rb
-- lib/white_gold/convention/bang_def.rb
-- lib/white_gold/convention/bang_nest.rb
-- lib/white_gold/convention/bang_nested_caller.rb
 - lib/white_gold/convention/bool_property.rb
 - lib/white_gold/convention/boolean.rb
 - lib/white_gold/convention/club.rb
 - lib/white_gold/convention/container_widgets.rb
 - lib/white_gold/convention/page.rb
-- lib/white_gold/convention/proc_method_factory.rb
 - lib/white_gold/convention/theme/boolean_attribute.rb
 - lib/white_gold/convention/theme/color_attribute.rb
 - lib/white_gold/convention/theme/float_attribute.rb
@@ -78,6 +101,8 @@ files:
 - lib/white_gold/convention/theme_attributes.rb
 - lib/white_gold/convention/tree_node.rb
 - lib/white_gold/convention/unit.rb
+- lib/white_gold/convention/widget/keyboard_control.rb
+- lib/white_gold/convention/widget_class_aliases.rb
 - lib/white_gold/convention/widget_like.rb
 - lib/white_gold/dsl/backend_gui.rb
 - lib/white_gold/dsl/bitmap_button.rb
@@ -94,6 +119,7 @@ files:
 - lib/white_gold/dsl/color_picker.rb
 - lib/white_gold/dsl/combo_box.rb
 - lib/white_gold/dsl/container.rb
+- lib/white_gold/dsl/custom_widget.rb
 - lib/white_gold/dsl/edit_box.rb
 - lib/white_gold/dsl/file_dialog.rb
 - lib/white_gold/dsl/font.rb
@@ -162,6 +188,7 @@ files:
 - lib/white_gold/generated/tgui-abi-loader.gf.rb
 - lib/white_gold/library/theme/light.rb
 - lib/white_gold/master.rb
+- lib/white_gold/path/array.path.rb
 - lib/white_gold/path/kernel.path.rb
 - lib/white_gold/path/numeric.path.rb
 - lib/white_gold/path/object.path.rb
@@ -174,6 +201,7 @@ licenses:
 - Zlib
 metadata:
   documentation_uri: https://github.com/lpogic/white_gold/blob/master/doc/wiki/README.md
+  homepage_uri: https://github.com/lpogic/white_gold
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -189,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: TGUI based Ruby gem for quick native application developing

data/lib/white_gold/abi/reducer.rb

@@ -1,12 +0,0 @@
-class Reducer
-  def initialize reduction, &block
-    @reduction = reduction
-    @block = block
-  end
-
-  def call *a
-    block.call *a
-  end
-
-  attr :reduction
-end

data/lib/white_gold/convention/bang_def.rb

@@ -1,5 +0,0 @@
-module BangDef
-  def def! name, &b
-    define_method "api_bang_#{name}", &b
-  end
-end

data/lib/white_gold/convention/bang_nest.rb

@@ -1,26 +0,0 @@
-require_relative 'bang_nested_caller'
-
-module BangNest
-  include BangNestedCaller
-
-  def respond_to? name
-    super || (name.end_with?("!") && bang_respond_to?(name[...-1]))
-  end
-
-  def method_missing name, *a, **na, &b
-    if name.end_with? "!"
-      bang_method_missing name[...-1], *a, **na, &b
-    else super
-    end
-  end
-
-  def send! *a, **na, &b
-    a.each do |k|
-      send("#{k}=", true)
-    end
-    na.each do |k, v|
-      send("#{k}=", v)
-    end
-    super(&b)
-  end
-end

data/lib/white_gold/convention/bang_nested_caller.rb

@@ -1,48 +0,0 @@
-module BangNestedCaller
-
-  @@bang_stack = []
-
-  def self!
-    @@bang_stack.last
-  end
-
-  def bang_respond_to? name
-    top = @@bang_stack.include?(self) ? @@bang_stack.last : self
-    top.respond_to?("#{name}=") || top.respond_to?("api_bang_#{name}")
-  end
-
-  def bang_send name, *a, **na, &b
-    top = @@bang_stack.last
-    api_bang_name = "api_bang_#{name}".to_sym
-    return top.send(api_bang_name, *a, **na, &b) if top.respond_to? api_bang_name
-    setter = "#{name}=".to_sym
-    if top.respond_to? setter
-      return top.send(setter, a) if !a.empty?
-      return top.send(setter, na) if !na.empty?
-      return top.send(setter, b) if block_given?
-      return top.send(setter)
-    end
-    no_method_error = NoMethodError.new("bang method missing `#{name}!` for #{top.class}")
-    raise no_method_error
-  end
-
-  def bang_method_missing name, *a, **na, &b
-    if @@bang_stack.include?(self)
-      bang_send name, *a, **na, &b
-    else
-      @@bang_stack.push self
-      result = bang_send name, *a, **na, &b
-      @@bang_stack.pop
-      result
-    end
-  end
-
-  def send! &b
-    if b
-      @@bang_stack.push self
-      b.call self
-      @@bang_stack.pop
-    end
-    self
-  end
-end

data/lib/white_gold/convention/proc_method_factory.rb

@@ -1,22 +0,0 @@
-class ProcMethodFactory
-  def initialize source
-    @source = source
-  end
-
-  def method_missing name, *curry
-    proc do |*a, **na, &b|
-      method = @source.method name
-      arity = method.arity
-      a = [*curry, *a]
-      if arity >= 0
-        @source.send(name, *a[...arity], **na, &b)
-      else
-        @source.send(name, *a, **na, &b)
-      end
-    end
-  end
-
-  def respond_to? name
-    @source.respond_to? name
-  end
-end