Skip to content

Commit 21bcc62

Browse files
committed
introduced new command
1 parent 7c76e8d commit 21bcc62

7 files changed

Lines changed: 16 additions & 5 deletions

File tree

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

inputshare-client/src/main.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,10 @@ fn client() -> Result<()> {
102102
dialog = Some(thread::spawn(|| run_key_tester()));
103103
},
104104
Some(GuiEvent::ShutdownServer) => {
105-
log::info!("Shutdown");
105+
log::info!("Sending shutdown signal to server");
106+
if let Some(ref mut transmitter) = input_transmitter {
107+
transmitter.sender.deref().borrow_mut().shutdown_remote();
108+
}
106109
}
107110
None => { }
108111
}

inputshare-client/src/sender.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ impl InputSender {
4141

4242
}
4343

44+
pub fn shutdown_remote(&mut self) {
45+
self.message_queue.push_back([MessageType::Shutdown.into(), 0])
46+
}
47+
4448
pub fn reset(&mut self) {
4549
self.message_queue.push_back([MessageType::Reset.into(), 0])
4650
}

inputshare-server/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "inputshare-server"
3-
version = "2.2.1"
3+
version = "2.3.1"
44
authors = ["sidit77 <sidit77@gmail.com>"]
55
edition = "2018"
66

inputshare-server/src/main.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@ fn server(args: Args) -> Result<()> {
154154
keyboard.reset()?;
155155
mouse.reset()?;
156156
consumer_device.reset()?;
157-
}
157+
},
158+
InputEvent::Shutdown => log::info!("Shutdown")
158159
}
159160
last_input = Instant::now();
160161
// println!("{:?}", event);

inputshare-server/src/receiver.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ pub enum InputEvent {
1616
HorizontalScrolling(i8),
1717
VerticalScrolling(i8),
1818
Reset,
19+
Shutdown
1920
}
2021

2122
#[derive(Debug)]
@@ -70,6 +71,7 @@ impl InputReceiver {
7071
Ok(MessageType::HorizontalScrolling) => self.events.push_back(InputEvent::HorizontalScrolling(msg_arg as i8)),
7172
Ok(MessageType::VerticalScrolling) => self.events.push_back(InputEvent::VerticalScrolling(msg_arg as i8)),
7273
Ok(MessageType::Reset) => self.events.push_back(InputEvent::Reset),
74+
Ok(MessageType::Shutdown) => self.events.push_back(InputEvent::Shutdown),
7375
Err(e) => log::warn!("Invalid message: {}", e)
7476
}
7577
self.last_message = start_message + i + 1;

lib/inputshare-common/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ pub enum MessageType {
2828
ConsumerDeviceRelease,
2929
HorizontalScrolling,
3030
VerticalScrolling,
31-
Reset
31+
Reset,
32+
Shutdown
3233
}
3334

3435
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq, IntoPrimitive, FromPrimitive)]

0 commit comments

Comments
 (0)