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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2b53ce8769964539f51ad894c33476cecb01095b7b5ce851355cbf7df17a707
-  data.tar.gz: 430de1cd6a0ffae61fdf9ca547b15aa61e0065769f94472962047c0205df83ff
+  metadata.gz: b672dfc60bcfe8368484d46925bd4a01fe373e7208695ef1941a2dff41f8c2aa
+  data.tar.gz: 78f62f3189c1f7d505d301edd6a70d4b51fdbb15a7d71d95813f703c9e208dc1
 SHA512:
-  metadata.gz: d571179fb72b52671eafceed834e76c7154e205faaff5bb67a95d7d1eb801c86d34f6e5525ade0247db57e48c3019098744dbef7d704630fc4ea7b7577854ab4
-  data.tar.gz: '082837551a6b0ff70eda1779c4bde8232efe3108dad48359a05f597023895250faa07812878367229da734075bb0fb1c5c2ab180820b06e4040f7569fdb87306'
+  metadata.gz: e3a9eb97dac2c0331d8dcaca03fb520b182177ebfab0b48867e033df39d169ccd2dc4be6afe3395acf5b78d480caa3ed867ff5a3073994d781d9e568fd276198
+  data.tar.gz: fa827b5ee76853a7b2f8220f852dad1b4aad362908639e2117f138493011f2a98320441eaca88cd6c2ed6c80661e197ac965e4bd3056924214acd39e338ae304

data/hokusai.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'hokusai-zero'
-  s.version     = '0.2.6-pinephone3'
+  s.version     = '0.2.6-pinephone4'
   s.licenses    = ['MIT']
   s.summary     = "A Ruby library for writing GUI applications"
   s.authors     = ["skinnyjames"]

data/ui/examples/keyboard.rb

@@ -40,7 +40,7 @@ class KeyboardExample < Hokusai::Block
   end
 end
 
-Hokusai::Backends::SDLBackend.run(KeyboardExample) do |config|
+Hokusai::Backends::RaylibBackend.run(KeyboardExample) do |config|
   config.width = 370
   config.height = 680
   config.title = "keyboard example"

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.rb

@@ -113,22 +113,53 @@ module Hokusai::Backends
     end
 
     def process_input(input)
-      raylib_mouse_pos = Raylib.GetMousePosition
-      raylib_mouse_delta = Raylib.GetMouseDelta
-      LibHokusai.hoku_input_mouse_set_scroll(input.raw, Raylib.GetMouseWheelMove)
-      LibHokusai.hoku_input_set_mouse_position(input.raw, hml_vec2(raylib_mouse_pos.x, raylib_mouse_pos.y))
+      if !config.touch
+        raylib_mouse_pos = Raylib.GetMousePosition
+        raylib_mouse_delta = Raylib.GetMouseDelta
+        LibHokusai.hoku_input_mouse_set_scroll(input.raw, Raylib.GetMouseWheelMove)
+        LibHokusai.hoku_input_set_mouse_position(input.raw, hml_vec2(raylib_mouse_pos.x, raylib_mouse_pos.y))
+
+        input.raw[:mouse][:delta][:x] = raylib_mouse_delta.x
+        input.raw[:mouse][:delta][:y] = raylib_mouse_delta.y
+      end
+
+      if config.touch
+        count = Raylib.GetTouchPointCount
+        if count > 0
+          vec = Raylib.GetTouchPosition(0)
+          unless vec.x.zero? && vec.y.zero?
+            input.touch.record(0, vec.x, vec.y)
+          end
+        else
+          input.touch.clear
+        end
+      else
+        [0,1,2].each do |button_id|
+          clicked = Raylib.IsMouseButtonPressed(button_id)
+          down = Raylib.IsMouseButtonDown(button_id)
+          released = Raylib.IsMouseButtonReleased(button_id)
+          up = Raylib.IsMouseButtonUp(button_id)
+
+          button = mouse_button(clicked: clicked, down: down, released: released, up: up)
+          LibHokusai.hoku_input_mouse_set_button(input.raw, button, button_id)
+        end
+      end
 
-      input.raw[:mouse][:delta][:x] = raylib_mouse_delta.x
-      input.raw[:mouse][:delta][:y] = raylib_mouse_delta.y
+      if config.touch
+        if input.touch.touching?
+          token = input.touch.token
 
-      [0,1,2].each do |button_id|
-        clicked = Raylib.IsMouseButtonPressed(button_id)
-        down = Raylib.IsMouseButtonDown(button_id)
-        released = Raylib.IsMouseButtonReleased(button_id)
-        up = Raylib.IsMouseButtonUp(button_id)
+          LibHokusai.hoku_input_set_mouse_position(input.raw, hml_vec2(token[:x], token[:y]))
+        end
 
-        button = mouse_button(clicked: clicked, down: down, released: released, up: up)
-        LibHokusai.hoku_input_mouse_set_button(input.raw, button, button_id)
+        # translate taps to clicks
+        if input.touch.tapped?
+          button = mouse_button(clicked: true, down: true, released: false, up: false)
+          LibHokusai.hoku_input_mouse_set_button(input.raw, button, 0)
+        else
+          button = mouse_button(clicked: false, down: false, released: true, up: true)
+          LibHokusai.hoku_input_mouse_set_button(input.raw, button, 0)
+        end
       end
 
       if !input.keyboard_override
@@ -155,7 +186,6 @@ module Hokusai::Backends
       self.class.reset
 
       Raylib.load_lib(RAYLIB_PATH)
-
       resize = false
       initial = true
       width = config.width
@@ -168,6 +198,7 @@ module Hokusai::Backends
       raw = LibHokusai::HmlInput.new(ptr.get_pointer(0))
       input = Hokusai::Input.new(raw)
       ptr.free
+      input.support_touch! if config.touch
 
       Raylib.SetConfigFlags(config.config_flags)
       Raylib.InitWindow(config.width, config.height, config.title)
@@ -221,7 +252,7 @@ module Hokusai::Backends
         block.update
         block.public_send(:after_updated) if block.respond_to?(:after_updated)
 
-        canvas.reset(nil, nil, width.to_f, height.to_f)
+        canvas.reset(0.0, 0.0, width.to_f, height.to_f)
 
         Raylib.BeginDrawing
         Raylib.ClearBackground(config.background)
@@ -245,6 +276,7 @@ module Hokusai::Backends
         Raylib.DrawFPS(10, 10) if ENV["PROFILE"] || ENV["FPS"]
         Raylib.EndDrawing
 
+        GC.start
 
         break if self.class.stopped?
       end

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

@@ -162,7 +162,7 @@ module Hokusai::Backends
         SDL.SetRenderDrawBlendMode(renderer, SDL::BLENDMODE_BLEND)
         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)
+        canvas.reset(0.0, 0.0, render_width.to_f, render_height.to_f)
         painter = Hokusai::Painter.new(block, input)
         painter.render(canvas, resize)
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Hokusai::Blocks
   class Key < Hokusai::Block
     template <<~EOF
@@ -12,17 +14,21 @@ module Hokusai::Blocks
     uses(empty: Hokusai::Blocks::Empty)
 
     computed! :value
-    computed! :icons
     computed :size, default: 24, convert: proc(&:to_i)
     computed :background, default: Hokusai::Color.new(70, 70, 70), convert: Hokusai::Color
     computed :color, default: Hokusai::Color.new(244, 244, 244), convert: Hokusai::Color
     computed :background_down, default: Hokusai::Color.new(33,33,33), convert: Hokusai::Color
     computed :margin, default: Hokusai::Padding.new(3.0, 2.5, 3.0, 2.5), convert: Hokusai::Padding
 
-    attr_accessor :down
+    inject :keyboard_icons
+
+    attr_accessor :down, :last_commands, :last_canvas, :last_value
 
     def initialize(**args)
       @down = false
+      @last_commands = []
+      @last_canvas = nil
+      @last_value = nil
 
       super
     end
@@ -47,25 +53,44 @@ module Hokusai::Blocks
       vpad = (canvas.height - margin.height - size) / 2
 
       draw do
-        if icon = icons[value[0]]
-          rect(canvas.x + margin.left, canvas.y + margin.top, canvas.width - margin.width, canvas.height - margin.height) do |command|
-            command.color = icon[:background]# down ? background_down : background
-            command.round = 6.0
-          end
+        if last_canvas != canvas && last_value != value
+          self.last_value = value
+          self.last_canvas = canvas
 
-          svg(icon[:file], canvas.x + icon[:size] / 3, canvas.y + icon[:size] / 3, icon[:size], icon[:size]) do |command|
-            command.color = icon[:color]
-          end
-        else
-          rect(canvas.x + margin.left, canvas.y + margin.top, canvas.width - margin.width, canvas.height - margin.height) do |command|
-            command.color = down ? background_down : background
-            command.round = 6.0
-          end
+          if icon = keyboard_icons[value[0]]
+            if icon[:width]
+              node.meta.set_prop(:width, icon[:width])
+            end
+
+            rect(canvas.x + margin.left, canvas.y + margin.top, canvas.width - margin.width, canvas.height - margin.height) do |command|
+              command.color = icon[:background]# down ? background_down : background
+              command.round = 0.2
+
+              last_commands << command
+            end
+
+            svg(icon[:file], canvas.x + icon[:size] / 3, canvas.y + icon[:size] / 3, icon[:size], icon[:size]) do |command|
+              command.color = icon[:color]
+
+              last_commands << command
+            end
+          else
+            rect(canvas.x + margin.left, canvas.y + margin.top, canvas.width - margin.width, canvas.height - margin.height) do |command|
+              command.color = down ? background_down : background
+              command.round = 0.2
 
-          text(value[1].to_s, canvas.x + hpad + margin.width, canvas.y + margin.height) do |command|
-            command.color = color
-            command.size = size
+              last_commands << command
+            end
+
+            text(value[1].to_s, canvas.x + hpad + margin.width, canvas.y + margin.height) do |command|
+              command.color = color
+              command.size = size
+
+              last_commands << command
+            end
           end
+        else
+          queue.concat(last_commands)
         end
       end
 
@@ -92,9 +117,7 @@ module Hokusai::Blocks
         [for="number in keys"]
           key {
             ...keyStyle
-            :width="width(number)"
-            :icons="icons"
-            :key="loop_key(number)"
+            :key="index"
             :value="number"
             @clicked="emit_key"
             @released="emit_released"
@@ -108,20 +131,12 @@ module Hokusai::Blocks
     )
 
     computed! :keys
-    computed! :icons
 
-    # def on_mounted
-    #   node.meta.set_prop(:height, 48.0)
-    # end
-
-    def width(key)
-      if icon = icons[key[0]]
-        icon[:width]
-      end
-    end
+    inject :keyboard_icons
 
     def loop_key(value)
-      "key-#{value}"
+      @keys ||= {}
+      @keys[value] ||= "key-#{value}".freeze
     end
     
     def emit_key(key, event)
@@ -160,8 +175,7 @@ module Hokusai::Blocks
       row: KeyboardRow
     )
 
-
-    def self.icons
+    def icons
       {
         :shift => { 
           file: Hokusai.asset("icons/outline/arrow-big-up.svg"),
@@ -180,9 +194,10 @@ module Hokusai::Blocks
       }
     end
 
-    computed :icons, default: icons
     computed :row_height, default: 48.0, convert: proc(&:to_f)
 
+    provide :keyboard_icons, :icons
+
     def on_mounted
       node.meta.set_prop(:height, row_height * 5.0 + 20)
     end
@@ -210,8 +225,8 @@ module Hokusai::Blocks
       @zxcv_keys ||= begin
         keys = %w[z x c v b n m]
         middle = keys.zip(keys)
-        middle << [:backspace, :backspace]
-        middle.unshift([:shift, :shift])
+        # middle << [:backspace, :backspace]
+        # middle.unshift([:shift, :shift])
         middle
       end
     end

data/ui/src/hokusai/mounting/loop_entry.rb

@@ -65,7 +65,7 @@ module Hokusai
 
           portal = Node.new(ast)
           node = child_block_class.compile(ast.type, portal)
-          child_block = child_block_class.new(node: node)
+          child_block = child_block_class.new(node: node, providers: mount_providers)
           child_block.node.add_styles(target.class)
           child_block.node.add_props_from_block(target, context: ctx)
           child_block.node.meta.set_prop(ast.loop.var.to_sym, value)

data/ui/src/hokusai/painter.rb

@@ -110,7 +110,6 @@ 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
@@ -118,9 +117,14 @@ 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.raw)

data/ui/src/hokusai/types.rb

@@ -137,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)
@@ -146,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
@@ -157,7 +162,7 @@ module Hokusai
     end
 
     def to_hoku_rect
-      LibHokusai::HmlRect.create(x, y, width, height)
+      @hoku_rect
     end
   end
 
@@ -358,12 +363,14 @@ module Hokusai
     end
 
     def clear
-      log("clearing")
+      # log("clearing")
       if type == :move
         log("elapsed: #{elapsed(token)}")
-        if elapsed(token) > 0.05 && within(10.0)
+        if elapsed(token) > 300 && within(10.0)
           @longtapped = true
           log('longtap')
+        elsif within(10.0)
+          @tapped = true
         else
           @swiped = true
           log('swipe')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hokusai-zero
 version: !ruby/object:Gem::Version
-  version: 0.2.6.pre.pinephone3
+  version: 0.2.6.pre.pinephone4
 platform: ruby
 authors:
 - skinnyjames