iwp

src/input/key.gleam

@@ -1,7 +1,5 @@
 import gleam/erlang/atom
-import gleam/erlang/process.{type Subject}
 import gleam/list
-import gleam/string
 
 import input/internal as internal_input
 
@@ -37,10 +35,9 @@ pub fn from_list(l: List(String)) -> Key {
 
     [ci] | [ci, _] if ci == input_introducer -> Continue(l)
     [ii, cmd, tail] if ii == input_introducer -> {
-      case tail {
+      case tail == "\r" {
-        "\r" -> Input(cmd)
+        True -> Input(cmd)
-        "\u{007F}" -> Continue([ii, string.drop_end(cmd, 1)])
+        False -> Continue([ii, cmd <> tail])
-        _ -> Continue([ii, cmd <> tail])
       }
     }
 
@@ -58,20 +55,14 @@ pub fn start_raw_shell() {
   internal_input.shell_start_interactive(#(no_shell, raw))
 }
 
-pub fn read_input_until_key(
+pub fn read_input_until_key(l: List(String)) -> Key {
-  l: List(String),
-  tap_input: Subject(List(String)),
-) -> Key {
   case
     internal_input.read_input()
     |> list.wrap
     |> list.append(l, _)
     |> from_list
   {
-    Continue(l) -> {
+    Continue(l) -> read_input_until_key(l)
-      process.send(tap_input, l)
-      read_input_until_key(l, tap_input)
-    }
     k -> k
   }
 }

src/mpv/mpv.gleam

@@ -9,13 +9,8 @@ import mpv/control.{type Control}
 import tcp/reason
 import tcp/tcp.{type Socket}
 
-type State(socket, inject_input, tap_input, exit) {
+type State(socket, inject_input, exit) {
-  State(
+  State(socket: Socket, inject_input: Subject(Key), exit: Subject(Nil))
-    socket: Socket,
-    inject_input: Subject(Key),
-    tap_input: Subject(List(String)),
-    exit: Subject(Nil),
-  )
 }
 
 pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
@@ -31,11 +26,8 @@ pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
       let inject_input_name = process.new_name("inject_input")
       let inject_input = process.named_subject(inject_input_name)
 
-      let tap_input_name = process.new_name("tap_input")
-      let tap_input = process.named_subject(tap_input_name)
-
       case
-        actor.new(State(socket, inject_input, tap_input, exit))
+        actor.new(State(socket, inject_input, exit))
         |> actor.on_message(handle_message)
         |> actor.start
       {
@@ -46,16 +38,12 @@ pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
           key.start_raw_shell()
 
           process.spawn(fn() {
+            let input = process.new_subject()
             let assert Ok(_) =
               process.register(process.self(), inject_input_name)
 
-            read_input(data, inject_input, tap_input)
+            process.send(input, key.Continue([]))
-          })
+            read_input(data, input, inject_input)
-
-          process.spawn(fn() {
-            let assert Ok(_) = process.register(process.self(), tap_input_name)
-
-            input_output_loop(tap_input)
           })
 
           Ok(Nil)
@@ -66,9 +54,9 @@ pub fn new(exit: Subject(Nil)) -> Result(Nil, String) {
 }
 
 fn handle_message(
-  state: State(socket, inject, input_output, exit),
+  state: State(socket, inject, exit),
   control: Control,
-) -> actor.Next(State(socket, inject, input_output, exit), Control) {
+) -> actor.Next(State(socket, inject, exit), Control) {
   case control {
     control.Search -> {
       process.send(state.inject_input, key.Continue([key.input_introducer]))
@@ -96,28 +84,40 @@ fn handle_message(
   }
 }
 
-/// `read_input` operates by reading from input until a `Key` can be created.
+/// read_input selects from two subjects: `input` and `inject`
-/// It is possible to create a `Key` without the users input by sending
+/// `inject` can be used by the agent to send back input character(s)
-/// messages to `inject_input` which will initialize the "input to key" sequence.
+/// to force the input to be something other than user input.
-/// This is useful to ultimately create a `Control` without the user having to
+///
-/// input all of the character(s) needed.
+/// This is useful to create a `Key` without the user having to
+/// input all of the character(s), to then be able to create a
+/// `Control` from that `Key`
 fn read_input(
   agent: Subject(Control),
+  input: Subject(Key),
   inject_input: Subject(Key),
-  tap_input: Subject(List(String)),
 ) -> Nil {
-  let buffer = case process.receive(inject_input, 1) {
+  let buffer = case
-    Ok(key.Continue(buffer)) -> buffer
+    process.new_selector()
-    Ok(_) | Error(_) -> []
+    |> process.select(input)
+    |> process.select(inject_input)
+    |> process.selector_receive_forever
+  {
+    key.Continue(buffer) -> buffer
+    _ -> []
   }
 
   case
-    key.read_input_until_key(buffer, tap_input)
+    key.read_input_until_key(buffer)
     |> control.from_key
   {
     Error(_) -> Nil
     Ok(control) -> process.send(agent, control)
   }
 
-  read_input(agent, inject_input, tap_input)
+  // currently needed to allow injects to be received. not nice
+  // maybe timed out select on inject first, then normal?
+  process.sleep(100)
+
+  process.send(input, key.Continue([]))
+  read_input(agent, input, inject_input)
 }

test/input/input_test.gleam

@@ -1,7 +1,7 @@
 import gleam/list
 import gleeunit
 
-import input/key.{type Key, Char, csi, esc, input_introducer as ii}
+import input/key.{type Key, Char, csi, esc}
 
 pub fn main() -> Nil {
   gleeunit.main()
@@ -27,10 +27,10 @@ pub fn key_from_list_test() {
   ]
 
   let input_tests = [
-    TestCase([ii], key.Continue([ii])),
+    TestCase(["$"], key.Continue(["$"])),
-    TestCase([ii, "a"], key.Continue([ii, "a"])),
+    TestCase(["$", "a"], key.Continue(["$", "a"])),
-    TestCase([ii, "a", "b"], key.Continue([ii, "ab"])),
+    TestCase(["$", "a", "b"], key.Continue(["$", "ab"])),
-    TestCase([ii, "ab", "\r"], key.Input("ab")),
+    TestCase(["$", "ab", "\r"], key.Input("ab")),
   ]
 
   let test_cases = [base_tests, char_tests, escape_tests, input_tests]