From 9b27b6e5098aee7a050d4c3f3f14050c509f74ec Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 14 Dec 2022 19:41:07 +0200 Subject: SL-13610 [MAC] WIP List HID available devices in joystick selection Doesn't filter the list yet, just shows full list of usb devices Selecting visible devices doesn't work yet --- indra/newview/llfloaterjoystick.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llfloaterjoystick.h') diff --git a/indra/newview/llfloaterjoystick.h b/indra/newview/llfloaterjoystick.h index 1d46efd3f6..912d9b5310 100644 --- a/indra/newview/llfloaterjoystick.h +++ b/indra/newview/llfloaterjoystick.h @@ -46,6 +46,7 @@ public: virtual void draw(); static void setSNDefaults(); + static void addDeviceCallback(std::string &name, LLSD::Binary& value, void* userdata); void addDevice(std::string &name, LLSD& value); protected: -- cgit v1.2.3 From 453a4a13f87d5cbfa6150a4f76f9e976692b54e6 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 20 Dec 2022 17:44:08 +0200 Subject: SL-13610 [MAC] WIP enable initing devices by local id --- indra/newview/llfloaterjoystick.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloaterjoystick.h') diff --git a/indra/newview/llfloaterjoystick.h b/indra/newview/llfloaterjoystick.h index 912d9b5310..e7049ab906 100644 --- a/indra/newview/llfloaterjoystick.h +++ b/indra/newview/llfloaterjoystick.h @@ -46,7 +46,7 @@ public: virtual void draw(); static void setSNDefaults(); - static void addDeviceCallback(std::string &name, LLSD::Binary& value, void* userdata); + static bool addDeviceCallback(std::string &name, LLSD::Binary& value, void* userdata); void addDevice(std::string &name, LLSD& value); protected: -- cgit v1.2.3 From 3084f864176dffbc5da19e6f958a55513f63e795 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 29 Dec 2022 19:16:15 +0200 Subject: SL-13610 [MAC] Manufacturer based search --- indra/newview/llfloaterjoystick.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llfloaterjoystick.h') diff --git a/indra/newview/llfloaterjoystick.h b/indra/newview/llfloaterjoystick.h index e7049ab906..ff889c804b 100644 --- a/indra/newview/llfloaterjoystick.h +++ b/indra/newview/llfloaterjoystick.h @@ -46,7 +46,7 @@ public: virtual void draw(); static void setSNDefaults(); - static bool addDeviceCallback(std::string &name, LLSD::Binary& value, void* userdata); + static bool addDeviceCallback(std::string &name, LLSD& value, void* userdata); void addDevice(std::string &name, LLSD& value); protected: -- cgit v1.2.3 From 1b68f71348ecf3983b76b40d7940da8377f049b7 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Mon, 29 Apr 2024 07:43:28 +0300 Subject: #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed --- indra/newview/llfloaterjoystick.h | 100 +++++++++++++++++++------------------- 1 file changed, 50 insertions(+), 50 deletions(-) (limited to 'indra/newview/llfloaterjoystick.h') diff --git a/indra/newview/llfloaterjoystick.h b/indra/newview/llfloaterjoystick.h index 1d46efd3f6..2ed4018670 100644 --- a/indra/newview/llfloaterjoystick.h +++ b/indra/newview/llfloaterjoystick.h @@ -1,25 +1,25 @@ -/** +/** * @file llfloaterjoystick.h * @brief Joystick preferences panel * * $LicenseInfo:firstyear=2007&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -35,68 +35,68 @@ class LLComboBox; class LLFloaterJoystick : public LLFloater { - friend class LLFloaterReg; + friend class LLFloaterReg; public: - virtual BOOL postBuild(); - virtual void refresh(); - virtual void apply(); // Apply the changed values. - virtual void cancel(); // Cancel the changed values. - virtual void draw(); - static void setSNDefaults(); + virtual BOOL postBuild(); + virtual void refresh(); + virtual void apply(); // Apply the changed values. + virtual void cancel(); // Cancel the changed values. + virtual void draw(); + static void setSNDefaults(); void addDevice(std::string &name, LLSD& value); protected: - void refreshListOfDevices(); - void onClose(bool app_quitting); - void onClickCloseBtn(bool app_quitting); + void refreshListOfDevices(); + void onClose(bool app_quitting); + void onClickCloseBtn(bool app_quitting); private: - LLFloaterJoystick(const LLSD& data); - virtual ~LLFloaterJoystick(); + LLFloaterJoystick(const LLSD& data); + virtual ~LLFloaterJoystick(); + + void initFromSettings(); - void initFromSettings(); - - static void onCommitJoystickEnabled(LLUICtrl*, void*); - static void onClickRestoreSNDefaults(void*); - static void onClickCancel(void*); - static void onClickOK(void*); + static void onCommitJoystickEnabled(LLUICtrl*, void*); + static void onClickRestoreSNDefaults(void*); + static void onClickCancel(void*); + static void onClickOK(void*); private: - // Device prefs - bool mJoystickEnabled; - LLSD mJoystickId; - S32 mJoystickAxis[7]; - bool m3DCursor; - bool mAutoLeveling; - bool mZoomDirect; - - // Modes prefs - bool mAvatarEnabled; - bool mBuildEnabled; - bool mFlycamEnabled; - F32 mAvatarAxisScale[6]; - F32 mBuildAxisScale[6]; - F32 mFlycamAxisScale[7]; - F32 mAvatarAxisDeadZone[6]; - F32 mBuildAxisDeadZone[6]; - F32 mFlycamAxisDeadZone[7]; - F32 mAvatarFeathering; - F32 mBuildFeathering; - F32 mFlycamFeathering; - - // Controls that can disable the flycam - LLCheckBoxCtrl *mCheckFlycamEnabled; - LLComboBox *mJoysticksCombo; + // Device prefs + bool mJoystickEnabled; + LLSD mJoystickId; + S32 mJoystickAxis[7]; + bool m3DCursor; + bool mAutoLeveling; + bool mZoomDirect; + + // Modes prefs + bool mAvatarEnabled; + bool mBuildEnabled; + bool mFlycamEnabled; + F32 mAvatarAxisScale[6]; + F32 mBuildAxisScale[6]; + F32 mFlycamAxisScale[7]; + F32 mAvatarAxisDeadZone[6]; + F32 mBuildAxisDeadZone[6]; + F32 mFlycamAxisDeadZone[7]; + F32 mAvatarFeathering; + F32 mBuildFeathering; + F32 mFlycamFeathering; + + // Controls that can disable the flycam + LLCheckBoxCtrl *mCheckFlycamEnabled; + LLComboBox *mJoysticksCombo; bool mHasDeviceList; - // stats view - LLStatBar* mAxisStatsBar[6]; + // stats view + LLStatBar* mAxisStatsBar[6]; }; #endif -- cgit v1.2.3