From df986a402a2706fe12a7dae0caec181da8c0e5f0 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 7 Jul 2020 19:45:06 +0300 Subject: SL-5894 Changed joystick init to select device with apropriate manufacturer and type --- indra/newview/llviewerjoystick.cpp | 251 ++++++++++++++++++++++++++++++++----- 1 file changed, 221 insertions(+), 30 deletions(-) (limited to 'indra/newview/llviewerjoystick.cpp') diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp index e44d80b7ce..9775bf646a 100644 --- a/indra/newview/llviewerjoystick.cpp +++ b/indra/newview/llviewerjoystick.cpp @@ -36,10 +36,22 @@ #include "lltoolmgr.h" #include "llselectmgr.h" #include "llviewermenu.h" +#include "llviewerwindow.h" +#include "llwindow.h" #include "llagent.h" #include "llagentcamera.h" #include "llfocusmgr.h" +#if LL_WINDOWS && !LL_MESA_HEADLESS +// Require DirectInput version 8 +#define DIRECTINPUT_VERSION 0x0800 + +//#include +//#pragma comment(lib, "dinput8") +//#pragma comment(lib, "dxguid.lib") +#include +#endif + // ---------------------------------------------------------------------------- // Constants @@ -62,6 +74,152 @@ F32 LLViewerJoystick::sDelta[] = {0,0,0,0,0,0,0}; #define MAX_SPACENAVIGATOR_INPUT 3000.0f #define MAX_JOYSTICK_INPUT_VALUE MAX_SPACENAVIGATOR_INPUT +#if LL_WINDOWS && !LL_MESA_HEADLESS + +// took this from ndofdev_win.cpp +BOOL CALLBACK EnumNDOFObjectsCallback(const DIDEVICEOBJECTINSTANCE* inst, + VOID* user_data) +{ + if (inst->dwType & DIDFT_AXIS) + { + HRESULT hr = DI_OK; + LPDIRECTINPUTDEVICE8 device = *((LPDIRECTINPUTDEVICE8 *)user_data); + DIPROPRANGE diprg; + diprg.diph.dwSize = sizeof(DIPROPRANGE); + diprg.diph.dwHeaderSize = sizeof(DIPROPHEADER); + diprg.diph.dwHow = DIPH_BYID; + diprg.diph.dwObj = inst->dwType; // specify the enumerated axis + + // Set the range for the axis + diprg.lMin = (long)-MAX_JOYSTICK_INPUT_VALUE; + diprg.lMax = (long)+MAX_JOYSTICK_INPUT_VALUE; + hr = device->SetProperty(DIPROP_RANGE, &diprg.diph); + assert(hr == DI_OK); + + + if (FAILED(hr)) + return DIENUM_STOP; + } + + return DIENUM_CONTINUE; +} + +// vvvv Product ID +// 0xC62B046D +// ^^^^ Vendor ID +// 0x046D Logitech's Vendor ID +// 0x256F 3Dconnexion's Vendor ID +// +// See: +// https://github.com/janoc/libndofdev/blob/master/ndofdev.c +// http://spacemice.org/index.php?title=Dev +// https://www.3dconnexion.com/nc/service/faq/faq/how-can-i-check-if-my-usb-3d-mouse-is-recognized-by-windows.html +bool is_space_mouse(const U16 product_id, const U16 vendor_id) +{ + if (vendor_id == 0x046d) // Logitech's Vendor ID + { + if (false + || (product_id == 0xc603) // SpaceMouse Plus USB, SpaceMouse Plus XT USB + || (product_id == 0xc605) // CadMan: USB + || (product_id == 0xc606) // SpaceMouse Classic USB + || (product_id == 0xc621) // SpaceBall 5000 USB + || (product_id == 0xc623) // SpaceTraveler: USB + || (product_id == 0xc625) // SpacePilot: USB + || (product_id == 0xc626) // SpaceNavigator: USB + || (product_id == 0xc627) // SpaceExplorer: USB + || (product_id == 0xc628) // SpaceNavigator for Notebooks: USB + || (product_id == 0xc629) // SpacePilot Pro: USB + || (product_id == 0xc62b) // SpaceMouse Pro: USB + ) + { + return true; + } + } + else + if (vendor_id == 0x256F) // 3Dconnexion's Vendor ID + { + if (false + || (product_id == 0xc62E) // SpaceMouse Wireless (cabled) + || (product_id == 0xc62F) // SpaceMouse Wireless Receiver + || (product_id == 0xc631) // Spacemouse Wireless (cabled) + || (product_id == 0xc632) // SpacemousePro Wireless Receiver + || (product_id == 0xc633) // SpaceMouse Enterprise + || (product_id == 0xc635) // Spacemouse Compact + || (product_id == 0xc650) // CadMouse + || (product_id == 0xc651) // CadMouse Wireless + || (product_id == 0xc652) // Universal Receiver + || (product_id == 0xc654) // CadMouse Pro Wireless + || (product_id == 0xc657) // CadMouse Pro Wireless Left + ) + { + return true; + } + } + + return false; +} + +BOOL CALLBACK di8_devices_callback(LPCDIDEVICEINSTANCE device_instance_ptr, LPVOID pvRef) +{ + // Note: If a single device can function as more than one DirectInput + // device type, it is enumerated as each device type that it supports. + // Capable of detecting devices like Oculus Rift + if (device_instance_ptr && pvRef) + { + std::string product_name = utf16str_to_utf8str(llutf16string(device_instance_ptr->tszProductName)); + + LL_DEBUGS("Joystick") << "DirectInput8 Devices: " << product_name << LL_ENDL; + + U16 product_id = (device_instance_ptr->guidProduct.Data1 >> 16) & 0xFFFF; + U16 vendor_id = (device_instance_ptr->guidProduct.Data1 >> 0) & 0xFFFF; + + if (!LLViewerJoystick::getInstance()->isJoystickInitialized()) + { + bool found_space_mouse = is_space_mouse(product_id, vendor_id); + + if (found_space_mouse) + { + LL_DEBUGS("Joystick") << "Found device that matches criteria: " << product_name << LL_ENDL; + LPDIRECTINPUT8 di8_interface = (LPDIRECTINPUT8)pvRef; + LPDIRECTINPUTDEVICE8 device = NULL; + + HRESULT status = di8_interface->CreateDevice( + device_instance_ptr->guidInstance, // REFGUID rguid, + &device, // LPDIRECTINPUTDEVICE * lplpDirectInputDevice, + NULL // LPUNKNOWN pUnkOuter + ); + + if (status == DI_OK) + { + // prerequisite for aquire() + LL_DEBUGS("Joystick") << "Device created" << LL_ENDL; + status = device->SetDataFormat(&c_dfDIJoystick); // c_dfDIJoystick2 + } + + if (status == DI_OK) + { + // set properties + LL_DEBUGS("Joystick") << "Format set" << LL_ENDL; + status = device->EnumObjects(EnumNDOFObjectsCallback, &device, DIDFT_ALL); + } + + // todo: record device name, ndof won't fill it from passed device + // strncpy(mNdofDev->product, inst->tszProductName, sizeof(mNdofDev->product)); + // strncpy(mNdofDev->product, product_name.c_str(), sizeof(mNdofDev->product)); + + if (status == DI_OK) + { + LL_DEBUGS("Joystick") << "Properties updated" << LL_ENDL; + LLViewerJoystick::getInstance()->initDevice(&device); + return DIENUM_STOP; + } + } + } + } + return DIENUM_CONTINUE; +} +#endif + // ----------------------------------------------------------------------------- void LLViewerJoystick::updateEnabled(bool autoenable) { @@ -175,7 +333,7 @@ void LLViewerJoystick::init(bool autoenable) // Note: The HotPlug callbacks are not actually getting called on Windows if (ndof_libinit(HotPlugAddCallback, HotPlugRemovalCallback, - NULL)) + gViewerWindow->getWindow()->getDirectInput8())) { mDriverState = JDS_UNINITIALIZED; } @@ -192,35 +350,34 @@ void LLViewerJoystick::init(bool autoenable) if (libinit) { if (mNdofDev) - { - // Different joysticks will return different ranges of raw values. - // Since we want to handle every device in the same uniform way, - // we initialize the mNdofDev struct and we set the range - // of values we would like to receive. - // - // HACK: On Windows, libndofdev passes our range to DI with a - // SetProperty call. This works but with one notable exception, the - // SpaceNavigator, who doesn't seem to care about the SetProperty - // call. In theory, we should handle this case inside libndofdev. - // However, the range we're setting here is arbitrary anyway, - // so let's just use the SpaceNavigator range for our purposes. - mNdofDev->axes_min = (long)-MAX_JOYSTICK_INPUT_VALUE; - mNdofDev->axes_max = (long)+MAX_JOYSTICK_INPUT_VALUE; - - // libndofdev could be used to return deltas. Here we choose to - // just have the absolute values instead. - mNdofDev->absolute = 1; - - // init & use the first suitable NDOF device found on the USB chain - if (ndof_init_first(mNdofDev, NULL)) - { - mDriverState = JDS_UNINITIALIZED; - LL_WARNS() << "ndof_init_first FAILED" << LL_ENDL; - } - else - { - mDriverState = JDS_INITIALIZED; - } + { + // di8_devices_callback callback is immediate and happens in scope of getInputDevices() +#if LL_WINDOWS && !LL_MESA_HEADLESS + // space navigator is marked as DI8DEVCLASS_GAMECTRL in ndof lib + U32 device_type = DI8DEVCLASS_GAMECTRL; + void* callback = &di8_devices_callback; +#elif + // MAC doesn't support device search yet + // On MAC there is an ndof_idsearch and it is possible to specify product + // and manufacturer in NDOF_Device for ndof_init_first to pick specific one + U32 device_type = 0; + void* callback = NULL; +#endif + if (!gViewerWindow->getWindow()->getInputDevices(device_type, callback)) + { + LL_INFOS() << "Failed to gather devices from window. Falling back to ndof's init" << LL_ENDL; + // Failed to gather devices from windows, init first suitable one + void *preffered_device = NULL; + initDevice(preffered_device); + } + + // make sure a device was found: + if (mDriverState == JDS_INITIALIZING) + { + LL_INFOS() << "Found no suitable devices. Trying ndof's default init" << LL_ENDL; + void *preffered_device = NULL; + initDevice(preffered_device); + } } else { @@ -264,6 +421,40 @@ void LLViewerJoystick::init(bool autoenable) #endif } +void LLViewerJoystick::initDevice(void * preffered_device /* LPDIRECTINPUTDEVICE8* */) +{ +#if LIB_NDOF + // Different joysticks will return different ranges of raw values. + // Since we want to handle every device in the same uniform way, + // we initialize the mNdofDev struct and we set the range + // of values we would like to receive. + // + // HACK: On Windows, libndofdev passes our range to DI with a + // SetProperty call. This works but with one notable exception, the + // SpaceNavigator, who doesn't seem to care about the SetProperty + // call. In theory, we should handle this case inside libndofdev. + // However, the range we're setting here is arbitrary anyway, + // so let's just use the SpaceNavigator range for our purposes. + mNdofDev->axes_min = (long)-MAX_JOYSTICK_INPUT_VALUE; + mNdofDev->axes_max = (long)+MAX_JOYSTICK_INPUT_VALUE; + + // libndofdev could be used to return deltas. Here we choose to + // just have the absolute values instead. + mNdofDev->absolute = 1; + // init & use the first suitable NDOF device found on the USB chain + // On windows preffered_device needs to be a pointer to LPDIRECTINPUTDEVICE8 + if (ndof_init_first(mNdofDev, preffered_device)) + { + mDriverState = JDS_UNINITIALIZED; + LL_WARNS() << "ndof_init_first FAILED" << LL_ENDL; + } + else + { + mDriverState = JDS_INITIALIZED; + } +#endif +} + // ----------------------------------------------------------------------------- void LLViewerJoystick::terminate() { -- cgit v1.2.3 From 54383cac8fa8a40d96590a300d4fce618f7413f3 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 10 Jul 2020 20:48:43 +0300 Subject: SL-5894 #3 WIP enumerate devices to flaoter, let floater set device temp --- indra/newview/llviewerjoystick.cpp | 148 ++++++++++++++++++++++++++----------- 1 file changed, 106 insertions(+), 42 deletions(-) (limited to 'indra/newview/llviewerjoystick.cpp') diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp index 9775bf646a..baeaaa0722 100644 --- a/indra/newview/llviewerjoystick.cpp +++ b/indra/newview/llviewerjoystick.cpp @@ -164,56 +164,66 @@ BOOL CALLBACK di8_devices_callback(LPCDIDEVICEINSTANCE device_instance_ptr, LPVO // Note: If a single device can function as more than one DirectInput // device type, it is enumerated as each device type that it supports. // Capable of detecting devices like Oculus Rift - if (device_instance_ptr && pvRef) + if (device_instance_ptr) { std::string product_name = utf16str_to_utf8str(llutf16string(device_instance_ptr->tszProductName)); - LL_DEBUGS("Joystick") << "DirectInput8 Devices: " << product_name << LL_ENDL; + LLSD guid = LLViewerJoystick::getInstance()->getDeviceUUID(); - U16 product_id = (device_instance_ptr->guidProduct.Data1 >> 16) & 0xFFFF; - U16 vendor_id = (device_instance_ptr->guidProduct.Data1 >> 0) & 0xFFFF; + bool init_device = false; + if (guid.isBinary()) + { + std::vector bin_bucket = guid.asBinary(); + init_device = memcmp(&bin_bucket[0], &device_instance_ptr->guidInstance, sizeof(GUID)) == 0; + } + else + { + // It might be better to init space navigator here, but if system doesn't has one, + // ndof will pick a random device, it is simpler to pick device now + init_device = true; + } - if (!LLViewerJoystick::getInstance()->isJoystickInitialized()) + if (init_device) { - bool found_space_mouse = is_space_mouse(product_id, vendor_id); + LL_DEBUGS("Joystick") << "Found and attempting to use device: " << product_name << LL_ENDL; + LPDIRECTINPUT8 di8_interface = *((LPDIRECTINPUT8 *)gViewerWindow->getWindow()->getDirectInput8()); + LPDIRECTINPUTDEVICE8 device = NULL; + + HRESULT status = di8_interface->CreateDevice( + device_instance_ptr->guidInstance, // REFGUID rguid, + &device, // LPDIRECTINPUTDEVICE * lplpDirectInputDevice, + NULL // LPUNKNOWN pUnkOuter + ); - if (found_space_mouse) + if (status == DI_OK) { - LL_DEBUGS("Joystick") << "Found device that matches criteria: " << product_name << LL_ENDL; - LPDIRECTINPUT8 di8_interface = (LPDIRECTINPUT8)pvRef; - LPDIRECTINPUTDEVICE8 device = NULL; - - HRESULT status = di8_interface->CreateDevice( - device_instance_ptr->guidInstance, // REFGUID rguid, - &device, // LPDIRECTINPUTDEVICE * lplpDirectInputDevice, - NULL // LPUNKNOWN pUnkOuter - ); - - if (status == DI_OK) - { - // prerequisite for aquire() - LL_DEBUGS("Joystick") << "Device created" << LL_ENDL; - status = device->SetDataFormat(&c_dfDIJoystick); // c_dfDIJoystick2 - } - - if (status == DI_OK) - { - // set properties - LL_DEBUGS("Joystick") << "Format set" << LL_ENDL; - status = device->EnumObjects(EnumNDOFObjectsCallback, &device, DIDFT_ALL); - } - - // todo: record device name, ndof won't fill it from passed device - // strncpy(mNdofDev->product, inst->tszProductName, sizeof(mNdofDev->product)); - // strncpy(mNdofDev->product, product_name.c_str(), sizeof(mNdofDev->product)); - - if (status == DI_OK) - { - LL_DEBUGS("Joystick") << "Properties updated" << LL_ENDL; - LLViewerJoystick::getInstance()->initDevice(&device); - return DIENUM_STOP; - } + // prerequisite for aquire() + LL_DEBUGS("Joystick") << "Device created" << LL_ENDL; + status = device->SetDataFormat(&c_dfDIJoystick); // c_dfDIJoystick2 } + + if (status == DI_OK) + { + // set properties + LL_DEBUGS("Joystick") << "Format set" << LL_ENDL; + status = device->EnumObjects(EnumNDOFObjectsCallback, &device, DIDFT_ALL); + } + + if (status == DI_OK) + { + LL_DEBUGS("Joystick") << "Properties updated" << LL_ENDL; + + S32 size = sizeof(GUID); + LLSD::Binary data; //just an std::vector + data.resize(size); + memcpy(&data[0], &device_instance_ptr->guidInstance /*POD _GUID*/, size); + LLViewerJoystick::getInstance()->initDevice(&device, product_name, LLSD(data)); + return DIENUM_STOP; + } + } + else + { + LL_DEBUGS("Joystick") << "Found device: " << product_name << LL_ENDL; } } return DIENUM_CONTINUE; @@ -310,6 +320,8 @@ LLViewerJoystick::LLViewerJoystick() // factor in bandwidth? bandwidth = gViewerStats->mKBitStat mPerfScale = 4000.f / gSysCPU.getMHz(); // hmm. why? + + mLastDeviceUUID = LLSD::Integer(1); } // ----------------------------------------------------------------------------- @@ -327,6 +339,7 @@ void LLViewerJoystick::init(bool autoenable) #if LIB_NDOF static bool libinit = false; mDriverState = JDS_INITIALIZING; + //todo: load mLastDeviceUUID from settings if (libinit == false) { @@ -363,10 +376,11 @@ void LLViewerJoystick::init(bool autoenable) U32 device_type = 0; void* callback = NULL; #endif - if (!gViewerWindow->getWindow()->getInputDevices(device_type, callback)) + if (!gViewerWindow->getWindow()->getInputDevices(device_type, callback, NULL)) { LL_INFOS() << "Failed to gather devices from window. Falling back to ndof's init" << LL_ENDL; // Failed to gather devices from windows, init first suitable one + mLastDeviceUUID = LLSD::Integer(1); void *preffered_device = NULL; initDevice(preffered_device); } @@ -375,6 +389,7 @@ void LLViewerJoystick::init(bool autoenable) if (mDriverState == JDS_INITIALIZING) { LL_INFOS() << "Found no suitable devices. Trying ndof's default init" << LL_ENDL; + mLastDeviceUUID = LLSD::Integer(1); void *preffered_device = NULL; initDevice(preffered_device); } @@ -421,6 +436,47 @@ void LLViewerJoystick::init(bool autoenable) #endif } +void LLViewerJoystick::initDevice(LLSD &guid) +{ +#if LIB_NDOF + mLastDeviceUUID = guid; + // todo: should we Unacquire old one? + +#if LL_WINDOWS && !LL_MESA_HEADLESS + // space navigator is marked as DI8DEVCLASS_GAMECTRL in ndof lib + U32 device_type = DI8DEVCLASS_GAMECTRL; + void* callback = &di8_devices_callback; +#elif + // MAC doesn't support device search yet + // On MAC there is an ndof_idsearch and it is possible to specify product + // and manufacturer in NDOF_Device for ndof_init_first to pick specific one + U32 device_type = 0; + void* callback = NULL; +#endif + + if (!gViewerWindow->getWindow()->getInputDevices(device_type, callback, NULL)) + { + LL_INFOS() << "Failed to gather devices from window. Falling back to ndof's init" << LL_ENDL; + // Failed to gather devices from windows, init first suitable one + void *preffered_device = NULL; + mLastDeviceUUID = LLSD::Integer(1); + initDevice(preffered_device); + } +#endif +} + +void LLViewerJoystick::initDevice(void * preffered_device /*LPDIRECTINPUTDEVICE8*/, std::string &name, LLSD &guid) +{ +#if LIB_NDOF + mLastDeviceUUID = guid; + + strncpy(mNdofDev->product, name.c_str(), sizeof(mNdofDev->product)); + mNdofDev->manufacturer[0] = '\0'; + + initDevice(preffered_device); +#endif +} + void LLViewerJoystick::initDevice(void * preffered_device /* LPDIRECTINPUTDEVICE8* */) { #if LIB_NDOF @@ -452,6 +508,8 @@ void LLViewerJoystick::initDevice(void * preffered_device /* LPDIRECTINPUTDEVICE { mDriverState = JDS_INITIALIZED; } + + //todo: save mLastDeviceUUID to settings #endif } @@ -1251,6 +1309,12 @@ void LLViewerJoystick::scanJoystick() } } +// ----------------------------------------------------------------------------- +LLSD LLViewerJoystick::getDeviceUUID() +{ + return mLastDeviceUUID; +} + // ----------------------------------------------------------------------------- std::string LLViewerJoystick::getDescription() { -- cgit v1.2.3 From 8c66f54cfa9b1d26271338b7629290b35222617f Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 14 Jul 2020 00:28:21 +0300 Subject: SL-5894 #4 Organize device storage between sessions --- indra/newview/llviewerjoystick.cpp | 200 +++++++++++++++++++++---------------- 1 file changed, 113 insertions(+), 87 deletions(-) (limited to 'indra/newview/llviewerjoystick.cpp') diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp index baeaaa0722..a75e0b5569 100644 --- a/indra/newview/llviewerjoystick.cpp +++ b/indra/newview/llviewerjoystick.cpp @@ -46,9 +46,6 @@ // Require DirectInput version 8 #define DIRECTINPUT_VERSION 0x0800 -//#include -//#pragma comment(lib, "dinput8") -//#pragma comment(lib, "dxguid.lib") #include #endif @@ -76,13 +73,11 @@ F32 LLViewerJoystick::sDelta[] = {0,0,0,0,0,0,0}; #if LL_WINDOWS && !LL_MESA_HEADLESS -// took this from ndofdev_win.cpp -BOOL CALLBACK EnumNDOFObjectsCallback(const DIDEVICEOBJECTINSTANCE* inst, - VOID* user_data) +// this should reflect ndof and set axises, see ndofdev_win.cpp from ndof package +BOOL CALLBACK EnumObjectsCallback(const DIDEVICEOBJECTINSTANCE* inst, VOID* user_data) { if (inst->dwType & DIDFT_AXIS) { - HRESULT hr = DI_OK; LPDIRECTINPUTDEVICE8 device = *((LPDIRECTINPUTDEVICE8 *)user_data); DIPROPRANGE diprg; diprg.diph.dwSize = sizeof(DIPROPRANGE); @@ -93,70 +88,15 @@ BOOL CALLBACK EnumNDOFObjectsCallback(const DIDEVICEOBJECTINSTANCE* inst, // Set the range for the axis diprg.lMin = (long)-MAX_JOYSTICK_INPUT_VALUE; diprg.lMax = (long)+MAX_JOYSTICK_INPUT_VALUE; - hr = device->SetProperty(DIPROP_RANGE, &diprg.diph); - assert(hr == DI_OK); - + HRESULT hr = device->SetProperty(DIPROP_RANGE, &diprg.diph); if (FAILED(hr)) - return DIENUM_STOP; - } - - return DIENUM_CONTINUE; -} - -// vvvv Product ID -// 0xC62B046D -// ^^^^ Vendor ID -// 0x046D Logitech's Vendor ID -// 0x256F 3Dconnexion's Vendor ID -// -// See: -// https://github.com/janoc/libndofdev/blob/master/ndofdev.c -// http://spacemice.org/index.php?title=Dev -// https://www.3dconnexion.com/nc/service/faq/faq/how-can-i-check-if-my-usb-3d-mouse-is-recognized-by-windows.html -bool is_space_mouse(const U16 product_id, const U16 vendor_id) -{ - if (vendor_id == 0x046d) // Logitech's Vendor ID - { - if (false - || (product_id == 0xc603) // SpaceMouse Plus USB, SpaceMouse Plus XT USB - || (product_id == 0xc605) // CadMan: USB - || (product_id == 0xc606) // SpaceMouse Classic USB - || (product_id == 0xc621) // SpaceBall 5000 USB - || (product_id == 0xc623) // SpaceTraveler: USB - || (product_id == 0xc625) // SpacePilot: USB - || (product_id == 0xc626) // SpaceNavigator: USB - || (product_id == 0xc627) // SpaceExplorer: USB - || (product_id == 0xc628) // SpaceNavigator for Notebooks: USB - || (product_id == 0xc629) // SpacePilot Pro: USB - || (product_id == 0xc62b) // SpaceMouse Pro: USB - ) { - return true; + return DIENUM_STOP; } } - else - if (vendor_id == 0x256F) // 3Dconnexion's Vendor ID - { - if (false - || (product_id == 0xc62E) // SpaceMouse Wireless (cabled) - || (product_id == 0xc62F) // SpaceMouse Wireless Receiver - || (product_id == 0xc631) // Spacemouse Wireless (cabled) - || (product_id == 0xc632) // SpacemousePro Wireless Receiver - || (product_id == 0xc633) // SpaceMouse Enterprise - || (product_id == 0xc635) // Spacemouse Compact - || (product_id == 0xc650) // CadMouse - || (product_id == 0xc651) // CadMouse Wireless - || (product_id == 0xc652) // Universal Receiver - || (product_id == 0xc654) // CadMouse Pro Wireless - || (product_id == 0xc657) // CadMouse Pro Wireless Left - ) - { - return true; - } - } - return false; + return DIENUM_CONTINUE; } BOOL CALLBACK di8_devices_callback(LPCDIDEVICEINSTANCE device_instance_ptr, LPVOID pvRef) @@ -179,7 +119,7 @@ BOOL CALLBACK di8_devices_callback(LPCDIDEVICEINSTANCE device_instance_ptr, LPVO else { // It might be better to init space navigator here, but if system doesn't has one, - // ndof will pick a random device, it is simpler to pick device now + // ndof will pick a random device, it is simpler to pick first device now to have an id init_device = true; } @@ -206,7 +146,7 @@ BOOL CALLBACK di8_devices_callback(LPCDIDEVICEINSTANCE device_instance_ptr, LPVO { // set properties LL_DEBUGS("Joystick") << "Format set" << LL_ENDL; - status = device->EnumObjects(EnumNDOFObjectsCallback, &device, DIDFT_ALL); + status = device->EnumObjects(EnumObjectsCallback, &device, DIDFT_ALL); } if (status == DI_OK) @@ -228,6 +168,27 @@ BOOL CALLBACK di8_devices_callback(LPCDIDEVICEINSTANCE device_instance_ptr, LPVO } return DIENUM_CONTINUE; } + +// Windows guids +// This is GUID2 so teoretically it can be memcpy copied into LLUUID +void guid_from_string(GUID &guid, const std::string &input) +{ + CLSIDFromString(utf8str_to_utf16str(input).c_str(), &guid); +} + +std::string string_from_guid(const GUID &guid) +{ + OLECHAR* guidString; //wchat + StringFromCLSID(guid, &guidString); + + // use guidString... + + std::string res = utf16str_to_utf8str(llutf16string(guidString)); + // ensure memory is freed + ::CoTaskMemFree(guidString); + + return res; +} #endif // ----------------------------------------------------------------------------- @@ -239,7 +200,8 @@ void LLViewerJoystick::updateEnabled(bool autoenable) } else { - if (isLikeSpaceNavigator() && autoenable) + // autoenable if user specifically chose this device + if (autoenable && (isLikeSpaceNavigator() || isDeviceUUIDSet())) { gSavedSettings.setBOOL("JoystickEnabled", TRUE ); } @@ -275,7 +237,7 @@ NDOF_HotPlugResult LLViewerJoystick::HotPlugAddCallback(NDOF_Device *dev) LLViewerJoystick* joystick(LLViewerJoystick::getInstance()); if (joystick->mDriverState == JDS_UNINITIALIZED) { - LL_INFOS() << "HotPlugAddCallback: will use device:" << LL_ENDL; + LL_INFOS("Joystick") << "HotPlugAddCallback: will use device:" << LL_ENDL; ndof_dump(dev); joystick->mNdofDev = dev; joystick->mDriverState = JDS_INITIALIZED; @@ -293,7 +255,7 @@ void LLViewerJoystick::HotPlugRemovalCallback(NDOF_Device *dev) LLViewerJoystick* joystick(LLViewerJoystick::getInstance()); if (joystick->mNdofDev == dev) { - LL_INFOS() << "HotPlugRemovalCallback: joystick->mNdofDev=" + LL_INFOS("Joystick") << "HotPlugRemovalCallback: joystick->mNdofDev=" << joystick->mNdofDev << "; removed device:" << LL_ENDL; ndof_dump(dev); joystick->mDriverState = JDS_UNINITIALIZED; @@ -339,7 +301,8 @@ void LLViewerJoystick::init(bool autoenable) #if LIB_NDOF static bool libinit = false; mDriverState = JDS_INITIALIZING; - //todo: load mLastDeviceUUID from settings + + loadDeviceIdFromSettings(); if (libinit == false) { @@ -369,7 +332,7 @@ void LLViewerJoystick::init(bool autoenable) // space navigator is marked as DI8DEVCLASS_GAMECTRL in ndof lib U32 device_type = DI8DEVCLASS_GAMECTRL; void* callback = &di8_devices_callback; -#elif +#else // MAC doesn't support device search yet // On MAC there is an ndof_idsearch and it is possible to specify product // and manufacturer in NDOF_Device for ndof_init_first to pick specific one @@ -378,20 +341,17 @@ void LLViewerJoystick::init(bool autoenable) #endif if (!gViewerWindow->getWindow()->getInputDevices(device_type, callback, NULL)) { - LL_INFOS() << "Failed to gather devices from window. Falling back to ndof's init" << LL_ENDL; + LL_INFOS("Joystick") << "Failed to gather devices from window. Falling back to ndof's init" << LL_ENDL; // Failed to gather devices from windows, init first suitable one - mLastDeviceUUID = LLSD::Integer(1); + mLastDeviceUUID = LLSD(); void *preffered_device = NULL; initDevice(preffered_device); } - // make sure a device was found: if (mDriverState == JDS_INITIALIZING) { - LL_INFOS() << "Found no suitable devices. Trying ndof's default init" << LL_ENDL; - mLastDeviceUUID = LLSD::Integer(1); - void *preffered_device = NULL; - initDevice(preffered_device); + LL_INFOS("Joystick") << "Found no matching joystick devices." << LL_ENDL; + mDriverState = JDS_UNINITIALIZED; } } else @@ -431,7 +391,7 @@ void LLViewerJoystick::init(bool autoenable) // No device connected, don't change any settings } - LL_INFOS() << "ndof: mDriverState=" << mDriverState << "; mNdofDev=" + LL_INFOS("Joystick") << "ndof: mDriverState=" << mDriverState << "; mNdofDev=" << mNdofDev << "; libinit=" << libinit << LL_ENDL; #endif } @@ -440,13 +400,12 @@ void LLViewerJoystick::initDevice(LLSD &guid) { #if LIB_NDOF mLastDeviceUUID = guid; - // todo: should we Unacquire old one? #if LL_WINDOWS && !LL_MESA_HEADLESS // space navigator is marked as DI8DEVCLASS_GAMECTRL in ndof lib U32 device_type = DI8DEVCLASS_GAMECTRL; void* callback = &di8_devices_callback; -#elif +#else // MAC doesn't support device search yet // On MAC there is an ndof_idsearch and it is possible to specify product // and manufacturer in NDOF_Device for ndof_init_first to pick specific one @@ -454,14 +413,21 @@ void LLViewerJoystick::initDevice(LLSD &guid) void* callback = NULL; #endif + mDriverState = JDS_INITIALIZING; if (!gViewerWindow->getWindow()->getInputDevices(device_type, callback, NULL)) { - LL_INFOS() << "Failed to gather devices from window. Falling back to ndof's init" << LL_ENDL; + LL_INFOS("Joystick") << "Failed to gather devices from window. Falling back to ndof's init" << LL_ENDL; // Failed to gather devices from windows, init first suitable one void *preffered_device = NULL; - mLastDeviceUUID = LLSD::Integer(1); + mLastDeviceUUID = LLSD(); initDevice(preffered_device); } + + if (mDriverState == JDS_INITIALIZING) + { + LL_INFOS("Joystick") << "Found no matching joystick devices." << LL_ENDL; + mDriverState = JDS_UNINITIALIZED; + } #endif } @@ -508,8 +474,6 @@ void LLViewerJoystick::initDevice(void * preffered_device /* LPDIRECTINPUTDEVICE { mDriverState = JDS_INITIALIZED; } - - //todo: save mLastDeviceUUID to settings #endif } @@ -519,7 +483,7 @@ void LLViewerJoystick::terminate() #if LIB_NDOF ndof_libcleanup(); - LL_INFOS() << "Terminated connection with NDOF device." << LL_ENDL; + LL_INFOS("Joystick") << "Terminated connection with NDOF device." << LL_ENDL; mDriverState = JDS_UNINITIALIZED; #endif } @@ -1310,11 +1274,73 @@ void LLViewerJoystick::scanJoystick() } // ----------------------------------------------------------------------------- +bool LLViewerJoystick::isDeviceUUIDSet() +{ +#if LL_WINDOWS && !LL_MESA_HEADLESS + // for ease of comparison and to dial less with platform specific variables, we store id as LLSD binary + return mLastDeviceUUID.isBinary(); +#else + return false; +#endif +} + LLSD LLViewerJoystick::getDeviceUUID() { return mLastDeviceUUID; } +std::string LLViewerJoystick::getDeviceUUIDString() +{ +#if LL_WINDOWS && !LL_MESA_HEADLESS + // Might be simpler to just convert _GUID into string everywhere, store and compare as string + if (mLastDeviceUUID.isBinary()) + { + S32 size = sizeof(GUID); + LLSD::Binary data = mLastDeviceUUID.asBinary(); + GUID guid; + memcpy(&guid, &data[0], size); + return string_from_guid(guid); + } + else + { + return std::string(); + } +#else + return std::string(); + // return mLastDeviceUUID; +#endif +} + +void LLViewerJoystick::loadDeviceIdFromSettings() +{ +#if LL_WINDOWS && !LL_MESA_HEADLESS + // We can't save binary data to gSavedSettings, somebody editing the file will corrupt it, + // so _GUID data gets converted to string (we probably can convert it to LLUUID with memcpy) + // and here we need to convert it back to binary from string + std::string device_string = gSavedSettings.getString("JoystickDeviceUUID"); + if (device_string.empty()) + { + mLastDeviceUUID = LLSD(); + } + else + { + LL_DEBUGS("Joystick") << "Looking for device by id: " << device_string << LL_ENDL; + GUID guid; + guid_from_string(guid, device_string); + S32 size = sizeof(GUID); + LLSD::Binary data; //just an std::vector + data.resize(size); + memcpy(&data[0], &guid /*POD _GUID*/, size); + // We store this data in LLSD since LLSD is versatile and will be able to handle both GUID2 + // and any data MAC will need for device selection + mLastDeviceUUID = LLSD(data); + } +#else + mLastDeviceUUID = LLSD(); + //mLastDeviceUUID = gSavedSettings.getLLSD("JoystickDeviceUUID"); +#endif +} + // ----------------------------------------------------------------------------- std::string LLViewerJoystick::getDescription() { -- cgit v1.2.3