drivers/inputd: Remove some leftover code from the old way display resizing was handled
This commit is contained in:
@@ -48,8 +48,6 @@ fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> ! {
|
||||
display: ProducerHandle::new().ok(),
|
||||
};
|
||||
|
||||
scheme.update_size();
|
||||
|
||||
register_sync_scheme(&socket, "bga", &mut scheme).expect("bgad: failed to register bga scheme");
|
||||
|
||||
daemon.ready();
|
||||
|
||||
@@ -13,20 +13,6 @@ pub struct BgaScheme {
|
||||
pub display: Option<ProducerHandle>,
|
||||
}
|
||||
|
||||
impl BgaScheme {
|
||||
pub fn update_size(&mut self) {
|
||||
if let Some(ref mut display) = self.display {
|
||||
let _ = display.write_event(
|
||||
orbclient::ResizeEvent {
|
||||
width: self.bga.width() as u32,
|
||||
height: self.bga.height() as u32,
|
||||
}
|
||||
.to_event(),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const SCHEME_ROOT_ID: usize = 1;
|
||||
|
||||
impl SchemeSync for BgaScheme {
|
||||
@@ -98,8 +84,6 @@ impl SchemeSync for BgaScheme {
|
||||
|
||||
self.bga.set_size(width, height);
|
||||
|
||||
self.update_size();
|
||||
|
||||
Ok(buf.len())
|
||||
}
|
||||
|
||||
|
||||
@@ -292,10 +292,6 @@ impl<T: GraphicsAdapter> GraphicsScheme<T> {
|
||||
.handle_cursor(&vt_state.cursor_plane, true);
|
||||
}
|
||||
}
|
||||
|
||||
VtEventKind::Resize => {
|
||||
log::warn!("driver-graphics: resize is not implemented yet")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -165,7 +165,7 @@ impl DisplayHandle {
|
||||
|
||||
pub fn read_vt_event(&mut self) -> io::Result<Option<VtEvent>> {
|
||||
let mut event = VtEvent {
|
||||
kind: VtEventKind::Resize,
|
||||
kind: VtEventKind::Activate,
|
||||
vt: usize::MAX,
|
||||
width: u32::MAX,
|
||||
height: u32::MAX,
|
||||
@@ -212,7 +212,6 @@ impl ControlHandle {
|
||||
#[repr(usize)]
|
||||
pub enum VtEventKind {
|
||||
Activate,
|
||||
Resize,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
|
||||
@@ -443,33 +443,6 @@ impl SchemeSync for InputScheme {
|
||||
}
|
||||
},
|
||||
|
||||
EventOption::Resize(resize_event) => {
|
||||
for handle in self.handles.values_mut() {
|
||||
match handle {
|
||||
Handle::Display {
|
||||
pending,
|
||||
notified,
|
||||
device,
|
||||
..
|
||||
} => {
|
||||
if self.display.as_ref() == Some(device) {
|
||||
pending.push(VtEvent {
|
||||
kind: VtEventKind::Resize,
|
||||
vt: self.active_vt.unwrap(),
|
||||
width: resize_event.width,
|
||||
height: resize_event.height,
|
||||
|
||||
// TODO(andypython): Figure out how to get the stride.
|
||||
stride: resize_event.width,
|
||||
});
|
||||
*notified = false;
|
||||
}
|
||||
}
|
||||
_ => continue,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
_ => continue,
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user