white_gold 0.0.2 → 0.0.4

data/lib/white_gold/library/theme/light.rb

@@ -41,7 +41,7 @@ editbox! do
   selected_text_background_color! 157, 185, 240
 end
 
-text_area! do
+textarea! do
   background_color! 220
   default_text_color! 100
   caret_width! 2
@@ -59,6 +59,9 @@ combobox! do
   arrow_background_color_hover! 200
 end
 
+label! do
+end
+
 listbox! do
   background_color! 240
   background_color_hover! 220
@@ -76,6 +79,10 @@ menu! do
   separator_side_padding! 2
 end
 
+panel! do
+  background_color! 235
+end
+
 progressbar! do
   borders! 1
 end

data/lib/white_gold/master.rb

@@ -17,20 +17,26 @@ class WhiteGold
     @frame_delay = 1.0 / fps
   end
 
-  def init init_page = :main_page, fps: nil, theme: nil
-    @window = Window.new
+  def init fps: nil, theme: nil, window_size: nil, window_style: nil
+    eo = ExternObject.new pointer: nil, autofree: false # object for packing
+    if window_size == :fullscreen
+      window_style = :fullscreen
+      window_size = nil
+    end
+    window_size ||= [800, 600]
+    @window = Window.new *eo.abi_pack(Vector2u, *window_size), *eo.abi_pack(ExternObject::WindowStyle, *(window_style || :default))
     @gui = Gui.new window
     @preserved_pages = {}
     Theme.default = theme if theme
     self.fps = fps if fps
     @frame_delay = 0.015 if !@frame_delay
     @jobs = []
-    @next_page_id = init_page
-    load_page init_page
+    @initialized = true
   end
 
-  def run init_page = :main_page, fps: nil, theme: nil, init: true
-    self.init init_page, fps: fps, theme: theme if init
+  def run page = nil, fps: nil, theme: nil, window_size: nil, window_style: nil
+    self.init fps: fps, theme: theme, window_size: window_size, window_style: window_style if !@initialized
+    load_page page if page
 
     next_frame_time = Time.now
     while @gui.self_active?
@@ -39,6 +45,8 @@ class WhiteGold
       if @current_page_id != @next_page_id
         if @current_page_id
           page = @preserved_pages[@current_page_id]
+          BangNestedCaller.pop
+          BangNestedCaller.close_scope page
           @gui.self_remove page
           page.disconnect
           @preserved_pages.delete(@current_page_id)
@@ -53,35 +61,34 @@ class WhiteGold
   end
 
   def load_page page_id
-    @current_page_id = page_id
+    @next_page_id = @current_page_id = page_id
     case page_id
     when Symbol
       page = @preserved_pages[page_id] = Page.new self
-      @gui.self_add page, "main_container"
-      @current_page = page
-      ExternObject.callback_storage = page.widget_callbacks
-      ExternObject.global_callback_storage = page.global_callbacks
-      ExternObject.data_storage = page.custom_data
+      init_page page
       send(page_id)
     when Class
       page = @preserved_pages[page_id] = page_id.new self
-      @gui.self_add page, "main_container"
-      @current_page = page
-      ExternObject.callback_storage = page.widget_callbacks
-      ExternObject.global_callback_storage = page.global_callbacks
-      ExternObject.data_storage = page.custom_data
+      init_page page
       page.build
     when Proc
       page = @preserved_pages[page_id] = Page.new self
-      @gui.self_add page, "main_container"
-      @current_page = page
-      ExternObject.callback_storage = page.widget_callbacks
-      ExternObject.global_callback_storage = page.global_callbacks
-      ExternObject.data_storage = page.custom_data
-      instance_exec &page_id
+      init_page page
+      page.instance_eval &page_id
     end
   end
 
+  def init_page page
+    @gui.self_add page, "main_container"
+    @gui.page = page
+    @current_page = page
+    ExternObject.callback_storage = page.widget_callbacks
+    ExternObject.global_callback_storage = page.global_callbacks
+    ExternObject.data_storage = page.custom_data
+    BangNestedCaller.open_scope page
+    BangNestedCaller.push page
+  end
+
   attr_accessor :next_page_id
   attr :gui, :window
 
@@ -101,6 +108,7 @@ class WhiteGold
       @repeat = repeat
       @job = b
       @result = NO_RESULT
+      @counter = 0
       self.run if run
     end
 
@@ -114,6 +122,7 @@ class WhiteGold
     def on_done &b
       @on_done = b
       b.(@result) if @thread && !@thread.alive?
+      self
     end
 
     def audit
@@ -123,6 +132,7 @@ class WhiteGold
         else
           @on_done.(@result) if @on_done
           if @repeat
+            @counter += 1
             run
             return true
           else
@@ -130,14 +140,22 @@ class WhiteGold
           end
         end
       else 
-        return true
+        return !!@job
       end
     end
 
     def finish result = NO_RESULT
-      @repeat = false
+      @thread.kill
       @result = result if result != NO_RESULT
     end
+
+    attr :counter
+    attr_accessor :repeat
+
+    def cancel
+      @thread.kill
+      @thread = @job = nil
+    end
   end
 
   def job delay: nil, repeat: false, &b
@@ -150,21 +168,4 @@ class WhiteGold
     job delay: delay || delay_, repeat: do
     end.on_done &b
   end
-
-  def respond_to? name
-    super || @current_page.respond_to?(name)
-  end
-
-  def method_missing name, *a, **na, &b
-    if @current_page.respond_to? name
-      @current_page.send(name, *a, **na, &b)
-    elsif @gui.respond_to? name
-      @gui.send(name, *a, **na, &b)
-    elsif @window.respond_to? name
-      @window.send(name, *a, **na, &b)
-    else
-      no_method_error = "method '#{name}' missing in Page/Gui/Window"
-      raise no_method_error
-    end
-  end
 end

data/lib/white_gold/path/array.path.rb

@@ -0,0 +1,16 @@
+class Array
+  def x
+    self[0]
+  end
+
+  def y
+    self[1]
+  end
+
+  alias_method :_insert, :[]=
+  
+  def []=(*a)
+    a.size != 1 ? _insert(*a) : append(a[0])
+    return a.last
+  end
+end

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,39 +161,46 @@ 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
 
-  abi_packer Tgui::Abi::Vector2f do |o|
-    case o
-    when Array
-      raise "Invalid array size excepted: #{2}, given: #{o.size}" if o.size != 2
-      return o.map{ abi_pack_float _1 }
-    else
-      raise "Unable to make Vector2f from #{o}"
+  abi_packer Tgui::Abi::Vector2f 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_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
@@ -199,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
 
@@ -219,32 +231,30 @@ class ExternObject
     o.odd?
   end
 
-  abi_unpacker "SizeLayout" do |o|
-    [o.x, o.y]
-  end
-
-  abi_unpacker "PositionLayout" do |o|
-    [o.x, o.y]
-  end
-
-  abi_unpacker Tgui::Vector2f do |o|
+  vector2f_unpacker = proc do |o|
     v = Tgui::Vector2f.new o
     r = [v.x, v.y]
-    Util.free(o)
+    Tgui::Util.free(o)
     r
   end
 
+  abi_unpacker "SizeLayout", &vector2f_unpacker
+
+  abi_unpacker "PositionLayout", &vector2f_unpacker
+
+  abi_unpacker Tgui::Vector2f, &vector2f_unpacker
+
   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

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

data/lib/white_gold.rb

@@ -1,47 +1,50 @@
 require_relative 'white_gold/master'
+require_relative 'white_gold/path/array.path'
 include Tgui
 
-@wg = WhiteGold.new
+@white_gold_instance = WhiteGold.new
 
-@wg.methods.difference(Object.instance_methods, [:respond_to?, :method_missing, :go, :[], :page]).each do |m|
-  define_method m do |*a, **na, &b|
-    @wg.send(m, *a, **na, &b)
-  end
-end
+class << self 
+  include BangNestedCaller
+  include BangDef
 
-class << self  
+  def go page
+    @white_gold_instance.go page.is_a?(Symbol) ? proc{ send(page) } : page
+  end
+  
+  def page
+    @white_gold_instance.page
+  end
 
   def respond_to? name
-    super || (name.end_with?("!") && @wg.respond_to?(name))
+    super || 
+    (name.end_with?("!") && bang_respond_to?(name[...-1])) ||
+    @white_gold_instance.page.respond_to?(name)
   end
 
   def method_missing name, *a, **na, &b
-    if name.end_with?("!")
-      @wg.send(name, *a, **na, &b)
+    if name.end_with? "!"
+      bang_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
 
-  def go page
-    method(page).unbind.bind(@wg) if Symbol === page && !@wg.respond_to?(page)
-    @wg.go page
-  end
-  
-  def page
-    @wg.page
-  end
-
-  def def! name, &b
-    @wg.page.class.def! name, &b
-  end
+def! :run do |page = nil|
+  go page if page
+  @white_gold_instance.run
+  @white_gold_instance = nil
 end
 
-@wg.init Page
+@white_gold_instance.init window_size: $window_size, window_style: $window_style
+@white_gold_instance.load_page Page
 if $0 != 'irb'
   at_exit do
-    go :main_page
-  rescue NameError
-  ensure
-    @wg.run init: false
+    @white_gold_instance&.run
   end
-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.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Łukasz Pomietło
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-02 00:00:00.000000000 Z
+date: 2024-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fiddle
@@ -24,8 +24,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-description: "    Ruby gem for building pure ruby graphical user interface. \n    Uses
-  TGUI & SFML as a backend.\n"
+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.
 email: oficjalnyadreslukasza@gmail.com
 executables: []
 extensions: []
@@ -53,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
@@ -74,7 +75,10 @@ files:
 - lib/white_gold/convention/theme/theme_attributed.rb
 - lib/white_gold/convention/theme/theme_component.rb
 - 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
@@ -82,6 +86,7 @@ files:
 - lib/white_gold/dsl/box_layout_ratios.rb
 - lib/white_gold/dsl/button.rb
 - lib/white_gold/dsl/button_base.rb
+- lib/white_gold/dsl/canvas.rb
 - lib/white_gold/dsl/chat_box.rb
 - lib/white_gold/dsl/check_box.rb
 - lib/white_gold/dsl/child_window.rb
@@ -90,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
@@ -116,6 +122,11 @@ files:
 - lib/white_gold/dsl/scrollable_panel.rb
 - lib/white_gold/dsl/scrollbar.rb
 - lib/white_gold/dsl/separator_line.rb
+- lib/white_gold/dsl/sfml/circle_shape.rb
+- lib/white_gold/dsl/sfml/convex_shape.rb
+- lib/white_gold/dsl/sfml/rectangle_shape.rb
+- lib/white_gold/dsl/sfml/shape.rb
+- lib/white_gold/dsl/sfml/text.rb
 - lib/white_gold/dsl/signal/global_signal.rb
 - lib/white_gold/dsl/signal/signal.rb
 - lib/white_gold/dsl/signal/signal_animation_type.rb
@@ -153,16 +164,19 @@ 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
 - lib/white_gold/path/string.path.rb
 - lib/white_gold/tgui-abi.rb
 - lib/white_gold/tgui-config.rb
+- lib/white_gold/version.rb
 homepage: https://github.com/lpogic/white_gold
 licenses:
 - Zlib
-metadata: {}
+metadata:
+  documentation_uri: https://github.com/lpogic/white_gold/blob/master/doc/wiki/README.md
 post_install_message:
 rdoc_options: []
 require_paths:

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