hokusai-zero 0.2.6.pre.pinephone6 → 0.2.6

data/ui/src/hokusai/painter.rb

@@ -45,16 +45,6 @@ module Hokusai
         keyup: KeyUpEvent.new(input, state),
         keypress: KeyPressEvent.new(input, state)
       }
-
-      add_touch_events(events, input, state) unless input.touch.nil?
-    end
-
-    def add_touch_events(events, input, state)
-      events.merge!({
-        taphold: TapHoldEvent.new(input, state),
-        pinch: PinchEvent.new(input, state),
-        swipe: SwipeEvent.new(input, state),
-      })
     end
 
     def on_before_render(&block)
@@ -96,7 +86,7 @@ module Hokusai
       root_entry = PainterEntry.new(root, canvas.x, canvas.y, canvas.width, canvas.height)
       groups << [root_entry, measure(root_children, canvas)]
 
-      mouse_y = input.mouse.pos.y
+      mouse_y = input.mouse.pos[:y]
       can_capture = mouse_y >= (canvas.y || 0.0) && mouse_y <= (canvas.y || 0.0) + canvas.height
 
       hovered = false
@@ -110,6 +100,7 @@ module Hokusai
         while group = group_children.shift
           z = group.block.node.meta.get_prop(:z)&.to_i || 0
           ztarget = group.block.node.meta.get_prop(:ztarget)
+          entry = PainterEntry.new(group.block, group.x, group.y, group.w, group.h)
 
           if (zindex_counter > 0 || z > 0)
             case ztarget
@@ -117,17 +108,12 @@ module Hokusai
               entry = PainterEntry.new(group.block, zroot_x || 0.0, zroot_y || 0.0, zroot_w, zroot_h).freeze
             when ZTARGET_PARENT
               entry = PainterEntry.new(group.block, group_parent.x || 0.0, group_parent.y || 0.0, group_parent.w, group_parent.h).freeze
-            else
-              entry = PainterEntry.new(group.block, group.x, group.y, group.w, group.h).freeze
             end
-          else
-            entry = PainterEntry.new(group.block, group.x, group.y, group.w, group.h).freeze
           end
 
-
           canvas.reset(entry.x, entry.y, entry.w, entry.h)
 
-          before_render&.call([group.block, group.parent], canvas, input)
+          before_render&.call([group.block, group.parent], canvas, input.raw)
 
           if capture
             capture_events(group.block, canvas, hovered: hovered)
@@ -184,12 +170,6 @@ module Hokusai
         events[:mouseout].bubble
         events[:mousedown].bubble
         events[:mouseup].bubble
-
-        unless input.touch.nil?
-          events[:taphold].bubble
-          events[:pinch].bubble
-          events[:swipe].bubble
-        end
       end
 
       after_render&.call
@@ -267,7 +247,10 @@ module Hokusai
         return
       end
 
-      if input.hovered?(canvas)
+      rect = canvas.to_hoku_rect
+      block_is_hovered = LibHokusai.hoku_input_is_hovered(input.raw, rect)
+
+      if block_is_hovered
         events[:hover].capture(block, canvas)
         events[:click].capture(block, canvas)
         events[:wheel].capture(block, canvas)
@@ -278,16 +261,10 @@ module Hokusai
       end
       events[:mousemove].capture(block, canvas)
 
-      if input.hovered?(canvas) || block.node.meta.focused || input.keyboard_override
+      if block_is_hovered || block.node.meta.focused
         events[:keyup].capture(block, canvas)
         events[:keypress].capture(block, canvas)
       end
-
-      unless input.touch.nil?
-        events[:taphold].capture(block, canvas)
-        events[:pinch].capture(block, canvas)
-        events[:swipe].capture(block, canvas)
-      end
     end
   end
 end

data/ui/src/hokusai/types.rb

@@ -1,42 +1,266 @@
 # frozen_string_literal: true
 
-require_relative "./types/primitives"
-require_relative "./types/display"
-require_relative "./types/touch"
-require_relative "./types/mouse"
-require_relative "./types/keyboard"
-
 module Hokusai
-  class Input
-    attr_accessor :keyboard_override
-    attr_reader :raw, :touch
+  # Rect = Struct.new(:x, :y, :width, :height) do
+  class Rect
+    attr_accessor :x, :y, :width, :height
+
+    def initialize(x, y, width, height)
+      @x = x
+      @y = y
+      @width = width
+      @height = height
+    end
+    def to_hoku_rect
+      @hoku_rect ||= LibHokusai::HmlRect.create(x, y, width, height)
+    end
+
+    def includes_y?(y)
+      LibHokusai.hoku_rect_includes_y(to_hoku_rect, y)
+    end
+
+    def includes_x?(x)
+      LibHokusai.hoku_rect_includes_x(to_hoku_rect, x)
+    end
+
+    def move_x_left(times = 1)
+      LibHokusai.hoku_rect_x_left(to_hoku_rect, times)
+    end
+
+    def move_x_right(times = 1)
+      LibHokusai.hoku_rect_x_right(to_hoku_rect, times)
+    end
+
+    def move_y_up(times = 1)
+      LibHokusai.hoku_rect_y_up(to_hoku_rect, times)
+    end
+
+    def move_y_down(times = 1)
+      LibHokusai.hoku_rect_y_down(to_hoku_rect, times)
+    end
+
+    def self.from_hoku_rect(rect)
+      self.x = rect[:x]
+      self.y = rect[:y]
+      self.width = rect[:w]
+      self.height = rect[:h]
+    end
+  end
+
+  Outline = Struct.new(:top, :right, :bottom, :left) do
+    def self.default
+      new(0.0, 0.0, 0.0, 0.0)
+    end
 
     def hash
-      [self.class, mouse.pos.x, mouse.pos.y, mouse.scroll, mouse.left.clicked, mouse.left.down, mouse.left.up].hash
+      [self.class, top, right, bottom, left].hash
+    end
+
+    def self.convert(value)
+      case value
+      when String
+        if value =~ /,/
+          convert(value.split(",").map(&:to_f))
+        else
+          convert(value.to_f)
+        end
+      when Float
+        new(value, value, value, value)
+      when Array
+        new(value[0] || 0.0, value[1] || 0.0, value[2] || 0.0, value[3] || 0.0)
+      when Outline
+        value
+      end
+    end
+
+    def present?
+      top > 0.0 || right > 0.0 || bottom > 0.0 || left > 0.0
+    end
+
+    def uniform?
+      top == right && top == bottom && top == left
+    end
+  end
+
+  class Padding
+    attr_reader :top, :left, :right, :bottom
+    def initialize(top, right, bottom, left)
+      @top = top
+      @left = left
+      @right = right
+      @bottom = bottom
+    end
+
+    alias_method :t, :top
+    alias_method :l, :left
+    alias_method :r, :right
+    alias_method :b, :bottom
+
+    def self.convert(value)
+      case value
+      when String
+        if value =~ /,/
+          convert(value.split(",").map(&:to_f))
+        else
+          convert(value.to_i)
+        end
+      when Integer
+        new(value, value, value, value)
+      when Array
+        new(value[0], value[1], value[2], value[3])
+      when Padding
+        value
+      else
+        raise Hokusai::Error.new("Unsupported conversion type #{value.class} for Hokusai::Padding")
+      end
+    end
+
+    def hash
+      [self.class, top, right, bottom, left].hash
+    end
+  end
+
+  class Canvas
+    attr_accessor :width, :height, :x, :y, :vertical, :reverse
+    def initialize(width, height, x = 0.0, y = 0.0, vertical = true, reverse = false)
+      @width = width
+      @height = height
+      @x = x
+      @y = y
+      @vertical = vertical
+      @reverse = reverse
     end
 
-    def initialize
-      @touch = nil
-      @keyboard_override = false
+    def reset(x, y, width, height, vertical: true, reverse: false)
+      self.x = x
+      self.y = y
+      self.width = width
+      self.height = height
+      self.vertical = vertical
+      self.reverse = reverse
     end
 
-    def support_touch!
-      @touch ||= Touch.new
+    def to_bounds
+      Hokusai::Rect.new(x, y, width, height)
+    end
+
+    def reverse?
+      reverse
+    end
+
+    def to_hoku_rect
+      LibHokusai::HmlRect.create(x, y, width, height)
+    end
+  end
+
+  # Color = Struct.new(:red, :green, :blue, :alpha) do
+  class Color
+    attr_reader :red, :green, :blue, :alpha
+    def initialize(red, green, blue, alpha = 255)
+      @red = red.freeze
+      @green = green.freeze
+      @blue = blue.freeze
+      @alpha = alpha.freeze
+    end
+
+    alias_method :r, :red
+    alias_method :b, :blue
+    alias_method :g, :green
+    alias_method :a, :alpha
+
+    def self.convert(value)
+      case value
+      when String
+        value = value.split(",").map(&:to_i)
+      when Array
+      when Color
+        return value
+      else
+        raise Hokusai::Error.new("Unsupported conversion type #{value.class} for Hokusai::Color")
+      end
+
+      new(value[0], value[1], value[2], value[3] || 255)
+    end
+
+    def hash
+      [self.class, r, g, b, a].hash
+    end
+  end
+
+  class Keyboard
+    attr_reader :raw
+
+    [
+      :shift, :super, :ctrl,
+      :alt, :pressed, :pressed_len, :released,
+      :released_len
+    ].each do |name|
+      define_method(name) do
+        raw[name]
+      end
+    end
+
+    def keyboard_key
+      pressed.read_array_of_type(TYPE_UINT8, :read_uint8, pressed_len).first
+    end
+
+    def key
+      keyboard_key[:key][:key]
+    end
+
+    def initialize(raw)
+      @raw = raw
+    end
+  end
+
+  class Mouse
+    attr_reader :raw
+
+    def initialize(raw)
+      @raw = raw
+    end
+
+    [
+      :pos, :delta, :scroll,
+      :scroll_delta, :selection,
+      :selection_type, :left,
+      :middle, :right
+    ].each do |name|
+      define_method(name) do
+        # instance_variable_set("@#{name}", raw[name]) if instance_variable_get("@#{name}").nil?
+        #
+        # instance_variable_get("@#{name}")
+
+        raw[name]
+      end
+
+      define_method("#{name}=") do |val|
+        raw[name] = val
+      end
+    end
+  end
+
+  class Input
+    attr_reader :raw
+
+    def hash
+      [self.class, mouse.pos.x, mouse.pos.y, mouse.scroll, mouse.left.clicked, mouse.left.down, mouse.left.up].hash
+    end
 
-      self
+    def initialize(raw)
+      @raw = raw
     end
 
     def keyboard
-      @keyboard ||= Keyboard.new
+      Keyboard.new(@raw[:keyboard])
     end
 
     def mouse
-      @mouse ||= Mouse.new
+      @mouse ||= Mouse.new(@raw[:mouse])
     end
 
     def hovered?(canvas)
-      pos = mouse.pos
-      pos.x >= canvas.x && pos.x <= canvas.x + canvas.width && pos.y >= canvas.y && pos.y <= canvas.y + canvas.height
+      LibHokusai.hoku_input_is_hovered(raw, canvas.to_hoku_rect)
     end
   end
 end

data/ui/src/hokusai.rb

@@ -13,11 +13,45 @@ require_relative './hokusai/event'
 require_relative './hokusai/painter'
 require_relative './hokusai/util/selection'
 require_relative './hokusai/util/piece_table'
+require_relative './hokusai/blocks/empty'
+require_relative './hokusai/blocks/vblock'
+require_relative './hokusai/blocks/hblock'
+require_relative './hokusai/blocks/label'
+require_relative './hokusai/blocks/rect'
+require_relative './hokusai/blocks/button'
+require_relative './hokusai/blocks/circle'
+require_relative './hokusai/blocks/checkbox'
+require_relative './hokusai/blocks/scissor_begin'
+require_relative './hokusai/blocks/scissor_end'
+require_relative './hokusai/blocks/clipped'
+require_relative './hokusai/blocks/cursor'
+require_relative './hokusai/blocks/image'
+require_relative './hokusai/blocks/svg'
+require_relative './hokusai/blocks/toggle'
+require_relative './hokusai/blocks/scrollbar'
+require_relative './hokusai/blocks/dynamic'
+require_relative './hokusai/blocks/panel'
+require_relative './hokusai/blocks/text'
+require_relative './hokusai/blocks/selectable'
+require_relative './hokusai/blocks/input'
+require_relative './hokusai/blocks/variable'
+require_relative './hokusai/blocks/titlebar/osx'
+require_relative './hokusai/blocks/modal'
+require_relative './hokusai/blocks/dropdown'
+
+require "concurrent"
 
 # A backend agnostic library for authoring 
 # desktop applications
 # @author skinnyjames
 module Hokusai
+  ThreadPool = Concurrent::ThreadPoolExecutor.new(
+    min_threads: 5,
+    max_threads: 5,
+    max_queue: 20,
+    fallback_policy: :caller_runs
+  )
+
   SHADER_UNIFORM_FLOAT = 0      # Shader uniform type: float
   SHADER_UNIFORM_VEC2 = 1       # Shader uniform type: vec2 (2 float)
   SHADER_UNIFORM_VEC3 = 2       # Shader uniform type: vec3 (3 float)
@@ -31,10 +65,6 @@ module Hokusai
   SHADER_UNIFORM_UIVEC3 = 10    # Shader uniform type: uivec3 (3 unsigned int)
   SHADER_UNIFORM_UIVEC4 = 11    # Shader uniform type: uivec4 (4 unsigned int)
 
-  def self.asset(path)
-    "#{ASSETS_FOLDER}/#{path}"
-  end
-
   # Access the font registry
   #
   # @return [Hokusai::FontRegistry]
@@ -136,60 +166,4 @@ module Hokusai
   def self.set_mouse_cursor(type)
     @on_set_mouse_cursor&.call(type)
   end
-
-  # Mobile support
-  def self.on_show_keyboard(&block)
-    @on_show_keyboard = block
-  end
-
-  def self.show_keyboard
-    @on_show_keyboard&.call
-  end
-
-  def self.on_hide_keyboard(&block)
-    @on_hide_keyboard = block
-  end
-
-  def self.hide_keyboard
-    @on_hide_keyboard&.call
-  end
-
-  def self.on_keyboard_visible(&block)
-    @on_keyboard_visible = block
-  end
-
-  def self.keyboard_visible?
-    @on_keyboard_visible&.call
-  end
-end
-
-require_relative './hokusai/blocks/empty'
-require_relative './hokusai/blocks/vblock'
-require_relative './hokusai/blocks/hblock'
-require_relative './hokusai/blocks/label'
-require_relative './hokusai/blocks/rect'
-require_relative './hokusai/blocks/button'
-require_relative './hokusai/blocks/circle'
-require_relative './hokusai/blocks/checkbox'
-require_relative './hokusai/blocks/scissor_begin'
-require_relative './hokusai/blocks/scissor_end'
-require_relative './hokusai/blocks/clipped'
-require_relative './hokusai/blocks/cursor'
-require_relative './hokusai/blocks/image'
-require_relative './hokusai/blocks/svg'
-require_relative './hokusai/blocks/toggle'
-require_relative './hokusai/blocks/scrollbar'
-require_relative './hokusai/blocks/dynamic'
-require_relative './hokusai/blocks/panel'
-require_relative './hokusai/blocks/text'
-require_relative './hokusai/blocks/selectable'
-require_relative './hokusai/blocks/input'
-require_relative './hokusai/blocks/variable'
-require_relative './hokusai/blocks/titlebar/osx'
-require_relative './hokusai/blocks/modal'
-require_relative './hokusai/blocks/dropdown'
-require_relative './hokusai/blocks/shader_begin'
-require_relative './hokusai/blocks/shader_end'
-require_relative './hokusai/blocks/texture'
-require_relative './hokusai/blocks/color_picker'
-require_relative './hokusai/blocks/keyboard'
+end

data/xmake.lua

@@ -159,7 +159,7 @@ target("test-ast")
   )
   -- add_cflags("-Wall -Werror")
   after_build(function(target)
-    os.exec("./%s -t input", target:targetfile())
+    os.exec("./%s -t markdown", target:targetfile())
     -- os.exec("leaks -atExit -- %s", target:targetfile())
   end)
 target_end()

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hokusai-zero
 version: !ruby/object:Gem::Version
-  version: 0.2.6.pre.pinephone6
+  version: 0.2.6
 platform: ruby
 authors:
 - skinnyjames
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -23,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: raylib-bindings
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+description:
 email: zero@skinnyjames.net
 executables: []
 extensions:
@@ -165,26 +181,17 @@ files:
 - ui/examples/buddy.rb
 - ui/examples/clock.rb
 - ui/examples/counter.rb
-- ui/examples/drag.rb
 - ui/examples/dynamic.rb
-- ui/examples/embedded.rb
 - ui/examples/foobar.rb
 - ui/examples/forum.rb
 - ui/examples/forum/file.rb
 - ui/examples/forum/music.rb
 - ui/examples/forum/post.rb
-- ui/examples/game.rb
-- ui/examples/keyboard.rb
-- ui/examples/overlay.rb
-- ui/examples/provider.rb
-- ui/examples/shader.rb
-- ui/examples/shader/test.rb
 - ui/examples/spreadsheet.rb
 - ui/examples/spreadsheet/csv.rb
 - ui/examples/stock.rb
 - ui/examples/stock_decider/option.rb
 - ui/examples/tic_tac_toe.rb
-- ui/examples/wiki.rb
 - ui/lib/lib_hokusai.rb
 - ui/spec/hokusai/ast_spec.rb
 - ui/spec/hokusai/automation/keys_transcoder_spec.rb
@@ -193,7 +200,6 @@ files:
 - ui/spec/hokusai/diff_spec.rb
 - ui/spec/hokusai/directives_spec.rb
 - ui/spec/hokusai/e2e/client_spec.rb
-- ui/spec/hokusai/e2e/keyboard_spec.rb
 - ui/spec/hokusai/e2e/meta_spec.rb
 - ui/spec/hokusai/providers_spec.rb
 - ui/spec/hokusai/publisher_spec.rb
@@ -202,12 +208,9 @@ files:
 - ui/spec/hokusai_spec.rb
 - ui/spec/spec_helper.rb
 - ui/src/hokusai.rb
-- ui/src/hokusai/assets/arrow-down-line.png
-- ui/src/hokusai/assets/arrow-down-wide-line.png
 - ui/src/hokusai/assets/arrow-drop-down-line.png
+- ui/src/hokusai/assets/chevron-down.svg
 - ui/src/hokusai/assets/close-large-line.png
-- ui/src/hokusai/assets/icons/outline/arrow-big-up.svg
-- ui/src/hokusai/assets/icons/outline/backspace.svg
 - ui/src/hokusai/ast.rb
 - ui/src/hokusai/automation.rb
 - ui/src/hokusai/automation/client.rb
@@ -239,7 +242,6 @@ files:
 - ui/src/hokusai/blocks/checkbox.rb
 - ui/src/hokusai/blocks/circle.rb
 - ui/src/hokusai/blocks/clipped.rb
-- ui/src/hokusai/blocks/color_picker.rb
 - ui/src/hokusai/blocks/cursor.rb
 - ui/src/hokusai/blocks/dropdown.rb
 - ui/src/hokusai/blocks/dynamic.rb
@@ -247,7 +249,6 @@ files:
 - ui/src/hokusai/blocks/hblock.rb
 - ui/src/hokusai/blocks/image.rb
 - ui/src/hokusai/blocks/input.rb
-- ui/src/hokusai/blocks/keyboard.rb
 - ui/src/hokusai/blocks/label.rb
 - ui/src/hokusai/blocks/modal.rb
 - ui/src/hokusai/blocks/panel.rb
@@ -256,12 +257,8 @@ files:
 - ui/src/hokusai/blocks/scissor_end.rb
 - ui/src/hokusai/blocks/scrollbar.rb
 - ui/src/hokusai/blocks/selectable.rb
-- ui/src/hokusai/blocks/shader_begin.rb
-- ui/src/hokusai/blocks/shader_end.rb
-- ui/src/hokusai/blocks/slider.rb
 - ui/src/hokusai/blocks/svg.rb
 - ui/src/hokusai/blocks/text.rb
-- ui/src/hokusai/blocks/texture.rb
 - ui/src/hokusai/blocks/titlebar/osx.rb
 - ui/src/hokusai/blocks/toggle.rb
 - ui/src/hokusai/blocks/variable.rb
@@ -272,15 +269,12 @@ files:
 - ui/src/hokusai/commands/image.rb
 - ui/src/hokusai/commands/rect.rb
 - ui/src/hokusai/commands/scissor.rb
-- ui/src/hokusai/commands/shader.rb
 - ui/src/hokusai/commands/text.rb
-- ui/src/hokusai/commands/texture.rb
 - ui/src/hokusai/diff.rb
 - ui/src/hokusai/error.rb
 - ui/src/hokusai/event.rb
 - ui/src/hokusai/events/keyboard.rb
 - ui/src/hokusai/events/mouse.rb
-- ui/src/hokusai/events/touch.rb
 - ui/src/hokusai/font.rb
 - ui/src/hokusai/meta.rb
 - ui/src/hokusai/mounting/loop_entry.rb
@@ -292,15 +286,9 @@ files:
 - ui/src/hokusai/publisher.rb
 - ui/src/hokusai/style.rb
 - ui/src/hokusai/types.rb
-- ui/src/hokusai/types/display.rb
-- ui/src/hokusai/types/keyboard.rb
-- ui/src/hokusai/types/mouse.rb
-- ui/src/hokusai/types/primitives.rb
-- ui/src/hokusai/types/touch.rb
 - ui/src/hokusai/util/clamping_iterator.rb
 - ui/src/hokusai/util/piece_table.rb
 - ui/src/hokusai/util/selection.rb
-- ui/src/hokusai/util/wrap_stream.rb
 - ui/vendor/.gitkeep
 - vendor/.gitkeep
 - xmake.lua
@@ -309,6 +297,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://codeberg.org/skinnyjames/hokusai
+post_install_message:
 rdoc_options: []
 require_paths:
 - ui/src
@@ -323,7 +312,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: A Ruby library for writing GUI applications
 test_files: []