hokusai-zero 0.2.6 → 0.2.8

data/ui/lib/lib_hokusai.rb

@@ -122,23 +122,7 @@ module LibHokusai
            :next_child, HmlAst.ptr
   end
 
-
-  # fun hashmap_iter(map : Hashmap, i : LibC::SizeT*, item : Void**) : Bool
-  # ast methods
-  attach_function :hoku_ast_prop_init, [:pointer, :string], :int
-  attach_function :hoku_ast_class_list_includes, [:pointer, :string], :int
-  attach_function :hoku_ast_get_prop, [HmlAst.by_ref, HmlAstProp.by_ref], HmlAstProp.by_ref
-  attach_function :hoku_ast_get_event, [:pointer, :pointer], HmlAstEvent.by_ref
-  attach_function :hashmap_iter, [:hashmap, :pointer, :pointer], :bool
-  attach_function :hashmap_count, [:hashmap], :int
-  attach_function :hoku_ast_free, [:pointer], :void
-  attach_function :hoku_errored_ast, [HmlAst.by_ref], HmlAst.by_ref
-  attach_function :hoku_ast_from_template, [:pointer, :string, :string], :int
-  attach_function :hoku_style_from_template, [:pointer, :string], :int
-  attach_function :hoku_style_free, [:pointer], :void
-  attach_function :hoku_dump, [:pointer, :int], :void
-
-  enum :hml_input_key, [
+  HOKUSAI_KEYS = [
     :null, :apostrophe, :comma, :minus,
     :period, :slash, :zero, :one, :two,
     :three, :four, :five, :six, :seven,
@@ -162,6 +146,41 @@ module LibHokusai
     :max
   ]
 
+  def self.set_log_level(symbol)
+    case symbol
+    when :fine
+      LibHokusai.f_logger_set_level(1 | 2 | 4 | 8 | 16)
+    when :debug
+      LibHokusai.f_logger_set_level(1 | 2 | 4 | 8)
+    when :info
+      LibHokusai.f_logger_set_level(1 | 2 | 4)
+    when :warn
+      LibHokusai.f_logger_set_level(1 | 2)
+    when :error
+      LibHokusai.f_logger_set_level(1)
+    end
+  end
+
+  enum :log_level, [:error, 1, :warn, 2, :info, 4, :debug, 8, :fine, 16]
+
+  # fun hashmap_iter(map : Hashmap, i : LibC::SizeT*, item : Void**) : Bool
+  # ast methods
+  attach_function :f_logger_set_level, [:log_level], :void
+  attach_function :hoku_ast_prop_init, [:pointer, :string], :int
+  attach_function :hoku_ast_class_list_includes, [:pointer, :string], :int
+  attach_function :hoku_ast_get_prop, [HmlAst.by_ref, HmlAstProp.by_ref], HmlAstProp.by_ref
+  attach_function :hoku_ast_get_event, [:pointer, :pointer], HmlAstEvent.by_ref
+  attach_function :hashmap_iter, [:hashmap, :pointer, :pointer], :bool
+  attach_function :hashmap_count, [:hashmap], :int
+  attach_function :hoku_ast_free, [:pointer], :void
+  attach_function :hoku_errored_ast, [HmlAst.by_ref], HmlAst.by_ref
+  attach_function :hoku_ast_from_template, [:pointer, :string, :string], :int
+  attach_function :hoku_style_from_template, [:pointer, :string], :int
+  attach_function :hoku_style_free, [:pointer], :void
+  attach_function :hoku_dump, [:pointer, :int], :void
+
+  enum :hml_input_key, HOKUSAI_KEYS
+
   enum :hml_input_select_type, [
     :ACTIVE, 0x01,
     :FROZEN, 0x02,
@@ -352,16 +371,16 @@ module LibHokusai
 
   attach_function :hoku_selection_init, [:pointer], :int
   attach_function :hoku_selection_selected, [HokuSelection.by_ref, :float, :float, :float, :float], :bool
-  attach_function :hoku_selection_cursor_set, [HokuSelection.by_ref, HokuCursorPosition.by_value], :int
+  attach_function :hoku_selection_cursor_set, [HokuSelection.by_ref, HokuCursorPosition.by_ref], :int
   attach_function :hoku_selection_cursor_free, [HokuSelection.by_ref], :void
   attach_function :hoku_selection_free, [HokuSelection.by_ref], :void
 
-  attach_function :hoku_rect_includes_y, [HmlRect.by_value, :float], :bool
-  attach_function :hoku_rect_includes_x, [HmlRect.by_value, :float], :bool
-  attach_function :hoku_rect_x_left, [HmlRect.by_value, :int], :float
-  attach_function :hoku_rect_x_right, [HmlRect.by_value, :int], :float
-  attach_function :hoku_rect_y_up, [HmlRect.by_value, :int], :float
-  attach_function :hoku_rect_y_down, [HmlRect.by_value, :int], :float
+  attach_function :hoku_rect_includes_y, [HmlRect.by_ref, :float], :bool
+  attach_function :hoku_rect_includes_x, [HmlRect.by_ref, :float], :bool
+  attach_function :hoku_rect_x_left, [HmlRect.by_ref, :int], :float
+  attach_function :hoku_rect_x_right, [HmlRect.by_ref, :int], :float
+  attach_function :hoku_rect_y_up, [HmlRect.by_ref, :int], :float
+  attach_function :hoku_rect_y_down, [HmlRect.by_ref, :int], :float
 
   class HokuChar < FFI::Struct
     layout :offset, :int,

data/ui/spec/hokusai/e2e/client_spec.rb

@@ -19,7 +19,6 @@ describe Hokusai::Automation::Client do
       attr_accessor :count
 
       def increment(_event)
-        # pp ["INCREMENTING FUCK"]
         self.count += 1
       end
 

data/ui/spec/hokusai/e2e/keyboard_spec.rb

@@ -0,0 +1,52 @@
+# describe Hokusai::Automation::Client do
+#   let(:keyboard) do
+#     klass = Class.new(Hokusai::Block) do
+#       template <<~EOF
+#       [template]
+#         vblock
+#           text#display {
+#             @keypress="update_content"
+#             :content="content" size="90" 
+#           }
+#           keyboard{ :automatic="true" }
+#       EOF
+
+#       uses(
+#         text: Hokusai::Blocks::Text,
+#         keyboard: Hokusai::Blocks::Keyboard
+#       )
+
+#       attr_accessor :content
+
+#       def update_content(event)
+#         self.content << event.char
+#       end
+
+#       def initialize(**args)
+#         @content = ""
+
+#         super(**args)
+#       end
+#     end
+
+#     klass
+#   end
+
+#   def click_key(client, key)
+#     client.block("keyboard.#{key}").click
+#   end
+  
+#   it "client works" do
+#     with_app(keyboard) do |client, app|
+#       display = client.block("#display")
+
+#       expect(display.prop("content")).to eq("")
+
+#       "hello world".split("").each do |key|
+#         click_key(client, key)
+#       end
+
+#       expect(display.prop("content")).to eq("hello world")
+#     end
+#   end
+# end 

data/ui/spec/spec_helper.rb

@@ -44,7 +44,7 @@ def with_app(app, &block)
   client = nil
   error = nil
 
-  Hokusai::ThreadPool.post do
+  Thread.new do
     client = Hokusai::Automation::Client.start
     
     yield client

data/ui/src/hokusai/assets/icons/outline/arrow-big-up.svg

@@ -0,0 +1,19 @@
+<!--
+tags: [direction, north]
+category: Arrows
+version: "1.37"
+unicode: "eddd"
+-->
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="white"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M9 20v-8h-3.586a1 1 0 0 1 -.707 -1.707l6.586 -6.586a1 1 0 0 1 1.414 0l6.586 6.586a1 1 0 0 1 -.707 1.707h-3.586v8a1 1 0 0 1 -1 1h-4a1 1 0 0 1 -1 -1z" />
+</svg>

data/ui/src/hokusai/assets/icons/outline/backspace.svg

@@ -0,0 +1,20 @@
+<!--
+category: Text
+tags: [delete, remove, eliminate]
+version: "1.0"
+unicode: "ea2d"
+-->
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="white"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M20 6a1 1 0 0 1 1 1v10a1 1 0 0 1 -1 1h-11l-5 -5a1.5 1.5 0 0 1 0 -2l5 -5z" />
+  <path d="M12 10l4 4m0 -4l-4 4" />
+</svg>

data/ui/src/hokusai/automation/driver_commands/base.rb

@@ -65,14 +65,8 @@ module Hokusai::Automation
       end
 
       def mouse_move(x, y, input)
-        LibHokusai.hoku_input_set_mouse_position(input, vec2(x, y))
-      end
-
-      private
-  
-      # Returns an HmlVec2 from {x,y}
-      def vec2(x, y)
-        LibHokusai::HmlVec2.create(x, y)
+        input.mouse.pos.x = x
+        input.mouse.pos.y = y
       end
     end
   end

data/ui/src/hokusai/automation/driver_commands/trigger_keyboard.rb

@@ -33,21 +33,18 @@ module Hokusai::Automation
         decode_key = keys.shift
 
         mouse_center(canvas, input)
-        state = LibHokusai::HmlInputMouseButton.create(clicked: true)
-        LibHokusai.hoku_input_mouse_set_button(input, state, 0)
+        input.mouse.left.clicked = true
 
         begin
           key_results = to_hml_keygroup(decode_key)
 
-          LibHokusai.hoku_input_keyboard_start(input)
+          input.keyboard.reset
 
           key_results.each do |key|
             Log.info { "populating #{key}"}
 
-            LibHokusai.hoku_input_keyboard_set_key(input, key, true)
+            input.keyboard.set(key, true)
           end
-
-          LibHokusai.hoku_input_keyboard_stop(input)
         rescue Automation::Error => ex
           keys.clear
           self.exeception = ex

data/ui/src/hokusai/automation/driver_commands/trigger_mouse.rb

@@ -2,9 +2,9 @@ module Hokusai::Automation
   module DriverCommands
     module MouseMethods
       def trigger_mouse(input, **args)
-        state = LibHokusai::HmlInputMouseButton.create(**args)
-
-        LibHokusai.hoku_input_mouse_set_button(input, state, button)
+        args.each do |which, bool|
+          input.mouse.left.send("#{which}=", bool)
+        end
       end
     end
 
@@ -27,6 +27,14 @@ module Hokusai::Automation
         state[:button]
       end
 
+      def button_symbol
+        {
+          0 => :left,
+          1 => :middle,
+          2 => :right
+        }[button]
+      end
+
       def on_complete
         return value if done?
 
@@ -65,7 +73,6 @@ module Hokusai::Automation
     class TriggerMouseClick < TriggerMouseBase
       def execute(blocks, canvas, input)
         if matches_blocks(blocks)
-          
           mouse_center(canvas, input)
           trigger_mouse(input, clicked: true)
 
@@ -202,8 +209,8 @@ module Hokusai::Automation
       def execute(blocks, canvas, input)
         if matches_block(blocks[0])
           mouse_center(canvas, input)
-          LibHokusai.hoku_input_mouse_set_scroll(input, scroll_amount)
 
+          input.mouse.scroll = scroll_amount
 
           done!
         end

data/ui/src/hokusai/automation/server.rb

@@ -99,15 +99,14 @@ module Hokusai
         app = App.new(driver)
 
         @socket = Thin::Server.new(*args, app)
-        Hokusai::ThreadPool.post do
+        
+        Thread.new do
           @socket.start
         end
       end
 
       def self.stop
         @socket.stop
-
-        Hokusai::ThreadPool.prune_pool
       end
     end
   end

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

@@ -5,7 +5,7 @@ module Hokusai::Backends
     attr_accessor :width, :height, :fps,
                   :title, :config_flags, :window_state_flags,
                   :automation_driver, :background, :after_load_cb,
-                  :host, :port, :automated, :on_reload, :event_waiting
+                  :host, :port, :automated, :on_reload, :event_waiting, :touch
 
     def initialize
       @width = 500
@@ -22,6 +22,7 @@ module Hokusai::Backends
       @automated = false
       @on_reload = ->(_){}
       @event_waiting = false
+      @touch = false
     end
 
     def start_automation_driver

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

@@ -24,9 +24,9 @@ module Hokusai
       end
 
       class Font < Hokusai::Font
-        attr_reader :raw
+        attr_reader :raw, :sdf
 
-        DEFAULT = "–—‘’“”…\r\n\t0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%%^&*(),.?/\"\\[]-_=+|~`{}<>;:'\0"
+        DEFAULT = "–—‘’“”…\r\n\t\s0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%%^&*(),.?/\"\\[]-_=+|~`{}<>;:'\0"
 
         def self.default
           font = Raylib.GetFontDefault
@@ -51,7 +51,7 @@ module Hokusai
 
           raylib_font = Raylib.LoadFontEx(file, font_size, codepoints, count)
           Raylib.GenTextureMipmaps(raylib_font.texture)
-          Raylib.SetTextureFilter(raylib_font.texture, Raylib::TEXTURE_FILTER_BILINEAR)
+          Raylib.SetTextureFilter(raylib_font.texture, Raylib::TEXTURE_FILTER_POINT)
 
           font = new(raylib_font)
           Raylib.UnloadCodepoints(codepoints)
@@ -59,9 +59,50 @@ module Hokusai
           font
         end
 
-        def initialize(raw, spacing = 1.0)
+        def self.sdf(file, size)
+          ptr = FFI::MemoryPointer.new(:int)
+          data = Raylib.LoadFileData(file, ptr)
+          font = Raylib::Font.new
+          font.baseSize = size
+          font.glyphCount = 95
+
+          font.glyphs = Raylib.LoadFontData(data, ptr.read_int, size, nil, 0, Raylib::FONT_SDF)
+          buf = FFI::MemoryPointer.new(:pointer, 1)
+          atlas = Raylib.GenImageFontAtlas(font.glyphs, buf, 95, size, 4, 0)
+          font.recs = buf.read_pointer
+          font.texture = Raylib.LoadTextureFromImage(atlas)
+          Raylib.UnloadImage(atlas)
+          Raylib.UnloadFileData(data)
+          buf.free
+          ptr.free
+
+          new(font, sdf: true)
+        end
+
+        def initialize(raw, spacing = 1.0, sdf: false)
           @raw = raw
           @spacing = spacing
+          @sdf = sdf
+          @measure_map = {}
+
+          DEFAULT.split("").each do |char|
+            @measure_map[char] ||= begin
+              bcount = FFI::MemoryPointer.new(:int)
+              letter = Raylib.GetCodepoint(char, bcount)
+              bcount.free
+              info = Raylib.GetGlyphInfo(raw, letter)
+              if info.advanceX > 0
+                w = info.advanceX
+              else
+                w = info.image.width + info.offsetX
+              end
+            
+              ->(size) do
+                width = (size.to_f / raw.baseSize.to_f) * w + (spacing)
+                width
+              end
+            end
+          end
         end
 
         # returns the spacing for this font
@@ -73,6 +114,16 @@ module Hokusai
           (ssize / (raw.baseSize.zero? ? 1 : raw.baseSize)).to_f
         end
 
+        def measure_char(char, size)
+          w = @measure_map[char]&.call(size)
+
+          if w.nil?
+            measure(char, size).first
+          else
+            w
+          end
+        end
+
         def measure(string, size)
           vec = Raylib.MeasureTextEx(raw, string, size, spacing)