kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

config: allow handling switch events

Browse source
This commit is contained in:
Julian Orth 2024-04-28 13:35:52 +02:00
parent 55d55bf161
commit cf233abb5a
21 changed files with 443 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/libinput/event.rs
View file

@ -1,6 +1,6 @@
use {
crate::libinput::{
consts::{ButtonState, EventType, KeyState, PointerAxis},
consts::{ButtonState, EventType, KeyState, PointerAxis, Switch, SwitchState},
device::LibInputDevice,
sys::{
libinput_event, libinput_event_destroy, libinput_event_gesture,
@ -10,14 +10,17 @@ use {
libinput_event_gesture_get_finger_count, libinput_event_gesture_get_scale,
libinput_event_gesture_get_time_usec, libinput_event_get_device,
libinput_event_get_gesture_event, libinput_event_get_keyboard_event,
libinput_event_get_pointer_event, libinput_event_get_type, libinput_event_keyboard,
libinput_event_keyboard_get_key, libinput_event_keyboard_get_key_state,
libinput_event_keyboard_get_time_usec, libinput_event_pointer,
libinput_event_pointer_get_button, libinput_event_pointer_get_button_state,
libinput_event_pointer_get_dx, libinput_event_pointer_get_dx_unaccelerated,
libinput_event_pointer_get_dy, libinput_event_pointer_get_dy_unaccelerated,
libinput_event_pointer_get_scroll_value, libinput_event_pointer_get_scroll_value_v120,
libinput_event_pointer_get_time_usec, libinput_event_pointer_has_axis,
libinput_event_get_pointer_event, libinput_event_get_switch_event,
libinput_event_get_type, libinput_event_keyboard, libinput_event_keyboard_get_key,
libinput_event_keyboard_get_key_state, libinput_event_keyboard_get_time_usec,
libinput_event_pointer, libinput_event_pointer_get_button,
libinput_event_pointer_get_button_state, libinput_event_pointer_get_dx,
libinput_event_pointer_get_dx_unaccelerated, libinput_event_pointer_get_dy,
libinput_event_pointer_get_dy_unaccelerated, libinput_event_pointer_get_scroll_value,
libinput_event_pointer_get_scroll_value_v120, libinput_event_pointer_get_time_usec,
libinput_event_pointer_has_axis, libinput_event_switch,
libinput_event_switch_get_switch, libinput_event_switch_get_switch_state,
libinput_event_switch_get_time_usec,
},
},
std::marker::PhantomData,
@ -43,6 +46,11 @@ pub struct LibInputEventGesture<'a> {
pub(super) _phantom: PhantomData<&'a ()>,
}
pub struct LibInputEventSwitch<'a> {
pub(super) event: *mut libinput_event_switch,
pub(super) _phantom: PhantomData<&'a ()>,
}
impl<'a> Drop for LibInputEvent<'a> {
fn drop(&mut self) {
unsafe {
@ -98,6 +106,18 @@ impl<'a> LibInputEvent<'a> {
})
}
}
pub fn switch_event(&self) -> Option<LibInputEventSwitch> {
let res = unsafe { libinput_event_get_switch_event(self.event) };
if res.is_null() {
None
} else {
Some(LibInputEventSwitch {
event: res,
_phantom: Default::default(),
})
}
}
}
impl<'a> LibInputEventKeyboard<'a> {
@ -194,3 +214,17 @@ impl<'a> LibInputEventGesture<'a> {
unsafe { libinput_event_gesture_get_angle_delta(self.event) }
}
}
impl<'a> LibInputEventSwitch<'a> {
pub fn time_usec(&self) -> u64 {
unsafe { libinput_event_switch_get_time_usec(self.event) }
}
pub fn switch(&self) -> Switch {
unsafe { Switch(libinput_event_switch_get_switch(self.event)) }
}
pub fn switch_state(&self) -> SwitchState {
unsafe { SwitchState(libinput_event_switch_get_switch_state(self.event)) }
}
}

11
src/libinput/sys.rs
View file

@ -16,6 +16,8 @@ pub struct libinput_event_keyboard(u8);
pub struct libinput_event_pointer(u8);
#[repr(transparent)]
pub struct libinput_event_gesture(u8);
#[repr(transparent)]
pub struct libinput_event_switch(u8);
#[link(name = "input")]
extern "C" {
@ -155,6 +157,15 @@ extern "C" {
pub fn libinput_event_gesture_get_dy_unaccelerated(event: *mut libinput_event_gesture) -> f64;
pub fn libinput_event_gesture_get_scale(event: *mut libinput_event_gesture) -> f64;
pub fn libinput_event_gesture_get_angle_delta(event: *mut libinput_event_gesture) -> f64;
pub fn libinput_event_get_switch_event(
event: *mut libinput_event,
) -> *mut libinput_event_switch;
pub fn libinput_event_switch_get_switch(event: *mut libinput_event_switch) -> libinput_switch;
pub fn libinput_event_switch_get_switch_state(
event: *mut libinput_event_switch,
) -> libinput_switch_state;
pub fn libinput_event_switch_get_time_usec(event: *mut libinput_event_switch) -> u64;
}
#[repr(C)]