hokusai-zero 0.1.3 → 0.1.4

data/ui/src/hokusai/ast.rb

@@ -25,15 +25,21 @@ module Hokusai
       end
 
       # The loop variable
+      #
       # eg [for="item in list"]
       # the var is `item`
+      #
+      # @return [String]
       def var
         @name ||= raw[:name].freeze
       end
 
       # The loop method
+      #
       # eg [for="item in list"]
       # the method is `list`
+      #
+      # @return [String]
       def method
         @list_name ||= raw[:list_name].freeze
       end
@@ -49,6 +55,7 @@ module Hokusai
       end
 
       # Name of the func
+      #
       # eg @target="run_this(one,two)"
       # the name is `run_this`
       #
@@ -58,6 +65,7 @@ module Hokusai
       end
 
       # Args of the func
+      #
       # eg @target="run_this(one, two)"
       # the args are [one, two]
       #
@@ -74,6 +82,7 @@ module Hokusai
     class Event
       attr_reader :raw
 
+      # @param [LibHokusai::Event] raw event
       def initialize(raw)
         @raw = raw
       end
@@ -93,6 +102,7 @@ module Hokusai
       end
     end
 
+    # A node representing an ast prop
     class Prop
       attr_reader :raw
 
@@ -100,14 +110,17 @@ module Hokusai
         @raw = raw
       end
 
+      # @return [Bool] is this prop computed?
       def computed?
         raw[:computed]
       end
 
+      # @return [String] the props name
       def name
         @name ||= raw[:name].freeze
       end
 
+      # @return [Ast::Func] the props value
       def value
         @call ||= raw[:call]
 
@@ -166,60 +179,74 @@ module Hokusai
       end
     end
 
+    # Marks this ast as dirty
+    # @return [Void]
     def dirty!
       @dirty = true
     end
 
+    # Is this ast dirty?
+    # @return [Bool]
     def dirty?
       @dirty
     end
 
+    # @return [Bool] is this node a slot?
     def slot?
       type == "slot"
     end
 
+    # @return [Bool] is this node virtual?
     def virtual?
       type == "virtual"
     end
 
+    # @return [Bool] does this node belong to a loop?
     def loop?
       @loop_condition = !raw[:loop].null? if @loop_condition.nil?
 
       @loop_condition
     end
 
+    # @return [Bool] does this node have an if condition?
     def has_if_condition?
       @if_condition = !raw[:cond].null? if @if_condition.nil?
 
       @if_condition
     end
 
+    # @return [Bool] does this node have an else condition?
     def has_else_condition?
       @else_condition = !raw[:else_relations].null? if @else_condition.nil?
 
       @else_condition
     end
 
+    # @return [Bool] is the else condition on this node currently active?
     def else_condition_active?
       has_else_condition? && @else_active == 1
     end
 
+    # @param [Bool] else condition is active or not
     def else_active=(val)
       @else_active = val
     end
 
+    # @return [Hokusai::Ast?] the ast of the else condition
     def else_ast
       return nil unless has_else_condition?
 
       Ast.new(raw[:else_relations][:next_child])
     end
 
+    # @return [Ast::Loop?] the loop that the ast belongs to
     def loop
       return nil unless loop?
 
       @loop ||= Loop.new(raw[:loop])
     end
 
+    # @return [Ast::Func?] the if condition of this ast
     def if
       @cond ||= raw[:cond]
 
@@ -232,14 +259,17 @@ module Hokusai
       @func ||= Func.new(@call)
     end
 
+    # @return [String] the node type
     def type
       @type ||= raw[:type].nil? ? "(null)" : raw[:type]
     end
 
+    # @return [String] the node id
     def id
       @id ||= raw[:id].nil? ? "(null)" : raw[:id]
     end
 
+    # @return [Array<String>] the list of classes for this node
     def classes
       return @classes unless @classes.nil?
 
@@ -251,6 +281,7 @@ module Hokusai
       @classes
     end
 
+    # @return [Array<Hokusai::Ast>] all the children of this node
     def children
       return @children unless @children.nil?
 
@@ -262,6 +293,7 @@ module Hokusai
       @children
     end
 
+    # @return [Array<Hokusai::Ast>] all the siblings of this node
     def siblings
       return @siblings unless @siblings.nil?
 
@@ -277,6 +309,7 @@ module Hokusai
       @siblings
     end
 
+    # @return [Array<Hokusai::Ast>] the children of the else condition for this node
     def else_children
       children = []
 
@@ -290,6 +323,7 @@ module Hokusai
       children
     end
 
+    # @return [Array<Ast::Prop>] all the props of this node
     def props
       return @props unless @props.nil?
 
@@ -302,6 +336,7 @@ module Hokusai
       @props
     end
 
+    # @return [Array<Ast::Event>] all the events of this node
     def events
       return @events unless @events.nil?
 
@@ -382,60 +417,24 @@ module Hokusai
       i.free
     end
 
+    # Fetches a prop by name
+    # 
+    # @param [String] name of the prop
+    # @return [Ast::Prop?] the prop or nil
     def prop(name)
       props[name]
     end
 
-    # Search for a prop by name
-    #
-    # @param [String] name the name of the prop to find
-    # @return [Hokusai::Ast::Prop?] the prop if found
-    # def prop(name)
-    #   prop_ptr = FFI::MemoryPointer.new :pointer
-    #   code = LibHokusai.hoku_ast_prop_init(prop_ptr, name)
+    # Fetches an event by name
     #
-    #   raise Hokusai::Error.new("Failed to allocate prop") unless code.zero?
-    #
-    #   prop_ptr2 = prop_ptr.get_pointer(0)
-    #   prop = LibHokusai::HmlAstProp.new(prop_ptr2)
-    #   response = LibHokusai.hoku_ast_get_prop(raw, prop)
-    #   return nil if response.null?
-    #
-    #   Prop.new(response)
-    # ensure
-    #   prop_ptr.free
-    # end
-
+    # @param [String] the name of the event
+    # @return [Ast::Event?] the event or nil
     def event(name)
       events[name]
     end
 
-    # Search for an event by name
-    #
-    # @param [String] name the name of the prop to find
-    # @return [Prop?] the prop if found
-    # def event(name)
-    #   event_ptr = FFI::MemoryPointer.new :pointer
-    #   code = LibHokusai.hoku_ast_prop_init(event_ptr, name)
-    #
-    #   raise Hokusai::Error.new("Failed to allocate prop") unless code.zero?
-    #
-    #   event_ptr2 = event_ptr.get_pointer(0)
-    #   event = LibHokusai::HmlAstEvent.new(event_ptr2)
-    #   response = LibHokusai.hoku_ast_get_event(raw, event)
-    #   event_ptr.free
-    #
-    #   return nil if response.null?
-    #
-    #   Event.new(response)
-    # ensure
-    #   event_ptr.free
-    # end
-
     def destroy
-      puts "before destroy"
       LibHokusai.hoku_ast_free(raw)
-      puts "after destroy"
     end
 
     # dumps this ast to STDOUT

data/ui/src/hokusai/backends/raylib/font.rb

@@ -20,7 +20,7 @@ module Hokusai
       OnWidthCb = Proc.new do |char, ffi_pointer|
         data = DataForCb.new ffi_pointer
 
-        Raylib.MeasureTextEx(data[:raw], "#{char.chr}", data[:size], data[:spacing]).x + data[:spacing]
+        Raylib.MeasureTextEx(data[:raw], "#{char.chr}", data[:size], data[:spacing]).x + 1.565#@ data[:spacing]
       end
 
       class Font < Hokusai::Font
@@ -83,7 +83,6 @@ module Hokusai
           raw.baseSize
         end
 
-
         def clamp_markdown(text, size, width, initial_offset = 0.0)
           clamping_pointer = FFI::MemoryPointer.new :pointer
           RaylibBackend::DataForCb.create(size, spacing, raw) do |ptr|

data/ui/src/hokusai/backends/raylib.rb

@@ -37,8 +37,8 @@ module Hokusai::Backends
       yield(config)
     end
 
-    def vec2(x, y)
-      if @raylib_vec2.nil?
+    def vec2(x, y, fresh = false)
+      if @raylib_vec2.nil? || fresh
         @raylib_vec2 = Raylib::Vector2.new
       end
       @raylib_vec2[:x] = x
@@ -201,7 +201,9 @@ module Hokusai::Backends
         height = last_height
 
         process_input(input)
+        block.public_send(:before_updated) if block.respond_to?(:before_updated)
         block.update
+        block.public_send(:after_updated) if block.respond_to?(:after_updated)
 
         canvas.reset(nil, nil, width.to_f, height.to_f)
 
@@ -368,7 +370,12 @@ module Hokusai::Backends
       Hokusai::Commands::Text.on_draw do |command|
         next unless inside_scissor(command.x, command.y, command.size)
 
+        active_name = Hokusai.fonts.active_font_name
         font = Hokusai.fonts.active
+
+        Hokusai.fonts.activate command.font.nil? ? active_name : command.font
+        font = Hokusai.fonts.active
+
         c = color(command.color)
         x = command.x + command.padding.l
         y = command.y + command.padding.t
@@ -380,6 +387,8 @@ module Hokusai::Backends
         else
           Raylib.DrawText(command.content, x, y, command.size, c)
         end
+
+        Hokusai.fonts.activate active_name
       end
 
       Hokusai::Commands::Rect.on_draw do |command|
@@ -407,26 +416,26 @@ module Hokusai::Backends
 
           # now draw the outlines
           if command.outline_uniform? && command.rounding > 0.0 && outline_color.a > 0
-            Raylib.DrawRectangleRoundedLines(outline_rect, command.rounding, 50, command.outline.top, outline_color)
+            Raylib.DrawRectangleRoundedLinesEx(outline_rect, command.rounding, 50, command.outline.top + 1, outline_color)
           elsif command.outline_uniform? && !(command.rounding <= 0.0) && outline_color.a > 0
             Raylib.DrawRectangleLinesEx(outline_rect, command.outline.top, outline_color)
           elsif !command.outline_uniform?
             ox, oy, ow, oh = command.background_boundary
 
             if command.outline.top > 0.0
-              Raylib.DrawLineEx(vec2(ox, oy), vec2(ox + ow, oy), command.outline.top, outline_color)
+              Raylib.DrawLineEx(vec2(ox, oy, true), vec2(ox + ow, oy, true), command.outline.top, outline_color)
             end
 
             if command.outline.left > 0.0
-              Raylib.DrawLineEx(vec2(ox, oy), vec2(ox, oy + oh), command.outline.left, outline_color)
+              Raylib.DrawLineEx(vec2(ox, oy, true), vec2(ox, oy + oh, true), command.outline.left, outline_color)
             end
 
             if command.outline.right > 0.0
-              Raylib.DrawLineEx(vec2(ox + ow, oy), vec2(ox + ow, oy + oh), command.outline.right, outline_color)
+              Raylib.DrawLineEx(vec2(ox + ow, oy, true), vec2(ox + ow, oy + oh, true), command.outline.right, outline_color)
             end
 
             if command.outline.bottom > 0.0
-              Raylib.DrawLineEx(vec2(ox, oy + oh), vec2(ox + ow, oy + oh), command.outline.bottom, outline_color)
+              Raylib.DrawLineEx(vec2(ox, oy + oh, true), vec2(ox + ow, oy + oh, true), command.outline.bottom, outline_color)
             end
           end
         else

data/ui/src/hokusai/backends/sdl2/font.rb

@@ -80,7 +80,6 @@ module Hokusai::Backends
 
       def clamp_markdown(text, size, width, initial_offset = 0.0)
         self.size = size
-
         clamping_pointer = FFI::MemoryPointer.new :pointer
 
         ret = LibHokusai.hoku_text_md_clamp(clamping_pointer, text, width, initial_offset, raw, SDLBackend::OnWidthCb)
@@ -105,18 +104,23 @@ module Hokusai::Backends
       end
 
       def measure(text, size = 15)
-        w = FFI::MemoryPointer.new :int
-        h = FFI::MemoryPointer.new :int
+        begin
+          self.size = size
+          w = FFI::MemoryPointer.new :int
+          h = FFI::MemoryPointer.new :int
 
-        SDL.TTF_SizeText(raw, text, w, h)
+          SDL.TTF_SizeText(raw, text, w, h)
 
-        width = w.read_int
-        height = h.read_int
+          width = w.read_int
+          height = h.read_int
 
-        w.free
-        h.free
+          w.free
+          h.free
 
-        [width, height]
+          [width, height]
+        ensure
+          self.size = height
+        end
       end
 
       def size=(val)

data/ui/src/hokusai/backends/sdl2.rb

@@ -57,7 +57,7 @@ module Hokusai::Backends
     end
 
     def run(block)
-      resize = false
+      resize = true
       self.render_width = config.width
       self.render_height = config.height
 
@@ -89,7 +89,7 @@ module Hokusai::Backends
 
       Hokusai.fonts.register "default", SDLBackend::Font.from("#{__dir__}/sdl2/Monaco.ttf", 121)
       Hokusai.fonts.activate "default"
-      config.after_load&.call
+      config.after_load_cb&.call
 
       register_command_handlers(renderer, window)
       # MemoryProfiler.start if ENV["PROFILE"]
@@ -107,7 +107,7 @@ module Hokusai::Backends
         if process_input(input, event)
           # since we are using wait event, we need to process the render twice
           # once to capture all events, and once after updating block state.
-          SDL.SetRenderDrawBlendMode(renderer, SDL::BLENDMODE_BLEND)
+          SDL.SetRenderDrawBlendMode(renderer, SDL::BLENDMODE_NONE)
           SDL.SetRenderDrawColor(renderer, config.background[:r], config.background[:g], config.background[:b], config.background[:a])
           SDL.RenderClear(renderer)
           canvas.reset(nil, nil, render_width.to_f, render_height.to_f)
@@ -116,7 +116,7 @@ module Hokusai::Backends
           block.update
           SDL.RenderPresent(renderer)
 
-          SDL.SetRenderDrawBlendMode(renderer, SDL::BLENDMODE_BLEND)
+          SDL.SetRenderDrawBlendMode(renderer, SDL::BLENDMODE_NONE)
           SDL.SetRenderDrawColor(renderer, config.background[:r], config.background[:g], config.background[:b], config.background[:a])
           SDL.RenderClear(renderer)
           canvas.reset(nil, nil, render_width.to_f, render_height.to_f)
@@ -404,7 +404,6 @@ module Hokusai::Backends
 
       Hokusai::Commands::Rect.on_draw do |command|
         next unless inside_scissor(command.x, command.y, command.height)
-
         # draw background first
         x, y, w, h = [command.x, command.y, command.width, command.height]
 
@@ -480,6 +479,7 @@ module Hokusai::Backends
         rounding = command.rounding
 
         if command.rounding > 0
+          pp command.color
           SDL.roundedBoxRGBA(renderer, x, y, x + w, y + h, (command.rounding).ceil.to_i, command.color.r, command.color.g, command.color.b, command.color.a)
         else
           rect = SDL::Rect.new

data/ui/src/hokusai/block.rb

@@ -4,6 +4,11 @@ require "forwardable"
 
 module Hokusai
   module Blocks; end
+  # A UI Component
+  #
+  # Blocks are reusable and can be mounted in other blocks via templates
+  #
+  # Blocks have `props`` and emit `events`
   class Block
     attr_reader :node
     attr_reader :publisher
@@ -61,6 +66,8 @@ module Hokusai
       @styles || {}
     end
 
+    # Defines blocks that this block uses in it's template
+    # Keys map to template node names, values map to a `Hokusai::Block`
     def self.uses(**args)
       args.each do |key, value|
         raise Hokusai::Error.new("#{key} value must be a Block, got #{value}") unless value.is_a?(Block.class)

data/ui/src/hokusai/blocks/hblock.rb

@@ -15,12 +15,12 @@ class Hokusai::Blocks::Hblock < Hokusai::Block
     canvas.vertical = false
     canvas.reverse = reverse
 
-    if background.nil?
+    if background.nil? && outline.nil?
       yield canvas
     else
       draw do
         rect(canvas.x, canvas.y, canvas.width, canvas.height) do |command|
-          command.color = background
+          command.color = background if background
           command.outline = outline if outline
           command.outline_color = outline_color if outline_color
           command.round = rounding.to_f if rounding

data/ui/src/hokusai/blocks/image.rb

@@ -1,3 +1,5 @@
+require "pathname"
+
 class Hokusai::Blocks::Image < Hokusai::Block
   template <<~EOF
     [template]
@@ -9,8 +11,10 @@ class Hokusai::Blocks::Image < Hokusai::Block
   computed :height, default: nil
 
   def render(canvas)
+    src = Pathname.new(source).absolute? ? source : "#{File.dirname(caller[-1].split(":")[0])}/#{source}"
+
     draw do
-      image(source, canvas.x, canvas.y, width&.to_f || canvas.width, height&.to_f || canvas.height)
+      image(src, canvas.x, canvas.y, width&.to_f || canvas.width, height&.to_f || canvas.height)
     end
 
     yield canvas

data/ui/src/hokusai/blocks/input.rb

@@ -45,6 +45,19 @@ class Hokusai::Blocks::Input < Hokusai::Block
     @start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     @buffer_offset = 0
     @offset = 0
+    @changed = false
+  end
+
+  def after_updated
+    if @changed && !growable
+      @table = ::Hokusai::Util::PieceTable.new(initial)
+      @buffer = ""
+      @buffer_count = 0
+      @start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      @buffer_offset = 0
+      @offset = 0
+      @changed = false
+    end
   end
 
   def update_height(value)
@@ -74,6 +87,7 @@ class Hokusai::Blocks::Input < Hokusai::Block
   end
 
   def dynamic_keypress_handle(event)
+    return unless node.meta.focused
     case event
     when proc(&:ctrl), proc(&:super)
       if event.char == "z"
@@ -116,6 +130,7 @@ class Hokusai::Blocks::Input < Hokusai::Block
           flush
           
           emit("change", table.to_s)
+          @changed = true
 
           self.table = ::Hokusai::Util::PieceTable.new("")
           self.buffer_offset = 0
@@ -142,6 +157,8 @@ class Hokusai::Blocks::Input < Hokusai::Block
         self.buffer += event.char
       end
     end
+
+    emit("modified")
   end
     
   def flush

data/ui/src/hokusai/blocks/label.rb

@@ -6,6 +6,7 @@ class Hokusai::Blocks::Label < Hokusai::Block
   EOF
 
   computed! :content
+  computed :font, default: nil
   computed :size, default: 12
   computed :color, default: [33,33,33], convert: Hokusai::Color
   computed :padding, default: [5.0, 5.0, 5.0, 5.0], convert: Hokusai::Padding
@@ -21,8 +22,9 @@ class Hokusai::Blocks::Label < Hokusai::Block
 
   def render(canvas)
     if @last_content != content
-      width, _ = Hokusai.fonts.active.measure(content.to_s, size.to_i)
-
+      width, height = Hokusai.fonts.active.measure(content.to_s, size.to_i)
+      node.meta.set_prop(:width, width + padding.right + padding.left)
+      node.meta.set_prop(:height, height + padding.top + padding.bottom)
       emit("width_updated", width + padding.right + padding.left)
 
       @last_content = content
@@ -33,6 +35,7 @@ class Hokusai::Blocks::Label < Hokusai::Block
         command.color = color
         command.size = size
         command.padding = padding
+        command.font = font unless font.nil?
       end
     end
   end

data/ui/src/hokusai/blocks/text.rb

@@ -15,13 +15,14 @@ class Hokusai::Blocks::Text < Hokusai::Block
   uses(empty: Hokusai::Blocks::Empty)
 
   computed! :content
+  computed :font, default: nil
   computed :size, default: 16, convert: proc(&:to_i)
   computed :line_height, default: 5, convert: proc(&:to_f)
   computed :color, default: [33,33,33], convert: Hokusai::Color
   computed :selection_color, default: [233,233,233], convert: Hokusai::Color
   computed :padding, default: [5.0, 5.0, 5.0, 5.0], convert: Hokusai::Padding
   computed :cursor_offset, default: nil
-  computed :markdown, default: false
+  computed :markdown, default: false, convert: ->(val) { val == "true" || val == true }
 
   inject :selection
   inject :panel_top
@@ -65,7 +66,6 @@ class Hokusai::Blocks::Text < Hokusai::Block
 
     draw_with do |commands|
       iterator.on_draw do |text, x, y, group|
-
         if selector = selection
           if cursor_offset&.zero? && !selector.started
             selector.cursor = [x, y + offset_y, 0.0, size.to_f]
@@ -86,6 +86,7 @@ class Hokusai::Blocks::Text < Hokusai::Block
         commands.text(text, x, y) do |command|
           command.color = color
           command.size = size
+          command.font = font unless font.nil?
 
           if group.respond_to?(:bold?)
             
@@ -186,7 +187,8 @@ class Hokusai::Blocks::Text < Hokusai::Block
 
   def clamp(text, width)
     if markdown
-      Hokusai.fonts.active.clamp_markdown(text, size.to_i, width - size.to_f - padding.right)
+      clamping = Hokusai.fonts.active.clamp_markdown(text, size.to_i, width - size.to_f - padding.right)
+      clamping
     else
       Hokusai.fonts.active.clamp(text, size.to_i, width - size.to_f, padding.right)
     end
@@ -203,10 +205,13 @@ class Hokusai::Blocks::Text < Hokusai::Block
 
       height = internal_render(last_clamping, canvas)
       self.last_content = last_content
-      emit("height_updated", height + padding.bottom) unless last_height == height + padding.bottom
+      
+      new_height = height + padding.bottom + padding.top
+      new_height -= size if markdown
 
-      self.last_height = height + padding.bottom + padding.top
+      emit("height_updated", new_height) unless last_height == new_height
 
+      self.last_height = new_height
 
       yield canvas
     end

data/ui/src/hokusai/blocks/titlebar/osx.rb

@@ -32,12 +32,12 @@ module Hokusai::Blocks::Titlebar
     EOF
 
     computed :rounding, default: 0.0, convert: proc(&:to_f)
-    computed :outline, default: [0.0, 0.0, 0.0, 0.0], convert: Hokusai::Outline
-    computed :outline_color, default: [0,0,0,0], convert: Hokusai::Color
+    computed :outline, default: nil
+    computed :outline_color, default: nil
     computed :unhovered_color, default: DEFAULT, convert: Hokusai::Color
     computed :radius, default: 6.0, convert: proc(&:to_f)
-    computed :background, default: nil, convert: Hokusai::Color
-    computed :background_drag, default: nil, convert: Hokusai::Color
+    computed :background, default: nil
+    computed :background_drag, default: nil
 
 
     uses(

data/ui/src/hokusai/blocks/variable.rb

@@ -0,0 +1,33 @@
+class Hokusai::Blocks::Variable < Hokusai::Block
+  template <<~EOF
+  [template]
+    empty
+  EOF
+
+  uses(empty: Hokusai::Blocks::Empty)
+
+  computed! :script
+
+  def after_updated
+    if @last_height != children[0].node.meta.get_prop(:height)
+      @last_height = children[0].node.meta.get_prop(:height)
+
+      node.meta.set_prop(:height, @last_height)
+      emit("height_updated", @last_height)
+    end
+  end
+
+  def on_mounted
+    klass = eval(script)
+
+    raise Hokusai::Error.new("Class #{klass} is not a Hokusai::Block") unless klass.ancestors.include?(Hokusai::Block)
+
+    node.meta.set_child(0, klass.mount)
+  end
+
+  def render(canvas)
+    if Hokusai.can_render(canvas)
+      yield canvas
+    end
+  end
+end