alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2025-01-10 21:21:29 +11:00
Code Issues Packages Projects Releases Wiki Activity

Better events handling for win32

Browse source
This commit is contained in:
Tomaka17 2014-07-27 19:58:27 +02:00
parent 7a8e7a7922
commit 1e615b59a6
2 changed files with 11 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/win32/ffi.rs
View file

@ -564,6 +564,9 @@ extern "system" {
// http://msdn.microsoft.com/en-us/library/dd145167(v=vs.85).aspx
pub fn UpdateWindow(hWnd: HWND) -> BOOL;
// http://msdn.microsoft.com/en-us/library/windows/desktop/ms644956(v=vs.85).aspx
pub fn WaitMessage() -> BOOL;
// http://msdn.microsoft.com/en-us/library/windows/desktop/dd374379(v=vs.85).aspx
pub fn wglCreateContext(hdc: HDC) -> HGLRC;

39
src/win32/mod.rs
View file

@ -204,7 +204,7 @@ impl Window {
loop {
let mut msg = unsafe { mem::uninitialized() };
if unsafe { ffi::PeekMessageW(&mut msg, ptr::mut_null(), 0, 0, 1) } == 0 {
if unsafe { ffi::PeekMessageW(&mut msg, ptr::mut_null(), 0, 0, 0x1) } == 0 {
break
}
@ -219,38 +219,21 @@ impl Window {
Err(_) => break
}
}
if events.iter().find(|e| match e { &&::Closed => true, _ => false }).is_some() {
use std::sync::atomics::Relaxed;
self.should_close.store(true, Relaxed);
}
events
}
// TODO: return iterator
pub fn wait_events(&self) -> Vec<Event> {
use std::mem;
loop {
{
let mut msg = unsafe { mem::uninitialized() };
unsafe { ffi::WaitMessage() };
if unsafe { ffi::GetMessageW(&mut msg, ptr::mut_null(), 0, 0) } == 0 {
use std::sync::atomics::Relaxed;
use Closed;
self.should_close.store(true, Relaxed);
return vec![Closed]
}
unsafe { ffi::TranslateMessage(&msg) };
unsafe { ffi::DispatchMessageW(&msg) };
}
let mut events = Vec::new();
loop {
match self.events_receiver.try_recv() {
Ok(ev) => events.push(ev),
Err(_) => break
}
}
let events = self.poll_events();
if events.len() >= 1 {
return events
}
@ -316,12 +299,6 @@ extern "stdcall" fn callback(window: ffi::HWND, msg: ffi::UINT,
0
},
ffi::WM_PAINT => {
/*use NeedRefresh;
send_event(window, NeedRefresh);*/
0
},
ffi::WM_CHAR => {
use std::mem;
use events::ReceivedCharacter;