hokusai-zero 0.2.6.pre.pinephone6 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fadc5b1cf6e75bc57d76dcca297a97521e64a744858ef0cafbf53e2e7d259373
-  data.tar.gz: 010f5c1f195932e39b8f5061cbab13bc55ce88485bec86dadb6a5ec0754feb2b
+  metadata.gz: c28ec9cbfb0ad097992724a26e9304ff581f2becdb0c3edae24b953fecf6f69c
+  data.tar.gz: 7d78d50e110f70dd8af7095df76bd5b039d13c205336c31f42d58c9d503cceb5
 SHA512:
-  metadata.gz: 4e0bdc4ecaa1609324e3ca7a2ba3dadd7ca9ef145ee67c49d66a9fc8c76b5971f1d61f14f806124c7e0c5564a0420af50619dd44da64828a8e041ed47cf35a6d
-  data.tar.gz: 63f2644bd086280547eea3497df85f274e9dd6304314de84c77839eb4bbd49b903506afb87aae47a230e2861cb80201e1c296c864869b8fbf4a5dca0999c3abc
+  metadata.gz: e4c92faf605ff7a6b4f9e0c3489327a01886ee18b2a2700a502b10b984fabf49e365986fb17c37c24d7f474fa7689e36761709bc1e59fcc0cd238ccf29ca8011
+  data.tar.gz: a2b09402e3f899644cb30e398130111e2afd40542763e6e9377f9777b6c5facf56f54465451b26ee2296d3834cc3be1aed640c7856bb2a7839801c260f7ad9ac

data/Gemfile

@@ -3,6 +3,7 @@ source "https://www.rubygems.org"
 gem "ffi", github: "ffi/ffi", submodules: true
 
 group :development, :test do
+  gem "concurrent-ruby", require: "concurrent"
   gem "memory_profiler", require: false
   gem "mini_portile2", "~> 2.0.0" 
   gem "raylib-bindings"

data/Gemfile.lock

@@ -8,6 +8,7 @@ GIT
 GEM
   remote: https://www.rubygems.org/
   specs:
+    concurrent-ruby (1.3.5)
     daemons (1.4.1)
     diff-lcs (1.6.1)
     domain_name (0.6.20240107)
@@ -76,6 +77,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  concurrent-ruby
   ffi!
   memory_profiler
   mini_portile2 (~> 2.0.0)

data/README.md

@@ -12,7 +12,7 @@ A Ruby library for authoring GUI applications
 In your Gemfile
 
 ```ruby
-gem "hokusai-zero",  "0.2.6"
+gem "hokusai-zero",  "0.2.4"
 ```
 
 ## In order to run an application, you will need to install a backend

data/ast/src/core/input.h

@@ -93,6 +93,7 @@ typedef struct HmlInput
   hoku_input_mouse* mouse;
 } hoku_input;
 
+
 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/src/core/util.c

@@ -3,33 +3,33 @@
 
 #include "util.h"
 
-bool hoku_rect_includes_y(hoku_rect* rect, float y)
+bool hoku_rect_includes_y(hoku_rect rect, float y)
 {
-  return y > rect->y && y <= (rect->y + rect->h);
+  return y > rect.y && y <= (rect.y + rect.h);
 }
 
-bool hoku_rect_includes_x(hoku_rect* rect, float x)
+bool hoku_rect_includes_x(hoku_rect rect, float x)
 {
-  return x > rect->x && x <= (rect->x + rect->w);
+  return x > rect.x && x <= (rect.x + rect.w);
 }
 
-float hoku_rect_x_left(hoku_rect* rect, int times)
+float hoku_rect_x_left(hoku_rect rect, int times)
 {
-  return (rect->x - ((rect->w / 2) * times));
+  return (rect.x - ((rect.w / 2) * times));
 }
-float hoku_rect_x_right(hoku_rect* rect, int times)
+float hoku_rect_x_right(hoku_rect rect, int times)
 {
-  return (rect->x + ((rect->w / 2) * times));
+  return (rect.x + ((rect.w / 2) * times));
 }
 
-float hoku_rect_y_up(hoku_rect* rect, int times)
+float hoku_rect_y_up(hoku_rect rect, int times)
 {
-  return (rect->y - ((rect->h / 2) * times));
+  return (rect.y - ((rect.h / 2) * times));
 }
 
-float hoku_rect_y_down(hoku_rect* rect, int times)
+float hoku_rect_y_down(hoku_rect rect, int times)
 {
-  return (rect->y + ((rect->h / 2) * times));
+  return (rect.y + ((rect.h / 2) * times));
 }
 
 int hoku_selection_init(hoku_selection** selection)
@@ -68,28 +68,28 @@ bool hoku_selection_selected(hoku_selection* selection, float x, float y, float
   bool right = selection->start_x <= selection->stop_x;
 
   hoku_rect hit_box = (hoku_rect){.x=x, .y=y, .w=width, .h=height};
-  float x_shifted_right = hoku_rect_x_right(&hit_box, 1);
-  float y_shifted_up = hoku_rect_y_up(&hit_box, 2);
-  float y_shifted_down = hoku_rect_y_down(&hit_box, 2);
+  float x_shifted_right = hoku_rect_x_right(hit_box, 1);
+  float y_shifted_up = hoku_rect_y_up(hit_box, 2);
+  float y_shifted_down = hoku_rect_y_down(hit_box, 2);
   float end_y = y + height;
 
   return (
    (down &&
     // first line of multiline selection
-    ((x_shifted_right > sx && end_y < ey && hoku_rect_includes_y(&hit_box, sy)) ||
+    ((x_shifted_right > sx && end_y < ey && hoku_rect_includes_y(hit_box, sy)) ||
       // last line of multiline selection
       (x_shifted_right <= ex && y_shifted_up + hit_box.h < ey && hit_box.y > sy) ||
       // middle line (all selected)
       (hit_box.y > sy && end_y < ey))) ||
     (up &&
       // first line of multiline selection
-      ((x_shifted_right <= sx && hit_box.y > ey && hoku_rect_includes_y(&hit_box, sy)) ||
+      ((x_shifted_right <= sx && hit_box.y > ey && hoku_rect_includes_y(hit_box, sy)) ||
       // last line of multiline selection
         (x_shifted_right >= ex && y_shifted_down > ey && end_y < sy) ||
         // middle line (all selected)
         (hit_box.y > ey && hit_box.y + hit_box.h < sy))) ||
     // single line selection
-    ((hoku_rect_includes_y(&hit_box, sy) && hoku_rect_includes_y(&hit_box, ey)) &&
+    ((hoku_rect_includes_y(hit_box, sy) && hoku_rect_includes_y(hit_box, ey)) &&
       ((left && x_shifted_right < sx && x_shifted_right > ex) || (right && x_shifted_right > sx && x_shifted_right < ex)))
   );
 }
@@ -108,7 +108,7 @@ hoku_cursor_position hoku_selection_cursor_get(hoku_selection* selection)
   return pos;
 }
 
-int hoku_selection_cursor_set(hoku_selection* selection, hoku_cursor_position* cursor)
+int hoku_selection_cursor_set(hoku_selection* selection, hoku_cursor_position cursor)
 {
   if (selection->cursor == NULL)
   {
@@ -117,10 +117,10 @@ int hoku_selection_cursor_set(hoku_selection* selection, hoku_cursor_position* c
     if (selection->cursor == NULL) return -1;
   }
 
-  selection->cursor->x = cursor->x;
-  selection->cursor->y = cursor->y;
-  selection->cursor->w = cursor->w;
-  selection->cursor->h = cursor->h;
+  selection->cursor->x = cursor.x;
+  selection->cursor->y = cursor.y;
+  selection->cursor->w = cursor.w;
+  selection->cursor->h = cursor.h;
 
   return 0;
 }

data/ast/src/core/util.h

@@ -30,16 +30,16 @@ typedef struct HokuSelection
    hoku_cursor_position* cursor;
 } hoku_selection;
 
-bool hoku_rect_includes_y(hoku_rect* rect, float y);
-bool hoku_rect_includes_x(hoku_rect* rect, float x);
-float hoku_rect_x_left(hoku_rect* rect, int times);
-float hoku_rect_x_right(hoku_rect* rect, int times);
-float hoku_rect_y_up(hoku_rect* rect, int times);
-float hoku_rect_y_down(hoku_rect* rect, int times);
+bool hoku_rect_includes_y(hoku_rect rect, float y);
+bool hoku_rect_includes_x(hoku_rect rect, float x);
+float hoku_rect_x_left(hoku_rect rect, int times);
+float hoku_rect_x_right(hoku_rect rect, int times);
+float hoku_rect_y_up(hoku_rect rect, int times);
+float hoku_rect_y_down(hoku_rect rect, int times);
 
 int hoku_selection_init(hoku_selection** selection);
 bool hoku_selection_selected(hoku_selection* selection, float x, float y, float width, float height);
-int hoku_selection_cursor_set(hoku_selection* selection, hoku_cursor_position* cursor);
+int hoku_selection_cursor_set(hoku_selection* selection, hoku_cursor_position cursor);
 void hoku_selection_cursor_free(hoku_selection* selection);
 void hoku_selection_free(hoku_selection* selection);
 

data/ext/extconf.rb

@@ -9,7 +9,7 @@ if MiniPortile.darwin?
 elsif MiniPortile.linux?
   suffix = "so"
   ext = "tar.gz"
-  md4cext = "a"
+  md4cext = "so"
   MDFLAGS = "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
 elsif MiniPortile.windows?
   suffix = "dll"
@@ -45,7 +45,7 @@ md4c = MiniPortileCMake.new("md4c", "0.5.2")
 md4c.files = ["https://github.com/mity/md4c/archive/refs/tags/release-0.5.2.#{ext}"]
 
 def md4c.cmake_compile_flags
-  [*super, "-DBUILD_SHARED_LIBS=OFF", "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"]
+  [*super, "-DBUILD_SHARED_LIBS=OFF #{MDFLAGS}"]
 end
 
 md4c.cook
@@ -89,4 +89,4 @@ File.open("Makefile", "w") do |io|
   #{"\t"}rm -f #{File.expand_path("vendor/lib/libhokusai.*")}
   #{"\t"}rm -f #{File.expand_path("vendor/lib/libmd4c.*")}
   EOF
-end
+end

data/hokusai.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'hokusai-zero'
-  s.version     = '0.2.6-pinephone6'
+  s.version     = '0.2.6'
   s.licenses    = ['MIT']
   s.summary     = "A Ruby library for writing GUI applications"
   s.authors     = ["skinnyjames"]
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.metadata    = { "source_code_uri" => "https://codeberg.org/skinnyjames/hokusai" }
   
   s.add_dependency "ffi", "~> 1.16"
+  s.add_dependency "concurrent-ruby", "~> 1.3.4"
   s.add_dependency "raylib-bindings", "~> 0.7.9"
   s.add_dependency "sdl2-bindings", "~> 0.2.3"
   s.add_dependency "memory_profiler"

data/ui/examples/counter.rb

@@ -122,12 +122,11 @@ Hokusai::Backends::RaylibBackend.run(Demos::Counter) do |config|
   # end
 
   config.after_load do
-    font = Hokusai::Backends::RaylibBackend::Font.sdf("#{__dir__}/assets/OpenSans-Regular.ttf", 260)
+    font = Hokusai::Backends::RaylibBackend::Font.from_ext("#{__dir__}/assets/OpenSans-Regular.ttf", 160)
     Hokusai.fonts.register "opensans", font
     Hokusai.fonts.activate "opensans"
   end
 
-  config.fps = 40
   config.width = 500
   config.height = 500
   config.title = "Counter application"

data/ui/examples/forum/file.rb

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

data/ui/examples/forum/post.rb

@@ -107,6 +107,7 @@ 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::SDLBackend.run(Demos::Forum::App) do |config|
+Hokusai::Backends::RaylibBackend.run(Demos::Forum::App) do |config|
   config.after_load do
-    font = Hokusai::Backends::SDLBackend::Font.from("#{__dir__}/assets/Inter-Regular.ttf")
+    font = Hokusai::Backends::RaylibBackend::Font.from("#{__dir__}/assets/Inter-Regular.ttf")
     Hokusai.fonts.register "inter", font
     Hokusai.fonts.activate "inter"
 
-    font = Hokusai::Backends::SDLBackend::Font.from("#{__dir__}/assets/Delius-Regular.ttf")
+    font = Hokusai::Backends::RaylibBackend::Font.from_ext("#{__dir__}/assets/Delius-Regular.ttf", 160)
     Hokusai.fonts.register "dohyeon", font
   end 
 
@@ -190,10 +190,10 @@ Hokusai::Backends::SDLBackend.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/spreadsheet.rb

@@ -134,7 +134,6 @@ Hokusai::Backends::RaylibBackend.run(Demos::Spreadsheet::App) do |config|
   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

data/ui/examples/tic_tac_toe.rb

@@ -240,9 +240,9 @@ module Demos
     end
   end
 end
-
-Hokusai::Backends::RaylibBackend.run(Demos::TicTacToe::App) do |config|
-  config.width = 500
-  config.height = 500
-  config.title = "Tic Tac Trollio"
-end
+#
+# Hokusai::Backends::SDLBackend.run(TicTacToe::App) do |config|
+#   config.width = 500
+#   config.height = 500
+#   config.title = "Tic Tac Trollio"
+# end

data/ui/lib/lib_hokusai.rb

@@ -122,7 +122,23 @@ module LibHokusai
            :next_child, HmlAst.ptr
   end
 
-  HOKUSAI_KEYS = [
+
+  # 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, [
     :null, :apostrophe, :comma, :minus,
     :period, :slash, :zero, :one, :two,
     :three, :four, :five, :six, :seven,
@@ -146,23 +162,6 @@ 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,
@@ -353,16 +352,16 @@ module LibHokusai
 
   attach_function :hoku_selection_init, [:pointer], :int
   attach_function :hoku_selection_selected, [HokuSelection.by_ref, :float, :float, :float, :float], :bool
-  attach_function :hoku_selection_cursor_set, [HokuSelection.by_ref, HokuCursorPosition.by_ref], :int
+  attach_function :hoku_selection_cursor_set, [HokuSelection.by_ref, HokuCursorPosition.by_value], :int
   attach_function :hoku_selection_cursor_free, [HokuSelection.by_ref], :void
   attach_function :hoku_selection_free, [HokuSelection.by_ref], :void
 
-  attach_function :hoku_rect_includes_y, [HmlRect.by_ref, :float], :bool
-  attach_function :hoku_rect_includes_x, [HmlRect.by_ref, :float], :bool
-  attach_function :hoku_rect_x_left, [HmlRect.by_ref, :int], :float
-  attach_function :hoku_rect_x_right, [HmlRect.by_ref, :int], :float
-  attach_function :hoku_rect_y_up, [HmlRect.by_ref, :int], :float
-  attach_function :hoku_rect_y_down, [HmlRect.by_ref, :int], :float
+  attach_function :hoku_rect_includes_y, [HmlRect.by_value, :float], :bool
+  attach_function :hoku_rect_includes_x, [HmlRect.by_value, :float], :bool
+  attach_function :hoku_rect_x_left, [HmlRect.by_value, :int], :float
+  attach_function :hoku_rect_x_right, [HmlRect.by_value, :int], :float
+  attach_function :hoku_rect_y_up, [HmlRect.by_value, :int], :float
+  attach_function :hoku_rect_y_down, [HmlRect.by_value, :int], :float
 
   class HokuChar < FFI::Struct
     layout :offset, :int,

data/ui/spec/spec_helper.rb

@@ -44,7 +44,7 @@ def with_app(app, &block)
   client = nil
   error = nil
 
-  Thread.new do
+  Hokusai::ThreadPool.post do
     client = Hokusai::Automation::Client.start
     
     yield client

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

@@ -0,0 +1 @@
+<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>

data/ui/src/hokusai/automation/driver_commands/base.rb

@@ -65,8 +65,14 @@ module Hokusai::Automation
       end
 
       def mouse_move(x, y, input)
-        input.mouse.pos.x = x
-        input.mouse.pos.y = y
+        LibHokusai.hoku_input_set_mouse_position(input, vec2(x, y))
+      end
+
+      private
+  
+      # Returns an HmlVec2 from {x,y}
+      def vec2(x, y)
+        LibHokusai::HmlVec2.create(x, y)
       end
     end
   end

data/ui/src/hokusai/automation/driver_commands/trigger_keyboard.rb

@@ -33,18 +33,21 @@ module Hokusai::Automation
         decode_key = keys.shift
 
         mouse_center(canvas, input)
-        input.mouse.left.clicked = true
+        state = LibHokusai::HmlInputMouseButton.create(clicked: true)
+        LibHokusai.hoku_input_mouse_set_button(input, state, 0)
 
         begin
           key_results = to_hml_keygroup(decode_key)
 
-          input.keyboard.reset
+          LibHokusai.hoku_input_keyboard_start(input)
 
           key_results.each do |key|
             Log.info { "populating #{key}"}
 
-            input.keyboard.set(key, true)
+            LibHokusai.hoku_input_keyboard_set_key(input, key, true)
           end
+
+          LibHokusai.hoku_input_keyboard_stop(input)
         rescue Automation::Error => ex
           keys.clear
           self.exeception = ex

data/ui/src/hokusai/automation/driver_commands/trigger_mouse.rb

@@ -2,9 +2,9 @@ module Hokusai::Automation
   module DriverCommands
     module MouseMethods
       def trigger_mouse(input, **args)
-        args.each do |which, bool|
-          input.mouse.left.send("#{which}=", bool)
-        end
+        state = LibHokusai::HmlInputMouseButton.create(**args)
+
+        LibHokusai.hoku_input_mouse_set_button(input, state, button)
       end
     end
 
@@ -27,14 +27,6 @@ module Hokusai::Automation
         state[:button]
       end
 
-      def button_symbol
-        {
-          0 => :left,
-          1 => :middle,
-          2 => :right
-        }[button]
-      end
-
       def on_complete
         return value if done?
 
@@ -73,6 +65,7 @@ module Hokusai::Automation
     class TriggerMouseClick < TriggerMouseBase
       def execute(blocks, canvas, input)
         if matches_blocks(blocks)
+          
           mouse_center(canvas, input)
           trigger_mouse(input, clicked: true)
 
@@ -209,8 +202,8 @@ module Hokusai::Automation
       def execute(blocks, canvas, input)
         if matches_block(blocks[0])
           mouse_center(canvas, input)
+          LibHokusai.hoku_input_mouse_set_scroll(input, scroll_amount)
 
-          input.mouse.scroll = scroll_amount
 
           done!
         end

data/ui/src/hokusai/automation/server.rb

@@ -99,14 +99,15 @@ module Hokusai
         app = App.new(driver)
 
         @socket = Thin::Server.new(*args, app)
-        
-        Thread.new do
+        Hokusai::ThreadPool.post do
           @socket.start
         end
       end
 
       def self.stop
         @socket.stop
+
+        Hokusai::ThreadPool.prune_pool
       end
     end
   end

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, :touch
+                  :host, :port, :automated, :on_reload, :event_waiting
 
     def initialize
       @width = 500
@@ -22,7 +22,6 @@ module Hokusai::Backends
       @automated = false
       @on_reload = ->(_){}
       @event_waiting = false
-      @touch = false
     end
 
     def start_automation_driver

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

@@ -24,7 +24,7 @@ module Hokusai
       end
 
       class Font < Hokusai::Font
-        attr_reader :raw, :sdf
+        attr_reader :raw
 
         DEFAULT = "–—‘’“”…\r\n\t0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#$%%^&*(),.?/\"\\[]-_=+|~`{}<>;:'\0"
 
@@ -51,7 +51,7 @@ module Hokusai
 
           raylib_font = Raylib.LoadFontEx(file, font_size, codepoints, count)
           Raylib.GenTextureMipmaps(raylib_font.texture)
-          Raylib.SetTextureFilter(raylib_font.texture, Raylib::TEXTURE_FILTER_POINT)
+          Raylib.SetTextureFilter(raylib_font.texture, Raylib::TEXTURE_FILTER_BILINEAR)
 
           font = new(raylib_font)
           Raylib.UnloadCodepoints(codepoints)
@@ -59,30 +59,9 @@ module Hokusai
           font
         end
 
-        def self.sdf(file, size)
-          ptr = FFI::MemoryPointer.new(:int)
-          data = Raylib.LoadFileData(file, ptr)
-          font = Raylib::Font.new
-          font.baseSize = size
-          font.glyphCount = 95
-
-          font.glyphs = Raylib.LoadFontData(data, ptr.read_int, size, nil, 0, Raylib::FONT_SDF)
-          buf = FFI::MemoryPointer.new(:pointer, 1)
-          atlas = Raylib.GenImageFontAtlas(font.glyphs, buf, 95, size, 4, 0)
-          font.recs = buf.read_pointer
-          font.texture = Raylib.LoadTextureFromImage(atlas)
-          Raylib.UnloadImage(atlas)
-          Raylib.UnloadFileData(data)
-          buf.free
-          ptr.free
-
-          new(font, sdf: true)
-        end
-
-        def initialize(raw, spacing = 1.0, sdf: false)
+        def initialize(raw, spacing = 1.0)
           @raw = raw
           @spacing = spacing
-          @sdf = sdf
         end
 
         # returns the spacing for this font