Finally, we can read click events

main
Tassilo Horn 3 years ago
parent 4d4937d292
commit 2f36e073a3
  1. 3
      TODO
  2. 43
      src/bar.rs

@ -0,0 +1,3 @@
- Maybe add a launcher bar module
- Investigate cargo workspaces so that swayr and swaybar can be separate crates
sharing a common lib.

@ -18,7 +18,7 @@
use crate::bar::module::BarModuleFn; use crate::bar::module::BarModuleFn;
use env_logger::Env; use env_logger::Env;
use serde_json; use serde_json;
use serde_json::Deserializer; use std::io;
use std::{sync::Arc, thread}; use std::{sync::Arc, thread};
use swaybar_types as sbt; use swaybar_types as sbt;
@ -51,17 +51,38 @@ pub fn start() {
} }
pub fn handle_input(mods: Arc<Vec<Box<dyn BarModuleFn>>>) { pub fn handle_input(mods: Arc<Vec<Box<dyn BarModuleFn>>>) {
// TODO: Read stdin and react to click events. let mut sb = String::new();
// let stream = io::stdin()
// Deserializer::from_reader(std::io::stdin()).into_iter::<sbt::Click>(); .read_line(&mut sb)
// for click in stream { .expect("Could not read from stdin");
// log::debug!("Click received: {:?}", click);
// }
// let lines = std::io::stdin().lock(); if "[\n" != sb {
// for l in lines { log::error!("Expected [\\n but got {}", sb);
// log::debug!("{}", l); log::error!("Sorry, input events won't work is this session.");
// } return;
}
loop {
let mut buf = String::new();
if let Err(err) = io::stdin().read_line(&mut buf) {
log::error!("Error while reading from stdin: {}", err);
log::error!("Skipping this input line...");
continue;
}
let click = match serde_json::from_str::<sbt::Click>(
buf.strip_prefix(",").unwrap_or(&buf),
) {
Ok(click) => click,
Err(err) => {
log::error!("Error while parsing str to Click: {}", err);
log::error!("The string was {}", buf);
log::error!("Skipping this input line...");
continue;
}
};
log::debug!("Received click: {:?}", click);
}
} }
pub fn generate_status(mods: &[Box<dyn BarModuleFn>], refresh_interval: u64) { pub fn generate_status(mods: &[Box<dyn BarModuleFn>], refresh_interval: u64) {

Loading…
Cancel
Save