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

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

data/ast/test/input.c

@@ -1,44 +0,0 @@
-#include "../src/core/input.c"
-#include<unistd.h>
-
-TEST test_hoku_input_touch_basic()
-{
-  hoku_input* input;
-  int ret = hoku_input_init(&input);
-  ASSERT_EQ_FMT(ret, 0, "%d");
-
-  ret = hoku_input_attach_touch(input, 2);
-  ASSERT_EQ_FMT(ret, 0, "%d");
-
-  hoku_input_record_touch(input, 0, 1.0, 2.0);
-  hoku_input_clear_touch(input, 0);
-
-  bool tapped = hoku_input_touch_tapped(input);
-  bool swiped = hoku_input_touch_swiped(input, 4);
-
-  ASSERT_EQ_FMT(1, tapped, "%d");
-  ASSERT_EQ_FMT(0, swiped, "%d");
-
-  hoku_input_record_touch(input, 0, 1.0, 2.0);
-  usleep(1000);
-  hoku_input_record_touch(input, 0, 3.0, 1.0);
-
-  bool longtapped = hoku_input_touch_longtapped(input, 4);
-
-  hoku_input_clear_touch(input, 0);
-  swiped = hoku_input_touch_swiped(input, 1.0);
-
-  ASSERT_EQ_FMT(1, longtapped, "%d");
-  ASSERT_EQ_FMT(1, swiped, "%d");
-  // ASSERT_EQ_FMT(pinched, 0, "%d");
-
-  hoku_input_free(input);
-
-  PASS();
-}
-
-
-SUITE(hoku_input_suite)
-{
-	RUN_TEST(test_hoku_input_touch_basic);
-}

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

@@ -1,48 +0,0 @@
-module Hokusai::Backends
-  class EmbeddedBackend::ConfigError < StandardError; end
-
-  class EmbeddedBackend::Config
-    attr_accessor :width, :height, :fps,
-                  :title, :config_flags, :window_state_flags,
-                  :automation_driver, :background, :after_load_cb,
-                  :host, :port, :automated, :on_reload, :event_waiting, :max_touch_count
-
-    def initialize
-      @width = 500
-      @height = 500
-      @fps = 60
-      @title = "(Unknown Title)"
-      @config_flags = Raylib::FLAG_WINDOW_RESIZABLE | Raylib::FLAG_VSYNC_HINT
-      @window_state_flags = Raylib::FLAG_WINDOW_RESIZABLE
-      @automation_driver = nil
-      @background = Raylib::WHITE
-      @after_load_cb = nil
-      @host = "127.0.0.1"
-      @port = 4333
-      @automated = false
-      @on_reload = ->(_){}
-      @event_waiting = false
-      @max_touch_count = 2
-    end
-
-    def start_automation_driver
-      raise ConfigError.new("Need a Hokusai::Driver in order to automate") if automation_driver.nil?
-
-      automation_driver.serve(host, port)
-    end
-
-    def automate(host, port)
-      self.host = host
-      self.port = port
-      self.automated = true
-    end
-
-    def after_load(&block)
-      self.after_load_cb = block
-    end
-
-    def on_reload(&block)
-      @on_reload = block
-    end
-  end
-end

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

@@ -1,112 +0,0 @@
-module Hokusai
-  module Backends
-    class EmbeddedBackend
-      class DataForCb < FFI::Struct
-        layout :size, :int,
-               :spacing, :int,
-               :raw, :pointer
-  
-        def self.create(size, spacing, raw)
-          obj = new.tap do |instance|
-            instance[:size] = size
-            instance[:spacing] = spacing
-            instance[:raw] = raw
-          end
-  
-          yield obj.to_ptr
-        end
-      end
-  
-      OnWidthCb = Proc.new do |char, ffi_pointer|
-        data = DataForCb.new ffi_pointer
-
-        Raylib.MeasureTextEx(data[:raw], "#{char.chr}", data[:size], data[:spacing]).x + 1.565#@ data[:spacing]
-      end
-
-      class Font < Hokusai::Font
-        attr_reader :raw
-
-        DEFAULT = "–—‘’“”…\r\n\t0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%%^&*(),.?/\"\\[]-_=+|~`{}<>;:'\0"
-
-        def self.default
-          font = Raylib.GetFontDefault
-          Raylib.SetTextureFilter(font.texture, Raylib::TEXTURE_FILTER_BILINEAR)
-          # Raylib.GenTextureMipmaps(font.texture)
-
-          new(font)
-        end
-
-        def self.from(file)
-          font = Raylib.LoadFont(file)
-          Raylib.SetTextureFilter(font.texture, Raylib::TEXTURE_FILTER_BILINEAR)
-          # Raylib.GenTextureMipmaps(font.texture)
-
-          new(font)
-        end
-
-        def self.from_ext(file, font_size, codepoint_string = DEFAULT)
-          ptr = FFI::MemoryPointer.new :int
-          codepoints = Raylib.LoadCodepoints(codepoint_string, ptr)
-          count = ptr.read_int
-
-          raylib_font = Raylib.LoadFontEx(file, font_size, codepoints, count)
-          # Raylib.GenTextureMipmaps(raylib_font.texture)
-          Raylib.SetTextureFilter(raylib_font.texture, Raylib::TEXTURE_FILTER_BILINEAR)
-
-          font = new(raylib_font)
-          Raylib.UnloadCodepoints(codepoints)
-
-          font
-        end
-
-        def initialize(raw, spacing = 1.0)
-          @raw = raw
-          @spacing = spacing
-        end
-
-        # returns the spacing for this font
-        # based on the text size
-        def spacing
-          ssize = raw.baseSize || 1
-          ssize = 10 if ssize < 10
-
-          (ssize / (raw.baseSize.zero? ? 1 : raw.baseSize)).to_f
-        end
-
-        def measure(string, size)
-          vec = Raylib.MeasureTextEx(raw, string, size, spacing)
-
-          [vec.x, vec.y]
-        end
-
-        def height
-          raw.baseSize
-        end
-
-        def clamp_markdown(text, size, width, initial_offset = 0.0)
-          clamping_pointer = FFI::MemoryPointer.new :pointer
-          RaylibBackend::DataForCb.create(size, spacing, raw) do |ptr|
-            ret = LibHokusai.hoku_text_md_clamp(clamping_pointer, text, width, initial_offset, ptr, RaylibBackend::OnWidthCb)
-            raise Hokusai::Error.new("Clamping failed") unless ret.zero?
-          end
-
-          clamping = LibHokusai::HokuClamping.new(FFI::AutoPointer.new(clamping_pointer.get_pointer(0), LibHokusai.method(:hoku_text_clamping_free)))
-          
-          Hokusai::Clamping.new(clamping, markdown: true)
-        end
-
-        def clamp(text, size, width, initial_offset = 0.0)
-          clamping_pointer = FFI::MemoryPointer.new :pointer
-          EmbeddedBackend::DataForCb.create(size, spacing, raw) do |ptr|
-            ret = LibHokusai.hoku_text_clamp(clamping_pointer, text, width, initial_offset, ptr, EmbeddedBackend::OnWidthCb)
-            raise Hokusai::Error.new("Clamping failed") unless ret.zero?
-          end
-
-          clamping = LibHokusai::HokuClamping.new(FFI::AutoPointer.new(clamping_pointer.get_pointer(0), LibHokusai.method(:hoku_text_clamping_free)))
-          
-          Hokusai::Clamping.new(clamping)
-        end
-      end
-    end
-  end
-end

data/ui/src/hokusai/backends/embedded/keys.rb

@@ -1,124 +0,0 @@
-module Hokusai::Backends
-  class EmbeddedBackend
-    Keys = [
-      [:null, Raylib::KEY_NULL],
-      [:left_shift, Raylib::KEY_LEFT_SHIFT],
-      [:left_control, Raylib::KEY_LEFT_CONTROL],
-      [:left_alt, Raylib::KEY_LEFT_ALT],
-      [:left_super, Raylib::KEY_LEFT_SUPER],
-      [:right_shift, Raylib::KEY_RIGHT_SHIFT],
-      [:right_control, Raylib::KEY_RIGHT_CONTROL],
-      [:right_alt, Raylib::KEY_RIGHT_ALT],
-      [:right_super, Raylib::KEY_RIGHT_SUPER],
-      [:apostrophe, Raylib::KEY_APOSTROPHE],
-      [:comma, Raylib::KEY_COMMA],
-      [:minus, Raylib::KEY_MINUS],
-      [:period, Raylib::KEY_PERIOD],
-      [:slash, Raylib::KEY_SLASH],
-      [:zero, Raylib::KEY_ZERO],
-      [:one, Raylib::KEY_ONE],
-      [:two, Raylib::KEY_TWO],
-      [:three, Raylib::KEY_THREE],
-      [:four, Raylib::KEY_FOUR],
-      [:five, Raylib::KEY_FIVE],
-      [:six, Raylib::KEY_SIX],
-      [:seven, Raylib::KEY_SEVEN],
-      [:eight, Raylib::KEY_EIGHT],
-      [:nine, Raylib::KEY_NINE],
-      [:semicolon, Raylib::KEY_SEMICOLON],
-      [:equal, Raylib::KEY_EQUAL],
-      [:a, Raylib::KEY_A],
-      [:b, Raylib::KEY_B],
-      [:c, Raylib::KEY_C],
-      [:d, Raylib::KEY_D],
-      [:e, Raylib::KEY_E],
-      [:f, Raylib::KEY_F],
-      [:g, Raylib::KEY_G],
-      [:h, Raylib::KEY_H],
-      [:i, Raylib::KEY_I],
-      [:j, Raylib::KEY_J],
-      [:k, Raylib::KEY_K],
-      [:l, Raylib::KEY_L],
-      [:m, Raylib::KEY_M],
-      [:n, Raylib::KEY_N],
-      [:o, Raylib::KEY_O],
-      [:p, Raylib::KEY_P],
-      [:q, Raylib::KEY_Q],
-      [:r, Raylib::KEY_R],
-      [:s, Raylib::KEY_S],
-      [:t, Raylib::KEY_T],
-      [:u, Raylib::KEY_U],
-      [:v, Raylib::KEY_V],
-      [:w, Raylib::KEY_W],
-      [:x, Raylib::KEY_X],
-      [:y, Raylib::KEY_Y],
-      [:z, Raylib::KEY_Z],
-      [:left_bracket, Raylib::KEY_LEFT_BRACKET],
-      [:backslash, Raylib::KEY_BACKSLASH],
-      [:right_bracket, Raylib::KEY_RIGHT_BRACKET],
-      [:grave, Raylib::KEY_GRAVE],
-      [:space, Raylib::KEY_SPACE],
-      [:escape, Raylib::KEY_ESCAPE],
-      [:enter, Raylib::KEY_ENTER],
-      [:tab, Raylib::KEY_TAB],
-      [:backspace, Raylib::KEY_BACKSPACE],
-      [:insert, Raylib::KEY_INSERT],
-      [:delete, Raylib::KEY_DELETE],
-      [:right, Raylib::KEY_RIGHT],
-      [:left, Raylib::KEY_LEFT],
-      [:down, Raylib::KEY_DOWN],
-      [:up, Raylib::KEY_UP],
-      [:page_up, Raylib::KEY_PAGE_UP],
-      [:page_down, Raylib::KEY_PAGE_DOWN],
-      [:home, Raylib::KEY_HOME],
-      [:end, Raylib::KEY_END],
-      [:caps_lock, Raylib::KEY_CAPS_LOCK],
-      [:scroll_lock, Raylib::KEY_SCROLL_LOCK],
-      [:num_lock, Raylib::KEY_NUM_LOCK],
-      [:print_screen, Raylib::KEY_PRINT_SCREEN],
-      [:pause, Raylib::KEY_PAUSE],
-      [:f1, Raylib::KEY_F1],
-      [:f2, Raylib::KEY_F2],
-      [:f3, Raylib::KEY_F3],
-      [:f4, Raylib::KEY_F4],
-      [:f5, Raylib::KEY_F5],
-      [:f6, Raylib::KEY_F6],
-      [:f7, Raylib::KEY_F7],
-      [:f8, Raylib::KEY_F8],
-      [:f9, Raylib::KEY_F9],
-      [:f10, Raylib::KEY_F10],
-      [:f11, Raylib::KEY_F11],
-      [:f12, Raylib::KEY_F12],
-      [:left_shift, Raylib::KEY_LEFT_SHIFT],
-      [:left_control, Raylib::KEY_LEFT_CONTROL],
-      [:left_alt, Raylib::KEY_LEFT_ALT],
-      [:left_super, Raylib::KEY_LEFT_SUPER],
-      [:right_shift, Raylib::KEY_RIGHT_SHIFT],
-      [:right_control, Raylib::KEY_RIGHT_CONTROL],
-      [:right_alt, Raylib::KEY_RIGHT_ALT],
-      [:right_super, Raylib::KEY_RIGHT_SUPER],
-      [:kb_menu, Raylib::KEY_KB_MENU],
-      [:kp_0, Raylib::KEY_KP_0],
-      [:kp_1, Raylib::KEY_KP_1],
-      [:kp_2, Raylib::KEY_KP_2],
-      [:kp_3, Raylib::KEY_KP_3],
-      [:kp_4, Raylib::KEY_KP_4],
-      [:kp_5, Raylib::KEY_KP_5],
-      [:kp_6, Raylib::KEY_KP_6],
-      [:kp_7, Raylib::KEY_KP_7],
-      [:kp_8, Raylib::KEY_KP_8],
-      [:kp_9, Raylib::KEY_KP_9],
-      [:kp_decimal, Raylib::KEY_KP_DECIMAL],
-      [:kp_divide, Raylib::KEY_KP_DIVIDE],
-      [:kp_multiply, Raylib::KEY_KP_MULTIPLY],
-      [:kp_subtract, Raylib::KEY_KP_SUBTRACT],
-      [:kp_add, Raylib::KEY_KP_ADD],
-      [:kp_enter, Raylib::KEY_KP_ENTER],
-      [:kp_equal, Raylib::KEY_KP_EQUAL],
-      [:back, Raylib::KEY_BACK],
-      [:menu, Raylib::KEY_MENU],
-      [:volume_up, Raylib::KEY_VOLUME_UP],
-      [:volume_down, Raylib::KEY_VOLUME_DOWN]]
-  end
-end
-