fix(detect): fix warnings on Wayland
This commit is contained in:
parent
cb372f9b9d
commit
bab9c1dc92
|
@ -140,7 +140,7 @@ impl Device {
|
|||
let is_down = value == KEY_STATE_PRESS;
|
||||
|
||||
// Check if the current event originated from a mouse
|
||||
if code >= 0x110 && code <= 0x117 {
|
||||
if (0x110..=0x117).contains(&code) {
|
||||
// Mouse event
|
||||
return Some(RawInputEvent::Mouse(RawMouseEvent { code, is_down }));
|
||||
}
|
||||
|
|
|
@ -108,6 +108,7 @@ impl HotKeyFilter {
|
|||
|
||||
// Remove duplicates and revert
|
||||
if !to_be_removed.is_empty() {
|
||||
#[allow(clippy::stable_sort_primitive)]
|
||||
to_be_removed.sort();
|
||||
to_be_removed.dedup();
|
||||
to_be_removed.reverse();
|
||||
|
|
|
@ -44,13 +44,13 @@ pub fn get_modifiers_state() -> Result<Option<super::ModifiersState>> {
|
|||
.create_window::<FallbackFrame, _>(surface, None, dimensions, move |evt, mut dispatch_data| {
|
||||
let next_action = dispatch_data.get::<Option<WEvent>>().unwrap();
|
||||
// Keep last event in priority order : Close > Configure > Refresh
|
||||
let replace = match (&evt, &*next_action) {
|
||||
let replace = matches!(
|
||||
(&evt, &*next_action),
|
||||
(_, &None)
|
||||
| (_, &Some(WEvent::Refresh))
|
||||
| (&WEvent::Configure { .. }, &Some(WEvent::Configure { .. }))
|
||||
| (&WEvent::Close, _) => true,
|
||||
_ => false,
|
||||
};
|
||||
| (_, &Some(WEvent::Refresh))
|
||||
| (&WEvent::Configure { .. }, &Some(WEvent::Configure { .. }))
|
||||
| (&WEvent::Close, _)
|
||||
);
|
||||
if replace {
|
||||
*next_action = Some(evt);
|
||||
}
|
||||
|
@ -138,12 +138,10 @@ pub fn get_modifiers_state() -> Result<Option<super::ModifiersState>> {
|
|||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if let Some((kbd, source)) = opt_kbd.take() {
|
||||
// the keyboard has been removed, cleanup
|
||||
kbd.release();
|
||||
loop_handle.remove(source);
|
||||
}
|
||||
} else if let Some((kbd, source)) = opt_kbd.take() {
|
||||
// the keyboard has been removed, cleanup
|
||||
kbd.release();
|
||||
loop_handle.remove(source);
|
||||
}
|
||||
});
|
||||
|
||||
|
@ -182,7 +180,7 @@ pub fn get_modifiers_state() -> Result<Option<super::ModifiersState>> {
|
|||
let result_ref = result_clone.borrow();
|
||||
|
||||
if let Some(result) = &*result_ref {
|
||||
return Ok(Some(result.clone()));
|
||||
return Ok(Some(*result));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -215,6 +213,7 @@ fn keyboard_event_handler(
|
|||
}
|
||||
}
|
||||
|
||||
#[allow(clippy::many_single_char_names)]
|
||||
fn redraw(
|
||||
pool: &mut AutoMemPool,
|
||||
surface: &wl_surface::WlSurface,
|
||||
|
|
Loading…
Reference in New Issue
Block a user