leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Corrections to sharing data

Browse source
This commit is contained in:
Aceeri 2015-11-09 02:49:50 -08:00
parent 78eb4a5990
commit d6a53cf5d3
3 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/api/win32/init.rs
View file

@ -5,7 +5,7 @@ use std::mem;
use std::thread;
use super::callback;
use super::callback::WindowState;
use super::WindowState;
use super::Window;
use super::MonitorId;
use super::WindowWrapper;
@ -215,8 +215,11 @@ unsafe fn init(title: Vec<u16>, window: &WindowAttributes, pf_reqs: &PixelFormat
user32::SetForegroundWindow(real_window.0);
}
// Creating a mutex to track the current cursor state
let cursor_state = CursorState::Normal;
// Creating a mutex to track the current window state
let window_state = Arc::new(Mutex::new(WindowState {
cursor_state: CursorState::Normal,
attributes: window.clone()
}));
// filling the CONTEXT_STASH task-local storage so that we can start receiving events
let events_receiver = {
@ -226,10 +229,7 @@ unsafe fn init(title: Vec<u16>, window: &WindowAttributes, pf_reqs: &PixelFormat
let data = callback::ThreadLocalData {
win: real_window.0,
sender: tx.take().unwrap(),
window_state: Arc::new(Mutex::new(WindowState {
cursor_state: cursor_state.clone(),
attributes: window.clone()
}))
window_state: window_state.clone()
};
(*context_stash.borrow_mut()) = Some(data);
});
@ -241,7 +241,7 @@ unsafe fn init(title: Vec<u16>, window: &WindowAttributes, pf_reqs: &PixelFormat
window: real_window,
context: context,
events_receiver: events_receiver,
cursor_state: cursor_state,
window_state: window_state,
})
}