livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #82 from DaxDupont/hid-fix 

[FIRE-10419 & FIRE-32546] Selectively process devices based on CLSID to prevent stuttering
master
Beq Janus 2025-03-03 15:50:31 +00:00 committed by GitHub
parent bd010d1a87 4aff595bdf
commit 45cf0c3ce8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 76 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llwindow/llwindowcallbacks.cpp
View File

@ -184,7 +184,7 @@ bool LLWindowCallbacks::handleTimerEvent(LLWindow *window)
return false;
}
bool LLWindowCallbacks::handleDeviceChange(LLWindow *window)
bool LLWindowCallbacks::handleDeviceChange(LLWindow *window, bool deviceRemoved) // <FS:Dax/> [FIRE-10419] Added deviceRemoved bool to prevent reinitialize on disconnect.
{
return false;
}

2
indra/llwindow/llwindowcallbacks.h
View File

@ -67,7 +67,7 @@ public:
virtual void handleWindowUnblock(LLWindow *window); // window coming back after taking over CPU for a while
virtual void handleDataCopy(LLWindow *window, S32 data_type, void *data);
virtual bool handleTimerEvent(LLWindow *window);
virtual bool handleDeviceChange(LLWindow *window);
virtual bool handleDeviceChange(LLWindow *window, bool deviceRemoved); // <FS:Dax/> [FIRE-10419] Added deviceRemoved bool to prevent reinitialize on disconnect.
virtual bool handleDPIChanged(LLWindow *window, F32 ui_scale_factor, S32 window_width, S32 window_height);
virtual bool handleWindowDidChangeScreen(LLWindow *window);

63
indra/llwindow/llwindowwin32.cpp
View File

@ -579,7 +579,15 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
// Make an instance of our window then define the window class
mhInstance = GetModuleHandle(NULL);
// <FS:Dax> [FIRE-10419] Add notification filters for device notifcations for HID device handling
DEV_BROADCAST_DEVICEINTERFACE notificationFilter;
ZeroMemory(&notificationFilter, sizeof(notificationFilter));
notificationFilter.dbcc_size = sizeof(DEV_BROADCAST_DEVICEINTERFACE);
notificationFilter.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE;
HDEVNOTIFY deviceNotification = RegisterDeviceNotification(mWindowHandle, &notificationFilter, DEVICE_NOTIFY_WINDOW_HANDLE | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES);
// </FS>
// Init Direct Input - needed for joystick / Spacemouse
LPDIRECTINPUT8 di8_interface;
@ -2291,6 +2299,24 @@ void LLWindowWin32::gatherInput()
updateCursor();
}
// Define device classID for filtering
constexpr std::array<const wchar_t*, 3> classIDStrings = {
L"{745a17a0-74d3-11d0-b6fe-00a0c90f57da}", // Modern HID
L"{4d36e96c-e325-11ce-bfc1-08002be10318}", // Legacy/Serial
L"{a5dcbf10-6530-11d2-901f-00c04fb951ed}" // SpaceNavigator/Xbox
};
std::array<GUID, classIDStrings.size()> deviceCLSIDWhitelist;
// Convert to CLSID to make it easier
void initializeDeviceCLSIDArray()
{
for (size_t i = 0; i < classIDStrings.size(); ++i)
{
CLSIDFromString(classIDStrings[i], &deviceCLSIDWhitelist[i]);
}
}
static LLTrace::BlockTimerStatHandle FTM_KEYHANDLER("Handle Keyboard");
static LLTrace::BlockTimerStatHandle FTM_MOUSEHANDLER("Handle Mouse");
@ -2349,13 +2375,42 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
case WM_DEVICECHANGE:
{
LL_PROFILE_ZONE_NAMED_CATEGORY_WIN32("mwp - WM_DEVICECHANGE");
if (w_param == DBT_DEVNODES_CHANGED || w_param == DBT_DEVICEARRIVAL)
{
WINDOW_IMP_POST(window_imp->mCallbacks->handleDeviceChange(window_imp));
return 1;
// <FS> [FIRE-10419] Prevent all devices from being scanned on each change
// if (w_param == DBT_DEVNODES_CHANGED || w_param == DBT_DEVICEARRIVAL)
// {
// WINDOW_IMP_POST(window_imp->mCallbacks->handleDeviceChange(window_imp));
// return 1;
// }
// Only bother initalizing when needed.
if (deviceCLSIDWhitelist.empty())
{
initializeDeviceCLSIDArray();
}
if (w_param == DBT_DEVICEARRIVAL || w_param == DBT_DEVICEREMOVECOMPLETE)
{
DEV_BROADCAST_HDR* dtype = (DEV_BROADCAST_HDR*)l_param;
if (dtype->dbch_devicetype == DBT_DEVTYP_DEVICEINTERFACE)
{
DEV_BROADCAST_DEVICEINTERFACE* iface = (DEV_BROADCAST_DEVICEINTERFACE*)l_param;
// Iterate through the CLSID whitelist for comparison and only fire if it's a useful device
for (const auto& guid : deviceCLSIDWhitelist)
{
if (memcmp(&iface->dbcc_classguid, &guid, sizeof(GUID)) == 0)
{
bool deviceRemoved = (w_param == DBT_DEVICEREMOVECOMPLETE);
WINDOW_IMP_POST(window_imp->mCallbacks->handleDeviceChange(window_imp, deviceRemoved));
break;
}
}
}
}
break;
// </FS>
}
case WM_PAINT:

16
indra/newview/llviewerwindow.cpp
View File

@ -1839,10 +1839,22 @@ bool LLViewerWindow::handleTimerEvent(LLWindow *window)
return false;
}
bool LLViewerWindow::handleDeviceChange(LLWindow *window)
// <FS:Dax> [FIRE-10419] Added deviceRemoved bool to prevent reinitialize on disconnect.
// bool LLViewerWindow::handleDeviceChange(LLWindow* window)
// {
// if (!LLViewerJoystick::getInstance()->isJoystickInitialized())
// {
// LLViewerJoystick::getInstance()->init(true);
// return true;
// }
// return false;
// }
// </FS>
bool LLViewerWindow::handleDeviceChange(LLWindow *window, bool deviceRemoved)
{
// give a chance to use a joystick after startup (hot-plugging)
if (!LLViewerJoystick::getInstance()->isJoystickInitialized() )
if (!deviceRemoved && !LLViewerJoystick::getInstance()->isJoystickInitialized())
{
LLViewerJoystick::getInstance()->init(true);
return true;

2
indra/newview/llviewerwindow.h
View File

@ -225,7 +225,7 @@ public:
/*virtual*/ void handleWindowUnblock(LLWindow *window);
/*virtual*/ void handleDataCopy(LLWindow *window, S32 data_type, void *data);
/*virtual*/ bool handleTimerEvent(LLWindow *window);
/*virtual*/ bool handleDeviceChange(LLWindow *window);
/*virtual*/ bool handleDeviceChange(LLWindow *window, bool deviceRemoved); // <FS:Dax/> [FIRE-10419] Added deviceRemoved bool to prevent reinitialize on disconnect.
/*virtual*/ bool handleDPIChanged(LLWindow *window, F32 ui_scale_factor, S32 window_width, S32 window_height);
/*virtual*/ bool handleWindowDidChangeScreen(LLWindow *window);