[WIP] update SSIP, add speech to certain events

odilia-app · Apr 5, 2024 · 50b61e3 · 50b61e3
1 parent 905f976
commit 50b61e3
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/odilia/Cargo.toml b/odilia/Cargo.toml
@@ -44,7 +44,7 @@ odilia-input = { path = "../input", version = "0.0.3" }
 odilia-tts = { path = "../tts", version = "0.1.4" }
 serde_json.workspace = true
 serde_plain.workspace = true
-ssip-client-async.workspace = true
+ssip-client-async = { version = "0.13.0", features = ["tokio"] }
 tokio.workspace = true
 tracing-error.workspace = true
 tracing-log.workspace = true
@@ -57,6 +57,7 @@ odilia-notify = { version = "0.1.0", path = "../odilia-notify" }
 clap = { version = "4.5.1", features = ["derive"] }
 tokio-util.workspace=true
 tower = { version = "0.4.13", features = ["util", "filter"] }
+ssip = "0.1.0"
 
 [dev-dependencies]
 lazy_static = "1.4.0"

diff --git a/odilia/src/main.rs b/odilia/src/main.rs
@@ -16,8 +16,10 @@ mod tower;
 
 use std::{process::exit, sync::Arc, time::Duration};
 
+use ssip::Request as SSIPRequest;
 use crate::cli::Args;
 use crate::state::ScreenReaderState;
+use crate::state::Speech;
 use crate::tower::Handlers;
 use clap::Parser;
 use eyre::WrapErr;
@@ -73,8 +75,11 @@ async fn sigterm_signal_watcher(
 
 use atspi::events::document::LoadCompleteEvent;
 
-async fn doc_loaded(loaded: LoadCompleteEvent) -> Result<(), odilia_common::errors::OdiliaError> {
+async fn doc_loaded(loaded: LoadCompleteEvent, Speech(ssip): Speech) -> Result<(), odilia_common::errors::OdiliaError> {
 	println!("Doc loaded!");
+  ssip.send(SSIPRequest::SetPriority(Priority::Text)).await.unwrap();
+  ssip.send(SSIPRequest::Speak).await.unwrap();
+  ssip.send(SSIPRequest::SendLines(Vec::from(["Doc loaded!".to_string()]))).await.unwrap();
 	Ok(())
 }
 

diff --git a/odilia/src/state.rs b/odilia/src/state.rs
@@ -37,6 +37,14 @@ pub struct ScreenReaderState {
 	pub cache: Arc<Cache>,
 }
 
+pub struct Speech(pub Sender<SSIPRequest>);
+
+impl From<Arc<ScreenReaderState>> for Speech {
+    fn from(state: Arc<ScreenReaderState>) -> Speech {
+        Speech(state.ssip.clone())
+    }
+}
+
 enum ConfigType {
 	CliOverride,
 	XDGConfigHome,

diff --git a/tts/Cargo.toml b/tts/Cargo.toml
@@ -11,8 +11,9 @@ categories = ["accessibility", "api-bindings"]
 edition = "2021"
 
 [dependencies]
-ssip-client-async.workspace = true
+ssip-client-async = { version = "0.13.0", features = ["tokio"] }
 tokio.workspace = true
 tokio-util.workspace=true
 tracing.workspace = true
 eyre.workspace = true
+ssip = "0.1.0"