TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

device: support digitizers via Win32 raw input API

Browse Source
This commit is contained in:
rdb 2019-12-17 22:32:06 +01:00
parent c3052f3ae0
commit b67c7dd84f
5 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/device/inputDevice.cxx
View File

@ -578,6 +578,9 @@ format_device_class(DeviceClass dc) {
case InputDevice::DeviceClass::spatial_mouse: case InputDevice::DeviceClass::spatial_mouse:
return "spatial_mouse"; return "spatial_mouse";
case InputDevice::DeviceClass::digitizer:
return "digitizer";
} }
return "**invalid**"; return "**invalid**";
} }
@ -644,6 +647,9 @@ format_axis(Axis axis) {
case InputDevice::Axis::brake: case InputDevice::Axis::brake:
return "brake"; return "brake";
case InputDevice::Axis::pressure:
return "pressure";
} }
return "**invalid**"; return "**invalid**";
} }

6
panda/src/device/inputDevice.h
View File

@ -80,6 +80,9 @@ PUBLISHED:
// 3D mouse, such as produced by 3Dconnexion. // 3D mouse, such as produced by 3Dconnexion.
spatial_mouse, spatial_mouse,
// A graphics tablet with stylus/pen.
digitizer,
}; };
enum class Feature { enum class Feature {
@ -128,6 +131,9 @@ PUBLISHED:
wheel, wheel,
accelerator, accelerator,
brake, brake,
// Pen pressure
pressure,
}; };
enum State { enum State {

1
panda/src/device/phidsdi.h
View File

@ -28,6 +28,7 @@ typedef USHORT USAGE, *PUSAGE;
#define HID_USAGE_PAGE_KEYBOARD ((USAGE) 0x07) #define HID_USAGE_PAGE_KEYBOARD ((USAGE) 0x07)
#define HID_USAGE_PAGE_LED ((USAGE) 0x08) #define HID_USAGE_PAGE_LED ((USAGE) 0x08)
#define HID_USAGE_PAGE_BUTTON ((USAGE) 0x09) #define HID_USAGE_PAGE_BUTTON ((USAGE) 0x09)
#define HID_USAGE_PAGE_DIGITIZER ((USAGE) 0x0d)
#define HID_USAGE_GENERIC_POINTER ((USAGE) 0x01) #define HID_USAGE_GENERIC_POINTER ((USAGE) 0x01)
#define HID_USAGE_GENERIC_MOUSE ((USAGE) 0x02) #define HID_USAGE_GENERIC_MOUSE ((USAGE) 0x02)

9
panda/src/device/winInputDeviceManager.cxx
View File

@ -14,6 +14,7 @@
#include "winInputDeviceManager.h" #include "winInputDeviceManager.h"
#include "winRawInputDevice.h" #include "winRawInputDevice.h"
#include "throw_event.h" #include "throw_event.h"
#include "phidsdi.h"
#if defined(_WIN32) && !defined(CPPPARSER) #if defined(_WIN32) && !defined(CPPPARSER)
@ -385,7 +386,7 @@ setup_message_loop() {
} }
// Now listen for raw input devices using the created message loop. // Now listen for raw input devices using the created message loop.
RAWINPUTDEVICE rid[3]; RAWINPUTDEVICE rid[4];
rid[0].usUsagePage = 1; rid[0].usUsagePage = 1;
rid[0].usUsage = 4; // Joysticks rid[0].usUsage = 4; // Joysticks
rid[0].dwFlags = RIDEV_DEVNOTIFY | RIDEV_INPUTSINK; rid[0].dwFlags = RIDEV_DEVNOTIFY | RIDEV_INPUTSINK;
@ -398,7 +399,11 @@ setup_message_loop() {
rid[2].usUsage = 8; // Multi-axis controllers (including 3D mice) rid[2].usUsage = 8; // Multi-axis controllers (including 3D mice)
rid[2].dwFlags = RIDEV_DEVNOTIFY | RIDEV_INPUTSINK; rid[2].dwFlags = RIDEV_DEVNOTIFY | RIDEV_INPUTSINK;
rid[2].hwndTarget = _message_hwnd; rid[2].hwndTarget = _message_hwnd;
if (!RegisterRawInputDevices(rid, 3, sizeof(RAWINPUTDEVICE))) { rid[3].usUsagePage = HID_USAGE_PAGE_DIGITIZER;
rid[3].usUsage = 1; // Digitizers
rid[3].dwFlags = RIDEV_DEVNOTIFY | RIDEV_INPUTSINK;
rid[3].hwndTarget = _message_hwnd;
if (!RegisterRawInputDevices(rid, 4, sizeof(RAWINPUTDEVICE))) {
device_cat.warning() device_cat.warning()
<< "Failed to register raw input devices.\n"; << "Failed to register raw input devices.\n";
} }

13
panda/src/device/winRawInputDevice.cxx
View File

@ -199,6 +199,11 @@ on_arrival(HANDLE handle, const RID_DEVICE_INFO &info, std::string name) {
info.hid.usUsage == HID_USAGE_GENERIC_KEYBOARD) { info.hid.usUsage == HID_USAGE_GENERIC_KEYBOARD) {
_device_class = DeviceClass::keyboard; _device_class = DeviceClass::keyboard;
// Digitizers
} else if (info.hid.usUsagePage == HID_USAGE_PAGE_DIGITIZER &&
info.hid.usUsage == 1) {
_device_class = DeviceClass::digitizer;
// 3Dconnexion SpaceNavigator and friends. // 3Dconnexion SpaceNavigator and friends.
} else if (_vendor_id == 0x046d && } else if (_vendor_id == 0x046d &&
(_product_id == 0xc623 || (_product_id == 0xc623 ||
@ -504,6 +509,14 @@ on_arrival(HANDLE handle, const RID_DEVICE_INFO &info, std::string name) {
continue; continue;
} }
break; break;
case HID_USAGE_PAGE_DIGITIZER:
switch (usage) {
case 0x30:
axis = Axis::pressure;
break;
}
break;
} }
// If this axis already exists, don't double-map it, but take the first // If this axis already exists, don't double-map it, but take the first