alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-24 22:31:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings on Linux (#1004)

Browse source
This commit is contained in:
Murarth 2019-07-03 11:18:42 -07:00 committed by Osspial
parent 5bf303fd26
commit 2af753f307
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/platform_impl/linux/wayland/keyboard.rs
View file

@ -127,11 +127,12 @@ pub fn init_keyboard(
// In this case, we don't have the keymap information (it is // In this case, we don't have the keymap information (it is
// supposed to be serialized by the compositor using libxkbcommon) // supposed to be serialized by the compositor using libxkbcommon)
seat.get_keyboard(|keyboard| {
// { variables to be captured by the closure // { variables to be captured by the closure
let mut target = None; let mut target = None;
let my_sink = sink; let my_sink = sink;
// } // }
seat.get_keyboard(|keyboard| {
keyboard.implement_closure( keyboard.implement_closure(
move |evt, _| match evt { move |evt, _| match evt {
wl_keyboard::Event::Enter { surface, .. } => { wl_keyboard::Event::Enter { surface, .. } => {

2
src/platform_impl/linux/wayland/pointer.rs
View file

@ -23,12 +23,12 @@ pub fn implement_pointer<T: 'static>(
store: Arc<Mutex<WindowStore>>, store: Arc<Mutex<WindowStore>>,
modifiers_tracker: Arc<Mutex<ModifiersState>>, modifiers_tracker: Arc<Mutex<ModifiersState>>,
) -> WlPointer { ) -> WlPointer {
seat.get_pointer(|pointer| {
let mut mouse_focus = None; let mut mouse_focus = None;
let mut axis_buffer = None; let mut axis_buffer = None;
let mut axis_discrete_buffer = None; let mut axis_discrete_buffer = None;
let mut axis_state = TouchPhase::Ended; let mut axis_state = TouchPhase::Ended;
seat.get_pointer(|pointer| {
pointer.implement_closure( pointer.implement_closure(
move |evt, pointer| { move |evt, pointer| {
let mut sink = sink.lock().unwrap(); let mut sink = sink.lock().unwrap();

5
src/platform_impl/linux/wayland/window.rs
View file

@ -1,6 +1,5 @@
use std::{ use std::{
collections::VecDeque, collections::VecDeque,
io::{Seek, SeekFrom, Write},
sync::{Arc, Mutex, Weak}, sync::{Arc, Mutex, Weak},
}; };
@ -18,8 +17,8 @@ use crate::{
use smithay_client_toolkit::{ use smithay_client_toolkit::{
output::OutputMgr, output::OutputMgr,
reexports::client::{ reexports::client::{
protocol::{wl_seat, wl_shm, wl_subsurface, wl_surface}, protocol::{wl_seat, wl_surface},
Display, NewProxy, Display,
}, },
surface::{get_dpi_factor, get_outputs}, surface::{get_dpi_factor, get_outputs},
window::{ConceptFrame, Event as WEvent, State as WState, Theme, Window as SWindow}, window::{ConceptFrame, Event as WEvent, State as WState, Theme, Window as SWindow},