blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Revert "Mask all button down/up and switch back to using relative button input." 

This reverts commit 045aaf6f78f1fbb6e2bbefd234b7bae04844d42b.
This commit is contained in:
Nicholas Rishel 2020-05-23 16:48:18 -07:00
parent c4821079b7
commit b98ea1b268
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1016,6 +1016,7 @@ void GHOST_WindowWin32::updateWintab(bool active)
// window is active.
m_tabletInRange = false;
m_wintab.numSysButtons = 0;
m_wintab.sysButtonsPressed = 0;
}
}
}
@ -1042,9 +1043,6 @@ void GHOST_WindowWin32::initializeWintab()
lc.lcPktData = PACKETDATA;
lc.lcPktMode = PACKETMODE;
lc.lcMoveMask = PACKETDATA;
// Mask all buttons, or button events won't occur for Wintab libaries that don't mask the
// system context buttons by default
lc.lcBtnUpMask = lc.lcBtnDnMask = ~0;
// Wacom maps y origin to the tablet's bottom
// Invert to match Windows y origin mapping to the screen top
lc.lcOutExtY = -lc.lcOutExtY;
@ -1356,25 +1354,31 @@ GHOST_TSuccess GHOST_WindowWin32::getWintabInfo(std::vector<GHOST_WintabInfoWin3
outWintabInfo[i].x = pkt.pkX;
outWintabInfo[i].y = pkt.pkY;
if (pkt.pkButtons &&
wintabMouseToGhost(pkt.pkCursor, LOWORD(pkt.pkButtons), outWintabInfo[i].button)) {
switch (HIWORD(pkt.pkButtons)) {
case TBN_DOWN:
outWintabInfo[i].type = GHOST_kEventButtonDown;
break;
case TBN_UP:
outWintabInfo[i].type = GHOST_kEventButtonUp;
break;
default:
printf("%x TBN_NONE, but why?", m_hWnd);
outWintabInfo[i].type = GHOST_kEventCursorMove;
break;
// Some Wintab libraries don't handle relative button input correctly, so we track button
// presses manually.
DWORD buttonsChanged = m_wintab.sysButtonsPressed ^ pkt.pkButtons;
// Find the index for the changed button from the button map.
DWORD physicalButton = 0;
for (DWORD diff = (unsigned)buttonsChanged >> 1; diff > 0; diff = (unsigned)diff >> 1) {
physicalButton++;
}
if (buttonsChanged &&
wintabMouseToGhost(pkt.pkCursor, physicalButton, outWintabInfo[i].button)) {
if (buttonsChanged & pkt.pkButtons) {
outWintabInfo[i].type = GHOST_kEventButtonDown;
}
else {
outWintabInfo[i].type = GHOST_kEventButtonUp;
}
}
else {
outWintabInfo[i].type = GHOST_kEventCursorMove;
}
m_wintab.sysButtonsPressed = pkt.pkButtons;
// Wintab does not support performance counters, so use low frequency counter instead
outWintabInfo[i].time = system->tickCountToMillis(pkt.pkTime);
outWintabInfo[i].tabletData = tabletData;

4
intern/ghost/intern/GHOST_WindowWin32.h
View File

@ -40,7 +40,7 @@
// PACKETDATA and PACKETMODE modify structs in pktdef.h, so make sure they come first
#define PACKETDATA \
(PK_BUTTONS | PK_NORMAL_PRESSURE | PK_ORIENTATION | PK_CURSOR | PK_X | PK_Y | PK_TIME)
#define PACKETMODE PK_BUTTONS
#define PACKETMODE 0
#include <pktdef.h>
class GHOST_SystemWin32;
@ -618,6 +618,8 @@ class GHOST_WindowWin32 : public GHOST_Window {
UINT numDevices = 0;
/** Number of cursors currently in contact mapped to system buttons */
GHOST_TUns8 numSysButtons = 0;
/** Cursors currently in contact mapped to system buttons */
DWORD sysButtonsPressed = 0;
LONG maxPressure = 0;
LONG maxAzimuth = 0, maxAltitude = 0;
/* Queue size doesn't change once set, so reuse the same buffer */