aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrooks J Rady <b.j.rady@gmail.com>2021-03-25 14:13:59 +0000
committerBrooks J Rady <b.j.rady@gmail.com>2021-03-25 14:13:59 +0000
commit81a517b264912f65fd9a216befd5dd788d93adf4 (patch)
treef127a6f5bd60cf535f90c2968bf78f4e252ff067 /src
parentMove most key handling to the update() + event system (diff)
downloadsl0ppij-81a517b264912f65fd9a216befd5dd788d93adf4.tar.gz
sl0ppij-81a517b264912f65fd9a216befd5dd788d93adf4.tar.xz
sl0ppij-81a517b264912f65fd9a216befd5dd788d93adf4.zip
Remove a dead input enum variant
Diffstat (limited to 'src')
-rw-r--r--src/common/mod.rs34
-rw-r--r--src/common/wasm_vm.rs1
2 files changed, 17 insertions, 18 deletions
diff --git a/src/common/mod.rs b/src/common/mod.rs
index b8a4c671..add50d47 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -593,25 +593,25 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: CliArgs) {
}
// FIXME: Deduplicate this with the callback below!
PluginInstruction::Input(input_type, input_bytes) => {
- if let PluginInputType::Event(event) = input_type {
- for (instance, plugin_env) in plugin_map.values() {
- if !plugin_env.events.contains(&event) {
- continue;
- }
- let handle_key = instance
- .exports
- .get_function(handler_map.get(&event).unwrap())
- .unwrap();
- for key in input_bytes.keys().flatten() {
- let key = cast_termion_key(key);
- wasi_write_string(
- &plugin_env.wasi_env,
- &serde_json::to_string(&key).unwrap(),
- );
- handle_key.call(&[]).unwrap();
- }
+ let PluginInputType::Event(event) = input_type;
+ for (instance, plugin_env) in plugin_map.values() {
+ if !plugin_env.events.contains(&event) {
+ continue;
+ }
+ let handle_key = instance
+ .exports
+ .get_function(handler_map.get(&event).unwrap())
+ .unwrap();
+ for key in input_bytes.keys().flatten() {
+ let key = cast_termion_key(key);
+ wasi_write_string(
+ &plugin_env.wasi_env,
+ &serde_json::to_string(&key).unwrap(),
+ );
+ handle_key.call(&[]).unwrap();
}
}
+
drop(send_screen_instructions.send(ScreenInstruction::Render));
}
PluginInstruction::Unload(pid) => drop(plugin_map.remove(&pid)),
diff --git a/src/common/wasm_vm.rs b/src/common/wasm_vm.rs
index 24b947d6..19b3a197 100644
--- a/src/common/wasm_vm.rs
+++ b/src/common/wasm_vm.rs
@@ -23,7 +23,6 @@ pub enum NaughtyEventType {
#[derive(Clone, Debug)]
pub enum PluginInputType {
- Normal(u32),
Event(NaughtyEventType),
}