leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add map_to_output input option for touch devices

Browse source
This commit is contained in:
Ian Douglas Scott 2023-12-27 19:17:13 -08:00 • committed by Victoria Brekenfeld
parent 70bb9b9a2e
commit 45946fc75d
4 changed files with 54 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cosmic-comp-config/src/input.rs
View file

@ -27,6 +27,8 @@ pub struct InputConfig {
pub scroll_config: Option<ScrollConfig>,
#[serde(skip_serializing_if = "Option::is_none", default)]
pub tap_config: Option<TapConfig>,
#[serde(skip_serializing_if = "Option::is_none", default)]
pub map_to_output: Option<String>,
}
#[derive(Clone, Debug, Default, PartialEq, Deserialize, Serialize)]

1
src/config/input_config.rs
View file

@ -79,6 +79,7 @@ pub fn for_device(device: &InputDevice) -> InputConfig {
} else {
None
},
map_to_output: None,
}
}

10
src/config/mod.rs
View file

@ -426,6 +426,16 @@ impl Config {
.map_or(1.0, |x| x.0)
}
pub fn map_to_output(&self, device: &InputDevice) -> Option<&str> {
let (device_config, default_config) = self.get_device_config(device);
Some(
input_config::get_config(device_config, default_config, |x| {
x.map_to_output.as_deref()
})?
.0,
)
}
fn get_device_config(&self, device: &InputDevice) -> (Option<&InputConfig>, &InputConfig) {
let default_config = if device.config_tap_finger_count() > 0 {
&self.input_touchpad

46
src/input/mod.rs
View file

@ -41,7 +41,12 @@ use smithay::{
Seat, SeatState,
},
output::Output,
reexports::wayland_server::DisplayHandle,
reexports::{
input::event::touch::{
TouchDownEvent as LibinputTouchDownEvent, TouchMotionEvent as LibinputTouchMotionEvent,
},
wayland_server::DisplayHandle,
},
utils::{Point, Serial, SERIAL_COUNTER},
wayland::{
keyboard_shortcuts_inhibit::KeyboardShortcutsInhibitorSeat,
@ -217,6 +222,8 @@ impl State {
needs_key_repetition: bool,
) where
<B as InputBackend>::PointerAxisEvent: 'static,
<B as InputBackend>::TouchDownEvent: 'static,
<B as InputBackend>::TouchMotionEvent: 'static,
{
use smithay::backend::input::Event;
match event {
@ -1167,9 +1174,23 @@ impl State {
}
InputEvent::TouchDown { event, .. } => {
if let Some(seat) = self.common.seat_with_device(&event.device()).cloned() {
// TODO: Configuration option for mapping touch device to output
// Is it possible to determine mapping for external touchscreen?
let Some(output) = self.common.shell.builtin_output().cloned() else {
// TODO Is it possible to determine mapping for external touchscreen?
let map_to_output = if let Some(event) =
<dyn Any>::downcast_ref::<LibinputTouchDownEvent>(&event)
{
self.common
.config
.map_to_output(&event.device())
.and_then(|name| {
self.common
.shell
.outputs()
.find(|output| output.name() == name)
})
} else {
None
};
let Some(output) = map_to_output.or_else(|| self.common.shell.builtin_output()).cloned() else {
return;
};
@ -1209,7 +1230,22 @@ impl State {
}
InputEvent::TouchMotion { event, .. } => {
if let Some(seat) = self.common.seat_with_device(&event.device()).cloned() {
let Some(output) = self.common.shell.builtin_output().cloned() else {
let map_to_output = if let Some(event) =
<dyn Any>::downcast_ref::<LibinputTouchMotionEvent>(&event)
{
self.common
.config
.map_to_output(&event.device())
.and_then(|name| {
self.common
.shell
.outputs()
.find(|output| output.name() == name)
})
} else {
None
};
let Some(output) = map_to_output.or_else(|| self.common.shell.builtin_output()).cloned() else {
return;
};