Miroirs/smithay
1
0
Fork 0
mirror of https://github.com/Smithay/smithay.git synced 2024-09-28 03:21:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #722 from chrisduerr/seat_cushion

Browse source 
Fix new seat module ergonomics
This commit is contained in:
Victoria Brekenfeld 2022-08-30 12:55:34 +02:00 committed by GitHub
commit 79c096cfcf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
anvil/src/input_handler.rs
View file

@ -95,13 +95,15 @@ impl<Backend> AnvilState<Backend> {
&& (data.layer == WlrLayer::Top || data.layer == WlrLayer::Overlay)
{
keyboard.set_focus(self, Some(layer.wl_surface().clone()), serial);
keyboard.input::<(), _>(self, keycode, state, serial, time, |_, _| FilterResult::Forward);
keyboard.input::<(), _>(self, keycode, state, serial, time, |_, _, _| {
FilterResult::Forward
});
return KeyAction::None;
}
}
let action = keyboard
.input(self, keycode, state, serial, time, |modifiers, handle| {
.input(self, keycode, state, serial, time, |_, modifiers, handle| {
let keysym = handle.modified_sym();
debug!(log, "keysym";

2
examples/minimal.rs
View file

@ -160,7 +160,7 @@ pub fn run_winit() -> Result<(), Box<dyn std::error::Error>> {
event.state(),
0.into(),
0,
|_, _| {
|_, _, _| {
//
FilterResult::Forward
},

2
examples/seat.rs
View file

@ -57,7 +57,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
smithay::backend::input::KeyState::Pressed,
0.into(),
0,
|_, _| {
|_, _, _| {
if false {
FilterResult::Intercept(0)
} else {

2
smallvil/src/input.rs
View file

@ -26,7 +26,7 @@ impl Smallvil {
event.state(),
serial,
time,
|_, _| FilterResult::Forward,
|_, _, _| FilterResult::Forward,
);
}
InputEvent::PointerMotion { .. } => {}

4
src/input/keyboard/mod.rs
View file

@ -455,7 +455,7 @@ impl<D: SeatHandler + 'static> KeyboardHandle<D> {
filter: F,
) -> Option<T>
where
F: FnOnce(&ModifiersState, KeysymHandle<'_>) -> FilterResult<T>,
F: FnOnce(&mut D, &ModifiersState, KeysymHandle<'_>) -> FilterResult<T>,
{
trace!(self.arc.logger, "Handling keystroke"; "keycode" => keycode, "state" => format_args!("{:?}", state));
let mut guard = self.arc.internal.lock().unwrap();
@ -472,7 +472,7 @@ impl<D: SeatHandler + 'static> KeyboardHandle<D> {
"mods_state" => format_args!("{:?}", guard.mods_state), "sym" => xkb::keysym_get_name(key_handle.modified_sym())
);
if let FilterResult::Intercept(val) = filter(&guard.mods_state, key_handle) {
if let FilterResult::Intercept(val) = filter(data, &guard.mods_state, key_handle) {
// the filter returned false, we do not forward to client
trace!(self.arc.logger, "Input was intercepted by filter");
return Some(val);

10
src/input/mod.rs
View file

@ -99,14 +99,13 @@
use std::sync::{Arc, Mutex};
use self::keyboard::{Error as KeyboardError, KeyboardHandle, KeyboardTarget};
use self::pointer::{CursorImageStatus, PointerHandle, PointerTarget};
use crate::utils::user_data::UserDataMap;
pub mod keyboard;
pub mod pointer;
use self::keyboard::{Error as KeyboardError, KeyboardHandle, KeyboardTarget};
use self::pointer::{CursorImageStatus, PointerHandle, PointerTarget};
/// Handler trait for Seats
pub trait SeatHandler: Sized {
/// Type used to represent the target currently holding the keyboard focus
@ -118,9 +117,10 @@ pub trait SeatHandler: Sized {
fn seat_state(&mut self) -> &mut SeatState<Self>;
/// Callback that will be notified whenever the focus of the seat changes.
fn focus_changed(&mut self, seat: &Seat<Self>, focused: Option<&Self::KeyboardFocus>);
fn focus_changed(&mut self, _seat: &Seat<Self>, _focused: Option<&Self::KeyboardFocus>) {}
/// Callback that will be notified whenever a client requests to set a custom cursor image.
fn cursor_image(&mut self, seat: &Seat<Self>, image: CursorImageStatus);
fn cursor_image(&mut self, _seat: &Seat<Self>, _image: CursorImageStatus) {}
}
/// Delegate type for all [Seat] globals.
///