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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6b346169398fdc8ace4e949627b34928b44230de71c120dc1b7ec2e3cb377c5
-  data.tar.gz: 444a5c3581cc74ca1537f2682cd0a1fd3859164f92a773af738a3fea434d579f
+  metadata.gz: f2b53ce8769964539f51ad894c33476cecb01095b7b5ce851355cbf7df17a707
+  data.tar.gz: 430de1cd6a0ffae61fdf9ca547b15aa61e0065769f94472962047c0205df83ff
 SHA512:
-  metadata.gz: a9e491ff21f1ed5532ae4b265c2084f3599a1c242f68cd14974d9ccd2f0b9cc8d39897ff38795183460641aea0b62984fcf3cdcaea1432bc076b0bf4844e12c7
-  data.tar.gz: 80a602eff3310633a24f4edc99b7191d2d367a1a826e0f591ac4bece88119088551566cf82779f138f757c5fcd8c651efae8be1188b0c77c2131725aa016de87
+  metadata.gz: d571179fb72b52671eafceed834e76c7154e205faaff5bb67a95d7d1eb801c86d34f6e5525ade0247db57e48c3019098744dbef7d704630fc4ea7b7577854ab4
+  data.tar.gz: '082837551a6b0ff70eda1779c4bde8232efe3108dad48359a05f597023895250faa07812878367229da734075bb0fb1c5c2ab180820b06e4040f7569fdb87306'

data/ast/src/core/input.c

@@ -4,134 +4,6 @@
 #include "input.h"
 #include <stdio.h>
 
-#define NANO_TO_MILLISECONDS 1000000
-
-int hoku_input_touch_init(hoku_input_touch** embedded, int max_touch_positions)
-{
-  hoku_input_touch* out = malloc(sizeof(hoku_input_touch));
-  if (!out) return -1;
-
-  out->last_touch_positions = malloc(sizeof(hoku_dvec2*) * max_touch_positions);
-  if (out->last_touch_positions == NULL) return -1;
-
-  out->touch_positions = malloc(sizeof(hoku_dvec2*) * max_touch_positions);
-  if (out->touch_positions == NULL) return -1;
-
-  for (int i=0; i < max_touch_positions; i++)
-  {
-    out->last_touch_positions[i] = malloc(sizeof(hoku_dvec2));
-    if (out->last_touch_positions[i] == NULL) return -1;
-    out->last_touch_positions[i]->x = -1.0;
-    out->last_touch_positions[i]->y = -1.0;
-
-
-    out->touch_positions[i] = malloc(sizeof(hoku_dvec2));
-    if (out->touch_positions[i] == NULL) return -1;
-    out->touch_positions[i]->x = -1.0;
-    out->touch_positions[i]->y = -1.0;
-  }
-
-  out->touch_len = max_touch_positions;
-  out->touch_count = 0;
-  out->touching_now = false;
-  out->timer = 0;
-
-  *embedded = out;
-  return 0;
-}
-
-long hoku_input_touch_duration(hoku_input* input)
-{
-  return input->touch->timer * NANO_TO_MILLISECONDS;
-}
-
-bool hoku_input_touch_tapped(hoku_input* input)
-{
-  if (input->touch->touching_now == false && input->touch->last_touch_positions[0] != NULL) return true;
-
-  return false;
-}
-
-bool hoku_input_touch_swiped(hoku_input* input, float threshold)
-{
-  if (input->touch->touching_now == false)
-  {
-    hoku_dvec2* last = input->touch->last_touch_positions[0];
-    hoku_dvec2* now = input->touch->touch_positions[0];
-
-    if (last->x == -1.0 || last->y == -1.0) return false;
-    if (last == NULL || now == NULL) return false;
-
-    return (abs((int)(now->x - last->x)) >= threshold || abs((int)(now->y - last->y)) >= threshold);
-  }
-
-  return false;
-}
-
-bool hoku_input_touch_pinched(hoku_input* input)
-{
-  return false;
-}
-
-bool hoku_input_touch_longtapped(hoku_input* input, int threshold)
-{
-  if (input->touch->touching_now && input->touch->timer > 0l)
-  {
-    hoku_dvec2* last = input->touch->last_touch_positions[0];
-    hoku_dvec2* now = input->touch->touch_positions[0];
-
-    return (abs((int)(now->x - last->x)) < threshold && abs((int)(now->y - last->y)) < threshold);
-  }
-
-  return false;
-}
-
-void hoku_input_clear_touch(hoku_input* input, int index)
-{
-  input->touch->touching_now = false;
-  input->touch->timer = 0l;
-}
-
-int hoku_input_record_touch(hoku_input* input, int index, float x, float y)
-{
-  struct timespec start;
-  if (clock_gettime(CLOCK_MONOTONIC, &start) == -1) return -1;
-  
-  if (!(input->touch->touching_now))
-  {
-    input->touch->last_touch_positions[index]->x = input->touch->touch_positions[index]->x;
-    input->touch->last_touch_positions[index]->y = input->touch->touch_positions[index]->y;
-
-    input->touch->timer = start.tv_nsec;
-  }
-  else
-  {
-    input->touch->timer = start.tv_nsec - input->touch->timer;
-  }
-
-  input->touch->touch_positions[index]->x = x;
-  input->touch->touch_positions[index]->y = y;
-  input->touch->touching_now = true;
-
-  return 0;
-}
-
-int hoku_input_attach_touch(hoku_input* input, int max_touch_count)
-{
-  hoku_input_touch* touch;
-  if (hoku_input_touch_init(&touch, max_touch_count) == -1) return -1;
-  input->touch = touch;
-
-  return 0;
-}
-
-void hoku_input_touch_free(hoku_input_touch* embedded)
-{
-  free(embedded->touch_positions);
-  free(embedded->last_touch_positions);
-  free(embedded);
-}
-
 static int hoku_keycodes[HOKU_KEY_MAX] = { 
   0,39,44,45,46,47,48,49,50,51,52,53,54,55,56,57,59,61,65,66,67,68,69,
   70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,
@@ -401,12 +273,6 @@ void hoku_input_free(hoku_input* input)
 {
   hoku_input_keyboard_free(input->keyboard);
   hoku_input_mouse_free(input->mouse);
-  
-  if (input->touch)
-  {
-    hoku_input_touch_free(input->touch);
-  }
-
   free(input);
 }
 
@@ -432,7 +298,6 @@ int hoku_input_init(hoku_input** input)
     return -1;
   }
   init->keyboard = keyboard;
-  init->touch = NULL;
 
   *input = init;
   return 0;

data/ast/src/core/input.h

@@ -4,7 +4,6 @@
 #include "common.h"
 #include <stdbool.h>
 #include <stdlib.h>
-#include <time.h>
 
 typedef struct HmlInputMouseButton
 {
@@ -88,44 +87,12 @@ typedef struct HmlInputKeyboard
   bool collecting;
 } hoku_input_keyboard;
 
-typedef enum HmlDragDirection {
-  HOKU_DRAG_UP,
-  HOKU_DRAG_DOWN,
-  HOKU_DRAG_LEFT,
-  HOKU_DRAG_RIGHT
-} hoku_drag_direction;
-
-typedef enum HmlPinchDirection {
-  HOKU_PINCH_IN,
-  HOKU_PINCH_OUT
-} hoku_pinch_direction;
-
-typedef struct HmlInputTouch
-{
-  int touch_len;
-  int touch_count;
-  bool touching_now;
-  long timer;
-  hoku_dvec2** last_touch_positions;
-  hoku_dvec2** touch_positions;
-} hoku_input_touch;
-
 typedef struct HmlInput
 {
   hoku_input_keyboard* keyboard;
   hoku_input_mouse* mouse;
-  hoku_input_touch* touch;
 } hoku_input;
 
-
-long hoku_input_touch_duration(hoku_input* input);
-bool hoku_input_touch_tapped(hoku_input* input);
-bool hoku_input_touch_swiped(hoku_input* input, float threshold);
-bool hoku_input_touch_longtapped(hoku_input* input, int threshold);
-void hoku_input_clear_touch(hoku_input* input, int index);
-int hoku_input_record_touch(hoku_input* input, int index, float x, float y);
-int hoku_input_attach_touch(hoku_input* input, int max_touch_count);
-
 int hoku_input_keyboard_init(hoku_input_keyboard** keyboard);
 int hoku_input_mouse_init(hoku_input_mouse** mouse);
 int hoku_input_init(hoku_input** input);

data/ast/test/hokusai.c

@@ -1,7 +1,6 @@
 #include "greatest.h"
 #include "parser.c"
 #include "text.c"
-#include "input.c"
 
 GREATEST_MAIN_DEFS();
 
@@ -10,7 +9,6 @@ int main(int argc, char** argv) {
 
   RUN_SUITE(hoku_parser_suite);
   RUN_SUITE(hoku_text_suite);
-  RUN_SUITE(hoku_input_suite);
 
   GREATEST_MAIN_END();
 }

data/hokusai.gemspec

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

data/ui/examples/forum/file.rb

@@ -36,7 +36,7 @@ module Demos
       )
 
       def compute_background
-        index.odd? ? nil : Hokusai::Color.new(255, 255, 255,20)
+        index.odd? ? nil : Hokusai::Color.new(44, 44, 44, 20)
       end
 
       def item_image

data/ui/examples/forum/post.rb

@@ -107,7 +107,6 @@ module Demos
 
       uses(
         vblock: Hokusai::Blocks::Vblock,
-        hblock: Hokusai::Blocks::Hblock,
         text: Hokusai::Blocks::Text,
         image: Hokusai::Blocks::Image,
         label: Hokusai::Blocks::Label,

data/ui/examples/forum.rb

@@ -175,13 +175,13 @@ module Demos
   end
 end
 
-Hokusai::Backends::RaylibBackend.run(Demos::Forum::App) do |config|
+Hokusai::Backends::SDLBackend.run(Demos::Forum::App) do |config|
   config.after_load do
-    font = Hokusai::Backends::RaylibBackend::Font.from("#{__dir__}/assets/Inter-Regular.ttf")
+    font = Hokusai::Backends::SDLBackend::Font.from("#{__dir__}/assets/Inter-Regular.ttf")
     Hokusai.fonts.register "inter", font
     Hokusai.fonts.activate "inter"
 
-    font = Hokusai::Backends::RaylibBackend::Font.from_ext("#{__dir__}/assets/Delius-Regular.ttf", 160)
+    font = Hokusai::Backends::SDLBackend::Font.from("#{__dir__}/assets/Delius-Regular.ttf")
     Hokusai.fonts.register "dohyeon", font
   end 
 
@@ -190,10 +190,10 @@ Hokusai::Backends::RaylibBackend.run(Demos::Forum::App) do |config|
   config.height = 500
   config.title = "Counter application"
 
-  # config.window_config_flags = SDL::WINDOW_RESIZABLE | SDL::WINDOW_BORDERLESS
+  config.window_config_flags = SDL::WINDOW_RESIZABLE #| SDL::WINDOW_BORDERLESS
 
-  config.config_flags = Raylib::FLAG_WINDOW_RESIZABLE | Raylib::FLAG_VSYNC_HINT | Raylib::FLAG_WINDOW_TRANSPARENT
-  config.window_state_flags = Raylib::FLAG_WINDOW_RESIZABLE | Raylib::FLAG_WINDOW_UNDECORATED | Raylib::FLAG_WINDOW_TRANSPARENT
-  config.background = Raylib::BLANK
+  # config.config_flags = Raylib::FLAG_WINDOW_RESIZABLE | Raylib::FLAG_VSYNC_HINT | Raylib::FLAG_WINDOW_TRANSPARENT
+  # config.window_state_flags = Raylib::FLAG_WINDOW_RESIZABLE | Raylib::FLAG_WINDOW_UNDECORATED | Raylib::FLAG_WINDOW_TRANSPARENT
+  # config.background = Raylib::BLANK
 end
 

data/ui/examples/keyboard.rb

@@ -0,0 +1,47 @@
+require_relative "../src/hokusai"
+require_relative "../src/hokusai/backends/sdl2"
+require_relative "../src/hokusai/backends/raylib"
+
+class KeyboardExample < Hokusai::Block
+  style <<~EOF
+  [style]
+  example {
+    background: rgb(225,255,255);
+    reverse: true
+  }
+  input {
+    size: 20;
+    color: rgb(0, 0, 0);
+  }
+  EOF
+  
+  template <<~EOF
+  [template]
+    vblock { ...example }
+      keyboard
+      vblock
+        input {
+          ...input
+        }
+  EOF
+
+  uses(
+    input: Hokusai::Blocks::Input,
+    vblock: Hokusai::Blocks::Vblock,
+    text: Hokusai::Blocks::Text,
+    keyboard: Hokusai::Blocks::Keyboard
+  )
+
+  attr_accessor :content
+
+  def initialize(**args)
+    super
+    @content = ""
+  end
+end
+
+Hokusai::Backends::SDLBackend.run(KeyboardExample) do |config|
+  config.width = 370
+  config.height = 680
+  config.title = "keyboard example"
+end

data/ui/examples/shader/test.rb

@@ -97,24 +97,28 @@ class ShaderTest < Hokusai::Block
   
   template <<~EOF
   [template]
-    hblock
-      empty
-    hblock
-      hblock
-        empty
-      hblock
-        wrapper
-          image { :source="addy_png" :width="500" :height="400" }
-          text { ...textStyle }
-          circle {
-            :radius="50.0"
-            ...circleStyle
-          }
-      hblock
-        empty
-    hblock
-      empty
-    
+  vblock
+    [if="pickered"]
+      picker
+    [else]
+      vblock
+        hblock { @click="set_pickered" }
+          empty
+        hblock
+          hblock
+            empty
+          hblock
+            wrapper
+              image { :source="addy_png" :width="500" :height="400" }
+              text { ...textStyle }
+              circle {
+                :radius="50.0"
+                ...circleStyle
+              }
+          hblock
+            empty
+        hblock
+          empty
   EOF
 
   uses(
@@ -128,6 +132,12 @@ class ShaderTest < Hokusai::Block
     empty: Hokusai::Blocks::Empty
   )
 
+  attr_accessor :pickered
+
+  def set_pickered(event)
+    self.pickered = true
+  end
+
   def addy_png
     "#{__dir__}/../assets/addy.png"
   end

data/ui/examples/spreadsheet.rb

@@ -119,22 +119,23 @@ module Demos
   end
 end
 
-Hokusai::Backends::RaylibBackend.run(Demos::Spreadsheet::App) do |config|
-  config.after_load do
-    font = Hokusai::Backends::RaylibBackend::Font.from("#{__dir__}/assets/Inter-Regular.ttf")
-    Hokusai.fonts.register "inter", font
-    Hokusai.fonts.activate "inter"
+Hokusai::Backends::SDLBackend.run(Demos::Spreadsheet::App) do |config|
+  # config.after_load do
+  #   font = Hokusai::Backends::RaylibBackend::Font.from("#{__dir__}/assets/Inter-Regular.ttf")
+  #   Hokusai.fonts.register "inter", font
+  #   Hokusai.fonts.activate "inter"
 
-    font = Hokusai::Backends::RaylibBackend::Font.from_ext("#{__dir__}/assets/Delius-Regular.ttf", 160)
-    Hokusai.fonts.register "dohyeon", font
-  end 
+  #   font = Hokusai::Backends::RaylibBackend::Font.from_ext("#{__dir__}/assets/Delius-Regular.ttf", 160)
+  #   Hokusai.fonts.register "dohyeon", font
+  # end 
 
   config.fps = 60
   config.width = 800
   config.height = 500
   config.title = "Spreadsheet application"
 
-  config.config_flags = Raylib::FLAG_WINDOW_RESIZABLE | Raylib::FLAG_VSYNC_HINT | Raylib::FLAG_WINDOW_TRANSPARENT
-  config.window_state_flags = Raylib::FLAG_WINDOW_RESIZABLE | Raylib::FLAG_WINDOW_UNDECORATED | Raylib::FLAG_WINDOW_TRANSPARENT
-  config.background = Raylib::BLANK
+
+  # config.config_flags = Raylib::FLAG_WINDOW_RESIZABLE | Raylib::FLAG_VSYNC_HINT | Raylib::FLAG_WINDOW_TRANSPARENT
+  # config.window_state_flags = Raylib::FLAG_WINDOW_RESIZABLE | Raylib::FLAG_WINDOW_UNDECORATED | Raylib::FLAG_WINDOW_TRANSPARENT
+  # config.background = Raylib::BLANK
 end

data/ui/lib/lib_hokusai.rb

@@ -122,23 +122,7 @@ module LibHokusai
            :next_child, HmlAst.ptr
   end
 
-
-  # fun hashmap_iter(map : Hashmap, i : LibC::SizeT*, item : Void**) : Bool
-  # ast methods
-  attach_function :hoku_ast_prop_init, [:pointer, :string], :int
-  attach_function :hoku_ast_class_list_includes, [:pointer, :string], :int
-  attach_function :hoku_ast_get_prop, [HmlAst.by_ref, HmlAstProp.by_ref], HmlAstProp.by_ref
-  attach_function :hoku_ast_get_event, [:pointer, :pointer], HmlAstEvent.by_ref
-  attach_function :hashmap_iter, [:hashmap, :pointer, :pointer], :bool
-  attach_function :hashmap_count, [:hashmap], :int
-  attach_function :hoku_ast_free, [:pointer], :void
-  attach_function :hoku_errored_ast, [HmlAst.by_ref], HmlAst.by_ref
-  attach_function :hoku_ast_from_template, [:pointer, :string, :string], :int
-  attach_function :hoku_style_from_template, [:pointer, :string], :int
-  attach_function :hoku_style_free, [:pointer], :void
-  attach_function :hoku_dump, [:pointer, :int], :void
-
-  enum :hml_input_key, [
+  HOKUSAI_KEYS = [
     :null, :apostrophe, :comma, :minus,
     :period, :slash, :zero, :one, :two,
     :three, :four, :five, :six, :seven,
@@ -162,6 +146,23 @@ module LibHokusai
     :max
   ]
 
+  # fun hashmap_iter(map : Hashmap, i : LibC::SizeT*, item : Void**) : Bool
+  # ast methods
+  attach_function :hoku_ast_prop_init, [:pointer, :string], :int
+  attach_function :hoku_ast_class_list_includes, [:pointer, :string], :int
+  attach_function :hoku_ast_get_prop, [HmlAst.by_ref, HmlAstProp.by_ref], HmlAstProp.by_ref
+  attach_function :hoku_ast_get_event, [:pointer, :pointer], HmlAstEvent.by_ref
+  attach_function :hashmap_iter, [:hashmap, :pointer, :pointer], :bool
+  attach_function :hashmap_count, [:hashmap], :int
+  attach_function :hoku_ast_free, [:pointer], :void
+  attach_function :hoku_errored_ast, [HmlAst.by_ref], HmlAst.by_ref
+  attach_function :hoku_ast_from_template, [:pointer, :string, :string], :int
+  attach_function :hoku_style_from_template, [:pointer, :string], :int
+  attach_function :hoku_style_free, [:pointer], :void
+  attach_function :hoku_dump, [:pointer, :int], :void
+
+  enum :hml_input_key, HOKUSAI_KEYS
+
   enum :hml_input_select_type, [
     :ACTIVE, 0x01,
     :FROZEN, 0x02,
@@ -245,15 +246,6 @@ module LibHokusai
            :collecting, :bool
   end
 
-  class HmlInputTouch < FFI::Struct
-    layout :touch_len, :int,
-           :touch_count, :int,
-           :touching_now, :bool,
-           :timer, :long,
-           :last_touch_positions, :pointer,
-           :touch_positions, :pointer       
-  end
-
   class HmlInputMouseButton < FFI::Struct
     layout :down, :bool,
            :up, :bool,
@@ -302,8 +294,7 @@ module LibHokusai
 
   class HmlInput < FFI::Struct
     layout :keyboard, HmlInputKeyboard.ptr,
-           :mouse, HmlInputMouse.ptr,
-           :touch, HmlInputTouch.ptr
+           :mouse, HmlInputMouse.ptr
   end
 
   def LibHokusai.const_missing( sym )
@@ -318,15 +309,6 @@ module LibHokusai
   attach_function :hoku_input_set_mouse_position, [HmlInput.by_ref, HmlVec2.by_ref], :void
   attach_function :hoku_input_mouse_set_scroll, [HmlInput.by_ref, :float], :void
   attach_function :hoku_input_mouse_set_button, [HmlInput.by_ref, HmlInputMouseButton.by_ref, :int], :void
-  # touch functions
-  attach_function :hoku_input_attach_touch, [HmlInput.by_ref, :int], :int
-  attach_function :hoku_input_record_touch, [HmlInput.by_ref, :int, :float, :float], :int
-  attach_function :hoku_input_clear_touch, [HmlInput.by_ref, :int], :void
-
-  attach_function :hoku_input_touch_duration, [HmlInput.by_ref], :long
-  attach_function :hoku_input_touch_tapped, [HmlInput.by_ref], :bool
-  attach_function :hoku_input_touch_swiped, [HmlInput.by_ref], :bool
-  attach_function :hoku_input_touch_longtapped, [HmlInput.by_ref], :bool
 
   attach_function :hoku_input_is_clicked, [HmlInput.by_ref, HmlRect.by_ref], :bool
   attach_function :hoku_input_is_hovered, [HmlInput.by_ref, HmlRect.by_ref], :bool

data/ui/spec/hokusai/e2e/keyboard_spec.rb

@@ -0,0 +1,52 @@
+# describe Hokusai::Automation::Client do
+#   let(:keyboard) do
+#     klass = Class.new(Hokusai::Block) do
+#       template <<~EOF
+#       [template]
+#         vblock
+#           text#display {
+#             @keypress="update_content"
+#             :content="content" size="90" 
+#           }
+#           keyboard{ :automatic="true" }
+#       EOF
+
+#       uses(
+#         text: Hokusai::Blocks::Text,
+#         keyboard: Hokusai::Blocks::Keyboard
+#       )
+
+#       attr_accessor :content
+
+#       def update_content(event)
+#         self.content << event.char
+#       end
+
+#       def initialize(**args)
+#         @content = ""
+
+#         super(**args)
+#       end
+#     end
+
+#     klass
+#   end
+
+#   def click_key(client, key)
+#     client.block("keyboard.#{key}").click
+#   end
+  
+#   it "client works" do
+#     with_app(keyboard) do |client, app|
+#       display = client.block("#display")
+
+#       expect(display.prop("content")).to eq("")
+
+#       "hello world".split("").each do |key|
+#         click_key(client, key)
+#       end
+
+#       expect(display.prop("content")).to eq("hello world")
+#     end
+#   end
+# end 

data/ui/src/hokusai/assets/icons/outline/arrow-big-up.svg

@@ -0,0 +1,19 @@
+<!--
+tags: [direction, north]
+category: Arrows
+version: "1.37"
+unicode: "eddd"
+-->
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="white"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M9 20v-8h-3.586a1 1 0 0 1 -.707 -1.707l6.586 -6.586a1 1 0 0 1 1.414 0l6.586 6.586a1 1 0 0 1 -.707 1.707h-3.586v8a1 1 0 0 1 -1 1h-4a1 1 0 0 1 -1 -1z" />
+</svg>

data/ui/src/hokusai/assets/icons/outline/backspace.svg

@@ -0,0 +1,20 @@
+<!--
+category: Text
+tags: [delete, remove, eliminate]
+version: "1.0"
+unicode: "ea2d"
+-->
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="white"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M20 6a1 1 0 0 1 1 1v10a1 1 0 0 1 -1 1h-11l-5 -5a1.5 1.5 0 0 1 0 -2l5 -5z" />
+  <path d="M12 10l4 4m0 -4l-4 4" />
+</svg>

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

@@ -131,13 +131,15 @@ module Hokusai::Backends
         LibHokusai.hoku_input_mouse_set_button(input.raw, button, button_id)
       end
 
-      LibHokusai.hoku_input_keyboard_start(input.raw)
+      if !input.keyboard_override
+        LibHokusai.hoku_input_keyboard_start(input.raw)
 
-      Keys.each do |(hoku_key, raylib_key)|
-        LibHokusai.hoku_input_keyboard_set_key(input.raw, hoku_key, Raylib.IsKeyDown(raylib_key))
-      end
+        Keys.each do |(hoku_key, raylib_key)|
+          LibHokusai.hoku_input_keyboard_set_key(input.raw, hoku_key, Raylib.IsKeyDown(raylib_key))
+        end
 
-      LibHokusai.hoku_input_keyboard_stop(input.raw)
+        LibHokusai.hoku_input_keyboard_stop(input.raw)
+      end
     end
 
     def self.run(app)

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

@@ -3,8 +3,8 @@ module Hokusai::Backends
     class Config
       attr_accessor :width, :height, :fps, :init_flags,
                     :title, :background, :automation_driver,
-                    :after_load_cb, :host, :port, :automated,
-                    :window_config_flags
+                    :after_load_cb, :host, :port, :automated, :mobile,
+                    :window_config_flags, :touch
 
       def after_load(&block)
         self.after_load_cb = block
@@ -14,16 +14,19 @@ module Hokusai::Backends
         @width = 500
         @height = 500
         @fps = 60
+        @touch = false
 
         @init_flags = ::SDL::INIT_VIDEO | ::SDL::INIT_EVENTS
-        @window_config_flags = SDL::WINDOW_RESIZABLE
+        @window_config_flags = SDL::WINDOW_RESIZABLE | SDL::WINDOW_ALLOW_HIGHDPI
         @title = "(Unknown Title)"
         @background = SDLBackend.color(255,255,255, 0)
 
         after_load do
-          font = Hokusai::Backends::SDLBackend::Font.from "#{__dir__}/Monaco.ttf"
-          Hokusai.fonts.register "default", font
-          Hokusai.fonts.activate "default"
+          if Hokusai.fonts.get("default").nil?
+            font = Hokusai::Backends::SDLBackend::Font.from "#{__dir__}/Monaco.ttf"
+            Hokusai.fonts.register "default", font
+            Hokusai.fonts.activate "default"
+          end
         end
       end
     end