Trim main.rs
This commit is contained in:
181
src/main.rs
181
src/main.rs
@@ -1,20 +1,11 @@
|
||||
#[macro_use]
|
||||
extern crate anyhow;
|
||||
extern crate lz_fear;
|
||||
|
||||
use anyhow::{Context, Result};
|
||||
use anyhow::{anyhow, Context, Result};
|
||||
use clap::Parser;
|
||||
use lz_fear::CompressionSettings;
|
||||
|
||||
use libremarkable::cgmath;
|
||||
use libremarkable::input::{ev::EvDevContext, InputDevice, InputEvent, WacomEvent, WacomPen};
|
||||
|
||||
use std::default::Default;
|
||||
use std::fs::File;
|
||||
use std::io::{BufRead, BufReader, Read, Seek, SeekFrom, Write};
|
||||
use std::net::{TcpListener, TcpStream};
|
||||
use std::process::Command;
|
||||
use std::sync::mpsc::{channel, Receiver};
|
||||
use std::sync::mpsc::channel;
|
||||
use std::thread;
|
||||
use std::time::Duration;
|
||||
|
||||
@@ -40,10 +31,6 @@ pub struct Opts {
|
||||
/// File containing the framebuffer data. If this equals the string ':mem:' it will try to read the framebuffer from xochitl's process memory (rM2 only).
|
||||
#[arg(long, name = "path", short = 'f')]
|
||||
file: String,
|
||||
|
||||
/// Show a cursor where the pen is hovering.
|
||||
#[arg(long, name = "cursor", short = 'c')]
|
||||
show_cursor: bool,
|
||||
}
|
||||
|
||||
fn main() -> Result<()> {
|
||||
@@ -58,25 +45,19 @@ fn main() -> Result<()> {
|
||||
(opts.file.to_owned(), 0)
|
||||
};
|
||||
|
||||
let streamer = ReStreamer::init(
|
||||
&file,
|
||||
offset,
|
||||
opts.width,
|
||||
opts.height,
|
||||
opts.bytes_per_pixel,
|
||||
opts.show_cursor,
|
||||
)?;
|
||||
let mut streamer =
|
||||
ReStreamer::init(&file, offset, opts.width, opts.height, opts.bytes_per_pixel)?;
|
||||
|
||||
let stdout = std::io::stdout();
|
||||
let data_target: Box<dyn Write> = if let Some(port) = opts.listen {
|
||||
Box::new(listen_timeout(port, Duration::from_secs(3))?)
|
||||
let mut data_target: Box<dyn Write> = if let Some(port) = opts.listen {
|
||||
Box::new(listen_timeout(port, Duration::from_secs(60))?)
|
||||
} else {
|
||||
let stdout = std::io::stdout();
|
||||
Box::new(stdout.lock())
|
||||
};
|
||||
|
||||
let lz4: CompressionSettings = Default::default();
|
||||
lz4.compress(streamer, data_target)
|
||||
.context("Error while compressing framebuffer stream")
|
||||
std::io::copy(&mut streamer, &mut data_target).unwrap();
|
||||
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
fn listen_timeout(port: usize, timeout: Duration) -> Result<TcpStream> {
|
||||
@@ -139,14 +120,6 @@ pub struct ReStreamer {
|
||||
start: u64,
|
||||
cursor: usize,
|
||||
size: usize,
|
||||
width: usize,
|
||||
height: usize,
|
||||
bytes_per_pixel: usize,
|
||||
|
||||
show_cursor: bool,
|
||||
input_rx: Receiver<InputEvent>,
|
||||
pen_pos: Option<(usize, usize)>,
|
||||
drawing: bool,
|
||||
}
|
||||
|
||||
impl ReStreamer {
|
||||
@@ -156,30 +129,17 @@ impl ReStreamer {
|
||||
width: usize,
|
||||
height: usize,
|
||||
bytes_per_pixel: usize,
|
||||
show_cursor: bool,
|
||||
) -> Result<ReStreamer> {
|
||||
) -> Result<Self> {
|
||||
let start = offset as u64;
|
||||
let size = width * height * bytes_per_pixel;
|
||||
let cursor = 0;
|
||||
let file = File::open(path)?;
|
||||
|
||||
let (input_tx, input_rx) = channel::<InputEvent>();
|
||||
if show_cursor {
|
||||
EvDevContext::new(InputDevice::Wacom, input_tx).start();
|
||||
}
|
||||
|
||||
let mut streamer = ReStreamer {
|
||||
file,
|
||||
start: start,
|
||||
start,
|
||||
cursor,
|
||||
size,
|
||||
width,
|
||||
height,
|
||||
bytes_per_pixel,
|
||||
show_cursor,
|
||||
input_rx,
|
||||
pen_pos: None,
|
||||
drawing: false,
|
||||
};
|
||||
streamer.next_frame()?;
|
||||
Ok(streamer)
|
||||
@@ -188,122 +148,10 @@ impl ReStreamer {
|
||||
pub fn next_frame(&mut self) -> std::io::Result<()> {
|
||||
self.file.seek(SeekFrom::Start(self.start))?;
|
||||
self.cursor = 0;
|
||||
if self.show_cursor {
|
||||
self.read_input();
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Read input events to figure out pen state and position.
|
||||
fn read_input(&mut self) {
|
||||
let mut down = self.pen_pos.is_some();
|
||||
let mut pos = self.pen_pos.unwrap_or((0, 0));
|
||||
while let Ok(event) = self.input_rx.try_recv() {
|
||||
match event {
|
||||
InputEvent::WacomEvent { event: e } => match e {
|
||||
WacomEvent::InstrumentChange {
|
||||
pen: WacomPen::ToolPen,
|
||||
state: s,
|
||||
} => {
|
||||
down = s;
|
||||
}
|
||||
WacomEvent::Hover {
|
||||
position: cgmath::Point2 { x, y },
|
||||
..
|
||||
} => {
|
||||
pos = (x as usize, y as usize);
|
||||
self.drawing = false;
|
||||
}
|
||||
WacomEvent::Draw { .. } => {
|
||||
// no need to show position while drawing
|
||||
self.drawing = true;
|
||||
}
|
||||
_ => (),
|
||||
},
|
||||
_ => (),
|
||||
}
|
||||
}
|
||||
|
||||
self.pen_pos = if down { Some(pos) } else { None };
|
||||
}
|
||||
|
||||
/// Draw pen position into fb data, if necessary (in hover range and not drawing).
|
||||
fn draw_pen_position(&mut self, buf: &mut [u8]) {
|
||||
if let (false, Some((y, x))) = (self.drawing, self.pen_pos) {
|
||||
let flip = self.width > self.height;
|
||||
let (x, y) = if flip { (y, x) } else { (x, y) };
|
||||
// we need negative numbers to calculate offsets correctly
|
||||
let width = if flip { self.height } else { self.width } as isize;
|
||||
let height = if flip { self.width } else { self.height } as isize;
|
||||
let bpp = self.bytes_per_pixel as isize;
|
||||
let cursor = self.cursor as isize;
|
||||
for (i, (yoff, no)) in PEN_IMAGE.iter().enumerate() {
|
||||
// we draw vertically (lines along y)
|
||||
let xoff = i as isize - (PEN_IMAGE.len() as isize / 2);
|
||||
let xstart = x as isize + xoff;
|
||||
// line outside of canvas?
|
||||
if xstart < 0 || xstart >= width {
|
||||
continue;
|
||||
}
|
||||
let mut ystart = (height - y as isize) + yoff;
|
||||
let mut no = *no;
|
||||
// cut-off at sides
|
||||
if ystart < 0 {
|
||||
no += ystart;
|
||||
ystart = 0;
|
||||
}
|
||||
if ystart + no > height {
|
||||
no = height - ystart;
|
||||
}
|
||||
if no <= 0 {
|
||||
continue;
|
||||
}
|
||||
// translate to buf indexes, check bounds and draw
|
||||
let mut px_start = (xstart * height + ystart) * bpp;
|
||||
let mut px_end = px_start + no * bpp;
|
||||
// outside current buf?
|
||||
if px_end < cursor || px_start >= cursor + buf.len() as isize {
|
||||
continue;
|
||||
}
|
||||
// truncate if partially outside
|
||||
if px_start < cursor {
|
||||
px_start = cursor;
|
||||
}
|
||||
if px_end > cursor + buf.len() as isize {
|
||||
px_end = cursor + buf.len() as isize;
|
||||
}
|
||||
// invert pixel (on RM2)
|
||||
// TODO: Do something sensible on RM1
|
||||
for b in buf[(px_start - cursor) as usize..(px_end - cursor) as usize].iter_mut() {
|
||||
*b = 255 - *b;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Image of pen, given as (offset from pen position, number of pixels)
|
||||
static PEN_IMAGE: [(isize, isize); 17] = [
|
||||
(0, 1), // 00000000100000000
|
||||
(0, 1), // 00000000100000000
|
||||
(0, 1), // 00000000100000000
|
||||
(-1, 3), // 00000001110000000
|
||||
(-3, 7), // 00000111111100000
|
||||
(-4, 9), // 00001111111110000
|
||||
(-4, 9), // 00001111111110000
|
||||
(-5, 11), // 00011111111111000
|
||||
(-8, 17), // 11111111111111111
|
||||
(-5, 11), // 00011111111111000
|
||||
(-4, 9), // 00001111111110000
|
||||
(-4, 9), // 00001111111110000
|
||||
(-3, 7), // 00000111111100000
|
||||
(-1, 3), // 00000001110000000
|
||||
(0, 1), // 00000000100000000
|
||||
(0, 1), // 00000000100000000
|
||||
(0, 1), // 00000000100000000
|
||||
];
|
||||
|
||||
impl Read for ReStreamer {
|
||||
fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
|
||||
let requested = buf.len();
|
||||
@@ -314,14 +162,11 @@ impl Read for ReStreamer {
|
||||
self.file.read(&mut buf[0..rest])?
|
||||
};
|
||||
|
||||
if self.show_cursor {
|
||||
self.draw_pen_position(&mut buf[0..bytes_read]);
|
||||
}
|
||||
|
||||
self.cursor += bytes_read;
|
||||
if self.cursor == self.size {
|
||||
self.next_frame()?;
|
||||
}
|
||||
|
||||
Ok(bytes_read)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user