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

data/ui/src/hokusai/types.rb

@@ -96,6 +96,14 @@ module Hokusai
     alias_method :r, :right
     alias_method :b, :bottom
 
+    def width
+      right + left
+    end
+
+    def height
+      top + bottom
+    end
+
     def self.convert(value)
       case value
       when String
@@ -129,6 +137,7 @@ module Hokusai
       @y = y
       @vertical = vertical
       @reverse = reverse
+      @hoku_rect = LibHokusai::HmlRect.create(x, y, width, height)
     end
 
     def reset(x, y, width, height, vertical: true, reverse: false)
@@ -138,6 +147,10 @@ module Hokusai
       self.height = height
       self.vertical = vertical
       self.reverse = reverse
+      @hoku_rect[:x] = x
+      @hoku_rect[:y] = y
+      @hoku_rect[:w] = width
+      @hoku_rect[:h] = height
     end
 
     def to_bounds
@@ -149,7 +162,7 @@ module Hokusai
     end
 
     def to_hoku_rect
-      LibHokusai::HmlRect.create(x, y, width, height)
+      @hoku_rect
     end
   end
 
@@ -241,90 +254,185 @@ module Hokusai
   end
 
   class Touch
-    attr_reader :raw
+    attr_accessor :stack, :archive
+    def initialize
+      @stack = []
+      @archive = []
+      @tapped = false
+      @swiped = false
+      @pinched = false
+      # @file = File.open("touch.log", "w")
+    end
 
-    [
-      :touch_len, :touch_count, :touching_now, :timer, 
-    ].each do |key|
-      define_method(key) do
-        raw[:touch][key]
-      end
+    def tapped?
+      @tapped
     end
 
     def swiped?
-      LibHokusai.hoku_input_touch_swiped(raw)
+      @swiped
     end
 
+    def pinched?
+      @pinched
+    end
+
+    def longtapping?(stuff = "ok")
+      log("#{touching?} - #{elapsed(token)} - #{stuff}") if touching?
+      touching? && elapsed(token) > 5
+    end
+    
     def longtapped?
-      LibHokusai.hoku_input_touch_longtapped(raw)
+      @longtapped
+    end
+
+    def touching?
+      type == :down || type == :move
     end
 
-    # return [Intger] duration in milliseconds
     def duration
-      LibHokusai.hoku_input_touch_duration(raw)
+      if longtapping?
+        return elapsed(token)
+      end
+      
+      first, last = archive[-2..-1]
+
+      last[:start] - first[:start]
     end
 
-    def touching?
-      touching_now
+    def distance
+      raise Hokusai::Error.new("Archive is empty") if archive.empty?
+      first, last = archive[-2..-1]
+      
+      x = last[:x] - first[:x]
+      y = last[:y] - first[:y]
+
+      [x, y]
     end
 
-    def tapped?
-      LibHokusai.hoku_input_touch_tapped(raw)
+    def direction
+      raise Hokusai::Error.new("Archive is empty") if archive.empty?
+
+      first, last = archive[-2..-1]
+      
+      x = last[:x] - first[:x]
+      y = last[:y] - first[:y]
+
+      if x.abs > y.abs
+        # swiping left/right
+        last[:x] > first[:x] ? :right : :left
+      else
+        # swiping up/down
+        last[:y] > first[:y] ? :down : :up
+      end
     end
 
-    def position(index=0)
-      touches[index]
+    def angle
+      raise Hokusai::Error.new("Archive is empty") if archive.empty?
+
+      last, first = archive[-2..-1]
+      
+      x = last[:x] - first[:x]
+      y = last[:y] - first[:y]
+
+      (Math.atan2(x, y) * (-180 / Math::PI)).round(0).to_i
     end
 
-    def last_position(index=0)
-      last_touches[index]
+    def log(str)
+      # Thread.new do
+      #   @file.write_nonblock("#{str}\n")
+      # end
     end
 
-    def angle(index = 0)
-      return nil unless swiped?
+    def record(finger, x, y)
+      log("recording #{token}")
+      if type == :down
+        push(:move, finger, x, y)
+        log("state is move")
+      elsif type == :move
+        stack.last[:x] = x
+        stack.last[:y] = y
+        
+        log("updated state move")
+      else 
+        @longtapped = false
+        @swiped = false
+        @tapped = false
+        push(:down, finger, x, y)
+        log("state is down")
+      end
+    end
 
-      pos = position(index)
-      lpos = last_position(index)
+    def clear
+      # log("clearing")
+      if type == :move
+        log("elapsed: #{elapsed(token)}")
+        if elapsed(token) > 300 && within(10.0)
+          @longtapped = true
+          log('longtap')
+        elsif within(10.0)
+          @tapped = true
+        else
+          @swiped = true
+          log('swipe')
+        end
+      elsif type == :down
+        @tapped = true
+        log('tap')
+      else
+        @longtapped = false
+        @swiped = false
+        @tapped = false
+      end
 
-      x = position.x - last_position.x
-      y = position.y - last_position.y
+      self.archive = stack.dup
+      stack.clear
+    end
 
-      (Math.atan2(x, y) * (180 / Math::PI)).round(0).to_i
+    def elapsed(token)
+      Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond) - token[:start]
     end
 
-    def direction(index=0)
-      return nil unless swiped?
+    def within(threshold)
+      move = stack.last
+      down = stack[-2]
 
-      pos = position(index)
-      lpos = last_position(index)
+      t1 = (move[:x] - down[:x]).abs
+      t2 = (move[:y] - down[:y]).abs
 
-      x = position.x - last_position.x
-      y = position.y - last_position.y
+      t1 < threshold && t2 < threshold
+    end
 
-      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
+    def pop
+      stack.pop
     end
 
-    def last_touches
-      @raw[:last_touch_positions].read_array_of_type(LibHokusai::HmlDoubleVec2, :read_pointer, touch_len)
+    def push(type, finger, x, y)
+      log("push: #{type}")
+      stack << {
+        type: type,
+        i: finger,
+        x: x,
+        y: y,
+        start: Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
+      }
     end
 
-    def touches
-      @raw[:touch_positions].read_array_of_type(LibHokusai::HmlDoubleVec2, :read_pointer, touch_len)
+    def index
+      token&.[](:finger)
     end
 
-    def initialize(raw)
-      @raw = raw
+    def type
+      token&.[](:type)
+    end
+
+    def token
+      @stack.last
     end
   end
 
   class Input
-    attr_reader :raw
+    attr_accessor :keyboard_override
+    attr_reader :raw, :touch
 
     def hash
       [self.class, mouse.pos.x, mouse.pos.y, mouse.scroll, mouse.left.clicked, mouse.left.down, mouse.left.up].hash
@@ -332,12 +440,14 @@ module Hokusai
 
     def initialize(raw)
       @raw = raw
+      @touch = nil
+      @keyboard_override = false
     end
 
-    def touch
-      return nil if @raw[:touch].null?
+    def support_touch!
+      @touch ||= Touch.new
 
-      Touch.new(@raw)
+      self
     end
 
     def keyboard

data/ui/src/hokusai/util/wrap_stream.rb

@@ -0,0 +1,197 @@
+require "rouge"
+require "hokusai"
+require_relative "./lib/hokusai_code/formatter"
+
+module Hokusai::Util
+  class Wrapped
+    attr_accessor :text, :x, :y, :extra
+    
+    def initialize(text, x, y, extra)
+      @text = text
+      @x = x
+      @y = y
+      @extra = extra
+    end
+  end
+
+  class SelectionWrapper
+    attr_accessor :x, :y, :width, :height
+
+    def initialize(x, y, w, h)
+      @x = x
+      @y = y
+      @width = w
+      @height = h
+    end
+
+    def <<(w)
+      @width += w
+    end
+  end
+
+  class WrapStream
+    attr_accessor :width, :current_width, :x, :y,
+                  :origin_x, :origin_y, :buffer, :stack
+    attr_reader :on_text_cb, :on_text_selection_cb, :on_advancex_cb, :selector, :padding
+
+    def initialize(width, &measure)
+      @width = width
+      @current_width = 0.0
+
+      @origin_x = 0.0
+      @origin_y = 0.0
+      @x = @origin_x
+      @y = @origin_y
+
+      @stack = []
+      @buffer = ""
+
+      @measure_cb = measure
+    end
+
+    def on_advancex(&block)
+      @on_advancex_cb = block
+    end
+
+    def on_text_selection(selector, padding, &block)
+      @selector = selector
+      @padding = padding || Hokusai::Padding.new(0.0, 0.0, 0.0, 0.0)
+      @on_text_selection_cb = block
+    end
+
+    def on_text(&block)
+      @on_text_cb = block
+    end
+
+    def measure(string, extra)
+      @measure_cb.call(string, extra)
+    end
+
+    def flush
+      sx = x + padding.left
+      wrapper = nil
+      stack.each do |(range, extra)|
+        str = buffer[range]
+        if selector
+          str.split("").each do |char|
+            nw, nh = measure(char, extra)
+            ox = on_advancex_cb.call(char.codepoints.first)
+
+            if selector.selected(sx, y + padding.top - selector.offset_y, nw, nh)
+              wrapper ||= SelectionWrapper.new(sx, y + padding.top, 0.0, nh)
+              wrapper << ox
+            end
+
+            sx +=  ox
+          end
+
+          on_text_selection_cb.call(wrapper) if wrapper  
+          wrapper = nil
+        end
+
+        nw, _ = measure(str, extra)
+
+        # hard break on the buffer, split on character
+        wrap_and_call(str, extra)
+
+        self.x += nw
+      end
+      
+      self.current_width = 0.0
+      self.buffer = ""
+      stack.clear
+      self.x = origin_x
+    end
+
+    def wrap(text, extra)
+      offset = 0
+      size = text.size
+
+      stack << [((buffer.size)..(text.size + buffer.size - 1)), extra]
+
+      while offset < size
+        char = text[offset]
+        w, h = measure(char, extra)
+
+        # if it's a newline we want to break
+        if char =~ /\n|\r\n/
+          flush
+
+          stack << [(0...(text.size - offset - 1)), extra]
+          self.y += h
+          self.x = origin_x
+          offset += 1
+
+          next
+        end
+
+        # if adding this char extends beyond the boundary
+        if current_width + w > width
+          # find the last space
+          idx = buffer.rindex(" ")
+          
+          # if there is a break in this line split the buffer
+          # and render the current line
+          unless idx.nil? || idx < (buffer.size / 2)
+            cur = []
+            nex = []
+            found = false
+
+            # We need to split up both the buffer, and the ranges
+            while payload = stack.shift
+              range, xtra = payload
+              if range.include?(idx)
+                # putting the space on this line
+                cur << [(range.begin..idx), xtra]
+                # pp [range, idx]
+                nex << [(0..(range.end - idx - 1)), xtra] unless idx == range.end
+                
+                found = true
+              elsif !found
+                cur << payload
+              else
+                nex << [((range.begin - idx - 1)..(range.end - idx - 1)), xtra] 
+              end
+            end
+
+            scur = buffer[0..idx]
+            snex = buffer[(idx + 1)..-1]
+
+            cur.each do |(range, xtra)|
+              str = scur[range]
+
+              nw, _ = measure(str, xtra)
+              wrap_and_call(str, xtra)
+
+              self.x += nw
+            end
+
+            self.buffer = snex + char
+            self.stack = nex
+            self.y += h
+            self.current_width = measure(buffer, extra).first
+            self.x = origin_x
+          else
+            # break on this word
+            flush
+
+            self.y += h
+            self.current_width = measure(char, extra).first
+            self.buffer = char
+            stack << [(0...(text.size - offset)), extra]
+          end
+        else
+          self.current_width += w
+          buffer << char
+        end
+
+        offset += 1
+      end
+      
+    end
+
+    private def wrap_and_call(text, extra)
+      on_text_cb.call Wrapped.new(text, x, y, extra)
+    end
+  end
+end

data/ui/src/hokusai.rb

@@ -13,35 +13,6 @@ 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_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
@@ -60,6 +31,10 @@ 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]
@@ -161,4 +136,60 @@ module Hokusai
   def self.set_mouse_cursor(type)
     @on_set_mouse_cursor&.call(type)
   end
-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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hokusai-zero
 version: !ruby/object:Gem::Version
-  version: 0.2.6.pre.pinephone2
+  version: 0.2.6.pre.pinephone4
 platform: ruby
 authors:
 - skinnyjames
@@ -114,7 +114,6 @@ 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
@@ -175,6 +174,7 @@ files:
 - 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
@@ -193,6 +193,7 @@ 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
@@ -205,6 +206,8 @@ files:
 - ui/src/hokusai/assets/arrow-down-wide-line.png
 - ui/src/hokusai/assets/arrow-drop-down-line.png
 - 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
@@ -221,10 +224,6 @@ 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
@@ -248,6 +247,7 @@ 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
@@ -258,6 +258,7 @@ files:
 - 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
@@ -294,6 +295,7 @@ files:
 - 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