white_gold 0.0.3 → 0.0.4

data/lib/white_gold/tgui-abi.rb

@@ -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,12 +71,16 @@ 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'
 
@@ -155,7 +161,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 +178,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::Vector2u 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 +212,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 +234,7 @@ class ExternObject
   vector2f_unpacker = proc do |o|
     v = Tgui::Vector2f.new o
     r = [v.x, v.y]
-    Util.free(o)
+    Tgui::Util.free(o)
     r
   end
 
@@ -237,14 +247,14 @@ class ExternObject
   abi_unpacker Tgui::Vector2u do |o|
     v = Tgui::Vector2u.new o
     r = [v.x, v.y]
-    Util.free(o)
+    Tgui::Util.free(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.free(o)
     r
   end
 

data/lib/white_gold/version.rb

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

data/lib/white_gold.rb

@@ -1,4 +1,5 @@
 require_relative 'white_gold/master'
+require_relative 'white_gold/path/array.path'
 include Tgui
 
 @white_gold_instance = WhiteGold.new
@@ -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.open_scope self
 BangNestedCaller.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.0.4
 platform: ruby
 authors:
 - Łukasz Pomietło
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-14 00:00:00.000000000 Z
+date: 2024-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fiddle
@@ -55,7 +55,6 @@ 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
@@ -78,6 +77,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 +95,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 +164,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

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