input: Handle lid-switch and disable/enable built-in display

This commit is contained in:
Victoria Brekenfeld 2025-07-29 15:58:07 +02:00 committed by Victoria Brekenfeld
parent f2fc1e9480
commit 7ccfd7381e
2 changed files with 39 additions and 6 deletions

View file

@ -7,7 +7,7 @@ use crate::{
cosmic_keystate_from_smithay, cosmic_modifiers_eq_smithay,
cosmic_modifiers_from_smithay,
},
Action, Config, PrivateAction,
Action, Config, OutputConfig, OutputState, PrivateAction,
},
input::gestures::{GestureState, SwipeAction},
shell::{
@ -41,9 +41,9 @@ use smithay::{
backend::input::{
AbsolutePositionEvent, Axis, AxisSource, Device, DeviceCapability, GestureBeginEvent,
GestureEndEvent, GesturePinchUpdateEvent as _, GestureSwipeUpdateEvent as _, InputBackend,
InputEvent, KeyState, KeyboardKeyEvent, PointerAxisEvent, ProximityState,
TabletToolButtonEvent, TabletToolEvent, TabletToolProximityEvent, TabletToolTipEvent,
TabletToolTipState, TouchEvent,
InputEvent, KeyState, KeyboardKeyEvent, PointerAxisEvent, ProximityState, Switch,
SwitchState, SwitchToggleEvent, TabletToolButtonEvent, TabletToolEvent,
TabletToolProximityEvent, TabletToolTipEvent, TabletToolTipState, TouchEvent,
},
desktop::{utils::under_from_surface_tree, PopupKeyboardGrab, WindowSurfaceType},
input::{
@ -1507,7 +1507,40 @@ impl State {
}
}
InputEvent::Special(_) => {}
InputEvent::SwitchToggle { event: _ } => {}
InputEvent::SwitchToggle { event } => {
if event.switch() == Some(Switch::Lid) {
let outputs = self.backend.lock().all_outputs();
if let Some(internal) = outputs.into_iter().find(|o| o.is_internal()) {
let config = internal.user_data().get::<RefCell<OutputConfig>>().unwrap();
let enabled = config.borrow().enabled.clone();
if enabled != OutputState::Disabled && event.state() == SwitchState::On {
config.borrow_mut().enabled = OutputState::Disabled;
self.common
.output_configuration_state
.remove_heads(std::iter::once(&internal));
} else if enabled == OutputState::Disabled
&& event.state() == SwitchState::Off
{
self.common
.output_configuration_state
.add_heads(std::iter::once(&internal));
} else {
return;
}
self.common.config.read_outputs(
&mut self.common.output_configuration_state,
&mut self.backend,
&self.common.shell,
&self.common.event_loop_handle,
&mut self.common.workspace_state.update(),
&self.common.xdg_activation_state,
self.common.startup_done.clone(),
&self.common.clock,
);
}
}
}
}
}

View file

@ -400,7 +400,7 @@ impl BackendData {
}
impl<'a> LockedBackend<'a> {
fn all_outputs(&self) -> Vec<Output> {
pub fn all_outputs(&self) -> Vec<Output> {
match self {
LockedBackend::Kms(state) => state.all_outputs(),
LockedBackend::X11(state) => state.all_outputs(),