hokusai-zero 0.2.6.pre.android → 0.2.6.pre.pinephone2

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

@@ -0,0 +1,22 @@
+class Hokusai::Blocks::ShaderBegin < Hokusai::Block
+  template <<~EOF
+  [template]
+    slot
+  EOF
+
+  computed :fragment_shader, default: nil
+  computed :vertex_shader, default: nil
+  computed :uniforms, default: []
+
+  def render(canvas)
+    draw do
+      shader_begin do |command|
+        command.vertex_shader = vertex_shader
+        command.fragment_shader = fragment_shader
+        command.uniforms = uniforms
+      end
+    end
+
+    yield canvas
+  end
+end

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

@@ -0,0 +1,12 @@
+class Hokusai::Blocks::ShaderEnd < Hokusai::Block
+  template <<~EOF
+  [template]
+    virtual
+  EOF
+
+  def render(canvas)
+    draw do
+      shader_end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+class Hokusai::Blocks::Texture < Hokusai::Block
+  template <<~EOF
+  [template]
+    virtual
+  EOF
+
+  computed :width, default: nil, convert: proc(&:to_i)
+  computed :height, default: nil, convert: proc(&:to_i)
+  computed :x, default: nil
+  computed :y, default: nil
+  computed :rotation, default: nil
+  computed :scale, default: 100.0
+
+
+  def render(canvas)
+    draw do
+      texture(x || canvas.x, y || canvas.y, width || canvas.width, height || canvas.height) do |command|
+        command.rotation = rotation if rotation
+        command.scale = scale
+      end
+    end
+  end
+end

data/ui/src/hokusai/commands/rect.rb

@@ -2,7 +2,7 @@ module Hokusai
   class Commands::Rect < Commands::Base
     attr_reader :x, :y, :width, :height,
                 :rounding, :color, :outline,
-                :outline_color, :padding
+                :outline_color, :padding, :gradient
 
     def initialize(x, y, width, height)
       @x = x.to_f
@@ -14,6 +14,7 @@ module Hokusai
       @color = Color.new(0, 0, 0, 0)
       @outline_color = Color.new(0, 0, 0, 255)
       @padding = Padding.new(0.0, 0.0, 0.0, 0.0)
+      @gradient = nil
     end
 
     def hash
@@ -44,6 +45,14 @@ module Hokusai
       height
     end
 
+    def gradient=(colors)
+      unless colors.is_a?(Array) && colors.size == 4 && colors.all? { |color| color.is_a?(Hokusai::Color) }
+        raise Hokusai::Error.new("Gradient must be an array of 4 Hokuai::Color")
+      end
+
+      @gradient = colors
+    end
+
     # Sets padding for the rectangle
     # `value` is an array with padding declarations
     # at [top, right, bottom, left]

data/ui/src/hokusai/commands/shader.rb

@@ -0,0 +1,33 @@
+module Hokusai
+  class Commands::ShaderBegin < Commands::Base
+    attr_reader :vertex_shader, :fragment_shader, :uniforms
+
+    def initialize
+      @uniforms = []
+      @vertex_shader =  nil
+      @fragment_shader = nil
+    end
+
+    def vertex_shader=(content)
+      @vertex_shader = content
+    end
+
+    def fragment_shader=(content)
+      @fragment_shader = content
+    end
+
+    def uniforms=(values)
+      @uniforms = values
+    end
+
+    def hash
+      [self.class, vertex_shader, fragment_shader].hash
+    end
+  end
+
+  class Commands::ShaderEnd < Commands::Base;
+    def hash
+      [self.class].hash
+    end
+  end
+end

data/ui/src/hokusai/commands/texture.rb

@@ -0,0 +1,26 @@
+module Hokusai
+  class Commands::Texture < Commands::Base
+    attr_reader :x, :y, :width, :height, :rotation, :scale
+
+    def initialize(x, y, width, height)
+      @x = x
+      @y = y
+      @width = width
+      @height = height
+      @rotation = 0.0
+      @scale = 10.0
+    end
+
+    def rotation=(value)
+      @rotation = value
+    end
+
+    def scale=(value)
+      @scale = value
+    end
+
+    def hash
+      [self.class, x, y, width, height].hash
+    end
+  end
+end

data/ui/src/hokusai/commands.rb

@@ -4,6 +4,8 @@ require_relative "./commands/image"
 require_relative "./commands/rect"
 require_relative "./commands/scissor"
 require_relative "./commands/text"
+require_relative "./commands/shader"
+require_relative "./commands/texture"
 
 module Hokusai
   # A proxy class for invoking various UI commands
@@ -81,6 +83,26 @@ module Hokusai
       queue << Commands::ScissorEnd.new
     end
 
+    def shader_begin
+      command = Commands::ShaderBegin.new
+
+      yield command
+
+      queue << command
+    end
+
+    def shader_end
+      queue << Commands::ShaderEnd.new
+    end
+
+    def texture(x, y, w, h)
+      command = Commands::Texture.new(x, y, w, h)
+
+      yield command
+
+      queue << command
+    end
+
     # Draws text
     #
     # @param [String] the text content

data/ui/src/hokusai/event.rb

@@ -65,4 +65,5 @@ module Hokusai
 end
 
 require_relative './events/keyboard'
-require_relative './events/mouse'
+require_relative './events/mouse'
+require_relative './events/touch'

data/ui/src/hokusai/events/touch.rb

@@ -0,0 +1,66 @@
+module Hokusai
+  class TouchEvent < Event
+    extend Forwardable
+
+    def_delegators :@touch, :tapped?, :swiped?, :longtapped?, :touching?,
+                   :duration, :direction, :angle, :position, :last_position,
+                  :touch_len, :touch_count, :timer
+
+    attr_reader :input
+
+    def initialize(input, state)
+      @input = input
+      @state = state
+      @touch = input.touch
+    end
+
+    def hovered(canvas)
+      input.hovered?(canvas)
+    end
+
+    def to_json
+      {
+        keypress: {
+          hold: hold,
+          hold_duration: hold_duration.to_s,
+        }
+      }.to_json
+    end
+  end
+
+  class TapHoldEvent < TouchEvent
+    name "taphold"
+
+    def capture(block, canvas)
+      if longtapped? && hovered(canvas)
+        block.node.meta.focus
+        
+        if matches(block)
+          captures << block
+        end
+      elsif touching?
+        block.node.meta.blur
+      end
+    end
+  end
+
+  class PinchEvent < TouchEvent
+    name "pinch"
+
+    def capture(block, canvas)
+      if false && matches(block)
+        captures << block
+      end
+    end
+  end
+
+  class SwipeEvent < TouchEvent
+    name "swipe"
+
+    def capture(block, canvas)
+      if swiped? && matches(block)
+        captures << block
+      end
+    end
+  end
+end

data/ui/src/hokusai/painter.rb

@@ -45,6 +45,16 @@ 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)
@@ -170,6 +180,12 @@ 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
@@ -265,6 +281,12 @@ module Hokusai
         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

@@ -240,6 +240,89 @@ module Hokusai
     end
   end
 
+  class Touch
+    attr_reader :raw
+
+    [
+      :touch_len, :touch_count, :touching_now, :timer, 
+    ].each do |key|
+      define_method(key) do
+        raw[:touch][key]
+      end
+    end
+
+    def swiped?
+      LibHokusai.hoku_input_touch_swiped(raw)
+    end
+
+    def longtapped?
+      LibHokusai.hoku_input_touch_longtapped(raw)
+    end
+
+    # return [Intger] duration in milliseconds
+    def duration
+      LibHokusai.hoku_input_touch_duration(raw)
+    end
+
+    def touching?
+      touching_now
+    end
+
+    def tapped?
+      LibHokusai.hoku_input_touch_tapped(raw)
+    end
+
+    def position(index=0)
+      touches[index]
+    end
+
+    def last_position(index=0)
+      last_touches[index]
+    end
+
+    def angle(index = 0)
+      return nil unless swiped?
+
+      pos = position(index)
+      lpos = last_position(index)
+
+      x = position.x - last_position.x
+      y = position.y - last_position.y
+
+      (Math.atan2(x, y) * (180 / Math::PI)).round(0).to_i
+    end
+
+    def direction(index=0)
+      return nil unless swiped?
+
+      pos = position(index)
+      lpos = last_position(index)
+
+      x = position.x - last_position.x
+      y = position.y - last_position.y
+
+      if x.abs > y.abs
+        # swiping left/right
+        position.x > last_position.x ? :right : :left
+      else
+        # swiping up/down
+        position.y > last_position.y ? :up : :down
+      end
+    end
+
+    def last_touches
+      @raw[:last_touch_positions].read_array_of_type(LibHokusai::HmlDoubleVec2, :read_pointer, touch_len)
+    end
+
+    def touches
+      @raw[:touch_positions].read_array_of_type(LibHokusai::HmlDoubleVec2, :read_pointer, touch_len)
+    end
+
+    def initialize(raw)
+      @raw = raw
+    end
+  end
+
   class Input
     attr_reader :raw
 
@@ -251,6 +334,12 @@ module Hokusai
       @raw = raw
     end
 
+    def touch
+      return nil if @raw[:touch].null?
+
+      Touch.new(@raw)
+    end
+
     def keyboard
       Keyboard.new(@raw[:keyboard])
     end

data/ui/src/hokusai.rb

@@ -38,20 +38,15 @@ require_relative './hokusai/blocks/variable'
 require_relative './hokusai/blocks/titlebar/osx'
 require_relative './hokusai/blocks/modal'
 require_relative './hokusai/blocks/dropdown'
-
-require "concurrent"
+require_relative './hokusai/blocks/shader_begin'
+require_relative './hokusai/blocks/shader_end'
+require_relative './hokusai/blocks/texture'
+require_relative './hokusai/blocks/color_picker'
 
 # 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)

data/xmake.lua

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: hokusai-zero
 version: !ruby/object:Gem::Version
-  version: 0.2.6.pre.android
+  version: 0.2.6.pre.pinephone2
 platform: ruby
 authors:
 - skinnyjames
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -24,20 +23,6 @@ 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
@@ -94,7 +79,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email: zero@skinnyjames.net
 executables: []
 extensions:
@@ -130,6 +114,7 @@ files:
 - ast/test/fixtures/test.ui
 - ast/test/greatest.h
 - ast/test/hokusai.c
+- ast/test/input.c
 - ast/test/parser.c
 - ast/test/text.c
 - docs.sh
@@ -181,17 +166,25 @@ 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/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
@@ -208,8 +201,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/ast.rb
 - ui/src/hokusai/automation.rb
@@ -227,6 +221,10 @@ files:
 - ui/src/hokusai/automation/keys_transcoder.rb
 - ui/src/hokusai/automation/selector.rb
 - ui/src/hokusai/automation/server.rb
+- ui/src/hokusai/backends/embedded.rb
+- ui/src/hokusai/backends/embedded/config.rb
+- ui/src/hokusai/backends/embedded/font.rb
+- ui/src/hokusai/backends/embedded/keys.rb
 - ui/src/hokusai/backends/raylib.rb
 - ui/src/hokusai/backends/raylib/config.rb
 - ui/src/hokusai/backends/raylib/font.rb
@@ -242,6 +240,7 @@ 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
@@ -257,8 +256,11 @@ 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/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
@@ -269,12 +271,15 @@ 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
@@ -297,7 +302,6 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://codeberg.org/skinnyjames/hokusai
-post_install_message:
 rdoc_options: []
 require_paths:
 - ui/src
@@ -312,8 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A Ruby library for writing GUI applications
 test_files: []

data/ui/src/hokusai/assets/chevron-down.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><title>finite-icons</title><path d="M13.60851,6.08611L8.35425,11.339,3.06908,6.05389a0.5,0.5,0,0,1,0-.70711l0.539-.539a0.5,0.5,0,0,1,.70711,0l4.03907,4.039L12.36249,4.8399a0.5,0.5,0,0,1,.70705.00006l0.539,0.539A0.5,0.5,0,0,1,13.60851,6.08611Z" fill="#231f20"/></svg>