blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 778 Projects 19 Wiki Activity

Fix T82445: Wintab packets being discarded. 

Switched timer to use GetTickCount instead of QueryPerformanceCounter
as Wintab's pkTime seems to (but is not guaranteed to) use the former.
This commit is contained in:
Nicholas Rishel 2020-11-18 13:34:15 -08:00
parent e9ddb21df3
commit 9d6d5b9beb
Notes: blender-bot 2023-02-14 00:44:02 +01:00 
Referenced by issue #82857, Crash on GP toggle select mode
Referenced by issue #82445, Wacom tablet revert to not working even after tablet driver update.
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
intern/ghost/intern/GHOST_WindowWin32.cpp
View File

@ -1401,16 +1401,16 @@ void GHOST_WindowWin32::updatePendingWintabEvents()
if (!(m_wintab.packetsGet && m_wintab.context)) {
return;
}
GHOST_SystemWin32 *system = (GHOST_SystemWin32 *)GHOST_System::getSystem();
auto &pendingEvents = m_wintab.pendingEvents;
/* Clear outdated events from queue. */
GHOST_TUns64 currTime = system->getMilliSeconds();
GHOST_TUns64 timeout = 300;
DWORD currTime = ::GetTickCount();
DWORD millisTimeout = 500;
while (!pendingEvents.empty()) {
GHOST_TUns64 pktTime = system->millisSinceStart(pendingEvents.front().pkTime);
if (currTime - pktTime > timeout) {
DWORD pkTime = pendingEvents.front().pkTime;
if (currTime > pkTime + millisTimeout) {
pendingEvents.pop();
}
else {
@ -1426,8 +1426,9 @@ void GHOST_WindowWin32::updatePendingWintabEvents()
/* Don't queue outdated packets, such events can include packets that occurred before the current
* window lost and regained focus. */
for (; i < numPackets; i++) {
GHOST_TUns64 pktTime = system->millisSinceStart(m_wintab.pkts[i].pkTime);
if (currTime - pktTime < timeout) {
DWORD pkTime = m_wintab.pkts[i].pkTime;
if (currTime < pkTime + millisTimeout) {
break;
}
}