vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inputd: Move handoff logic to fn open

Browse Source
This commit is contained in:
bjorn3
2025-03-02 17:36:41 +01:00
parent ec442b87a3
commit f8972400ee
1 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
inputd/src/main.rs
+32 -24
View File
@@ -58,7 +58,6 @@ struct InputScheme {
active_vt: Option<usize>,
has_new_events: bool,
maybe_perform_handoff_to: Option<String>,
}
impl InputScheme {
@@ -75,7 +74,6 @@ impl InputScheme {
active_vt: None,
has_new_events: false,
maybe_perform_handoff_to: None,
}
}
@@ -151,7 +149,22 @@ impl Scheme for InputScheme {
"handle_early" => {
let display = path_parts.collect::<Vec<_>>().join(".");
if self.display.is_none() {
self.maybe_perform_handoff_to = Some(display.clone());
self.has_new_events = true;
self.display = Some(display.clone());
for handle in self.handles.values_mut() {
match handle {
Handle::Consumer {
needs_handoff,
notified,
..
} => {
*needs_handoff = true;
*notified = false;
}
_ => continue,
}
}
}
Handle::Display {
events: EventFlags::empty(),
@@ -173,7 +186,22 @@ impl Scheme for InputScheme {
)
});
if needs_handoff {
self.maybe_perform_handoff_to = Some(display.clone());
self.has_new_events = true;
self.display = Some(display.clone());
for handle in self.handles.values_mut() {
match handle {
Handle::Consumer {
needs_handoff,
notified,
..
} => {
*needs_handoff = true;
*notified = false;
}
_ => continue,
}
}
}
Handle::Display {
events: EventFlags::empty(),
@@ -503,26 +531,6 @@ fn deamon(deamon: redox_daemon::Daemon) -> anyhow::Result<()> {
RequestKind::MsyncMsg | RequestKind::MunmapMsg | RequestKind::MmapMsg => unreachable!(),
}
if let Some(display) = scheme.maybe_perform_handoff_to.take() {
scheme.has_new_events = true;
scheme.display = Some(display.clone());
for handle in scheme.handles.values_mut() {
match handle {
Handle::Consumer {
needs_handoff,
notified,
..
} => {
*needs_handoff = true;
*notified = false;
}
_ => continue,
}
}
}
if !scheme.has_new_events {
continue;
}