Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1523353 - Part 2: DS4 gamepad multitouch and lightindicator support on Mac OS. r=baku

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D37463

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Daosheng Mu 2019-07-15 07:37:19 +00:00
parent 3087968487
commit 43693c08b6
4 changed files with 103 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dom/gamepad/GamepadRemapping.cpp
View File

@ -403,7 +403,11 @@ class Dualshock4Remapper final : public GamepadRemapper {
aReport[8] = aBlue;
}
virtual void GetTouchData(uint32_t aIndex, void* aInput) override {
virtual uint32_t GetMaxInputReportLength() const override {
return MAX_INPUT_LEN;
}
virtual void ProcessTouchData(uint32_t aIndex, void* aInput) override {
nsTArray<GamepadTouchState> touches(TOUCH_EVENT_COUNT);
touches.SetLength(TOUCH_EVENT_COUNT);
uint8_t* rawData = (uint8_t*)aInput;
@ -546,6 +550,7 @@ class Dualshock4Remapper final : public GamepadRemapper {
static const uint32_t LIGHT_INDICATOR_COUNT = 1;
static const uint32_t TOUCH_EVENT_COUNT = 2;
static const uint32_t MAX_INPUT_LEN = 68;
nsTArray<unsigned long> mLastTouchId;
nsTArray<bool> mLastTouches;

3
dom/gamepad/GamepadRemapping.h
View File

@ -78,13 +78,14 @@ class GamepadRemapper {
virtual uint32_t GetTouchEventCount() const { return 0; }
virtual void GetLightColorReport(uint8_t aRed, uint8_t aGreen, uint8_t aBlue,
std::vector<uint8_t>& aReport) const {}
virtual uint32_t GetMaxInputReportLength() const { return 0; }
virtual void SetAxisCount(uint32_t aButtonCount) {}
virtual void SetButtonCount(uint32_t aButtonCount) {}
virtual GamepadMappingType GetMappingType() const {
return GamepadMappingType::Standard;
}
virtual void GetTouchData(uint32_t aIndex, void* aInput) {}
virtual void ProcessTouchData(uint32_t aIndex, void* aInput) {}
virtual void RemapAxisMoveEvent(uint32_t aIndex, uint32_t aAxis,
double aValue) const = 0;
virtual void RemapButtonEvent(uint32_t aIndex, uint32_t aButton,

105
dom/gamepad/cocoa/CocoaGamepad.cpp
View File

@ -83,6 +83,7 @@ class Gamepad {
public:
Gamepad() : mDevice(nullptr), mSuperIndex(-1) {}
bool operator==(IOHIDDeviceRef device) const { return mDevice == device; }
bool empty() const { return mDevice == nullptr; }
void clear() {
@ -92,13 +93,12 @@ class Gamepad {
mSuperIndex = -1;
}
void init(IOHIDDeviceRef device);
void ReportChanged(uint8_t* report, CFIndex report_length);
size_t WriteOutputReport(const std::vector<uint8_t>& aReport) const;
size_t numButtons() { return buttons.Length(); }
size_t numAxes() { return axes.Length(); }
// Index given by our superclass.
uint32_t mSuperIndex;
RefPtr<GamepadRemapper> mRemapper;
Button* lookupButton(IOHIDElementRef element) {
for (unsigned i = 0; i < buttons.Length(); i++) {
if (buttons[i].element == element) return &buttons[i];
@ -112,6 +112,11 @@ class Gamepad {
}
return nullptr;
}
// Index given by our superclass.
uint32_t mSuperIndex;
RefPtr<GamepadRemapper> mRemapper;
std::vector<uint8_t> mInputReport;
};
void Gamepad::init(IOHIDDeviceRef device) {
@ -192,8 +197,16 @@ class DarwinGamepadService {
public:
DarwinGamepadService();
~DarwinGamepadService();
static void ReportChangedCallback(void* context, IOReturn result,
void* sender, IOHIDReportType report_type,
uint32_t report_id, uint8_t* report,
CFIndex report_length);
void Startup();
void Shutdown();
void SetLightIndicatorColor(uint32_t aControllerIdx, uint32_t aLightIndex,
uint8_t aRed, uint8_t aGreen, uint8_t aBlue);
friend class DarwinGamepadServiceStartupRunnable;
friend class DarwinGamepadServiceShutdownRunnable;
};
@ -284,13 +297,27 @@ void DarwinGamepadService::DeviceAdded(IOHIDDeviceRef device) {
remapper->SetButtonCount(mGamepads[slot].numButtons());
uint32_t index = service->AddGamepad(
buffer, remapper->GetMappingType(),
mozilla::dom::GamepadHand::_empty, remapper->GetButtonCount(),
remapper->GetAxisCount(), 0, 0,
0); // TODO: Bug 680289, implement gamepad haptics for cocoa.
// TODO: Bug 1523355, implement gamepad lighindicator and touch for cocoa.
buffer, remapper->GetMappingType(), mozilla::dom::GamepadHand::_empty,
remapper->GetButtonCount(), remapper->GetAxisCount(),
0, // TODO: Bug 680289, implement gamepad haptics for cocoa.
remapper->GetLightIndicatorCount(), remapper->GetTouchEventCount());
nsTArray<GamepadLightIndicatorType> lightTypes;
remapper->GetLightIndicators(lightTypes);
for (uint32_t i = 0; i < lightTypes.Length(); ++i) {
if (lightTypes[i] != GamepadLightIndicator::DefaultType()) {
service->NewLightIndicatorTypeEvent(index, i, lightTypes[i]);
}
}
mGamepads[slot].mSuperIndex = index;
mGamepads[slot].mInputReport.resize(remapper->GetMaxInputReportLength());
mGamepads[slot].mRemapper = remapper.forget();
IOHIDDeviceRegisterInputReportCallback(
device, mGamepads[slot].mInputReport.data(),
mGamepads[slot].mInputReport.size(), ReportChangedCallback,
&mGamepads[slot]);
}
void DarwinGamepadService::DeviceRemoved(IOHIDDeviceRef device) {
@ -308,6 +335,29 @@ void DarwinGamepadService::DeviceRemoved(IOHIDDeviceRef device) {
}
}
// Replace context to be Gamepad.
void DarwinGamepadService::ReportChangedCallback(
void* context, IOReturn result, void* sender, IOHIDReportType report_type,
uint32_t report_id, uint8_t* report, CFIndex report_length) {
if (report_type == kIOHIDReportTypeInput) {
reinterpret_cast<Gamepad*>(context)->ReportChanged(report, report_length);
}
}
void Gamepad::ReportChanged(uint8_t* report, CFIndex report_len) {
MOZ_RELEASE_ASSERT(report_len <= mRemapper->GetMaxInputReportLength());
mRemapper->ProcessTouchData(mSuperIndex, report);
}
size_t Gamepad::WriteOutputReport(const std::vector<uint8_t>& aReport) const {
IOReturn success =
IOHIDDeviceSetReport(mDevice, kIOHIDReportTypeOutput, aReport[0],
aReport.data(), aReport.size());
MOZ_ASSERT(success == kIOReturnSuccess);
return (success == kIOReturnSuccess) ? aReport.size() : 0;
}
void DarwinGamepadService::InputValueChanged(IOHIDValueRef value) {
RefPtr<GamepadPlatformService> service =
GamepadPlatformService::GetParentService();
@ -507,6 +557,35 @@ void DarwinGamepadService::Shutdown() {
mIsRunning = false;
}
void DarwinGamepadService::SetLightIndicatorColor(uint32_t aControllerIdx,
uint32_t aLightColorIndex,
uint8_t aRed, uint8_t aGreen,
uint8_t aBlue) {
// We get aControllerIdx from GamepadPlatformService::AddGamepad(),
// It begins from 1 and is stored at Gamepad.id.
const Gamepad* gamepad = nullptr;
for (const auto& pad : mGamepads) {
if (pad.mSuperIndex == aControllerIdx) {
gamepad = &pad;
break;
}
}
if (!gamepad) {
MOZ_ASSERT(false);
return;
}
RefPtr<GamepadRemapper> remapper = gamepad->mRemapper;
if (!remapper || remapper->GetLightIndicatorCount() <= aLightColorIndex) {
MOZ_ASSERT(false);
return;
}
std::vector<uint8_t> report;
remapper->GetLightColorReport(aRed, aGreen, aBlue, report);
gamepad->WriteOutputReport(report);
}
} // namespace
namespace mozilla {
@ -535,8 +614,12 @@ void StopGamepadMonitoring() {
void SetGamepadLightIndicatorColor(uint32_t aControllerIdx,
uint32_t aLightColorIndex, uint8_t aRed,
uint8_t aGreen, uint8_t aBlue) {
// TODO: Bug 1523353.
NS_WARNING("Mac OS doesn't support gamepad light indicator.");
MOZ_ASSERT(gService);
if (!gService) {
return;
}
gService->SetLightIndicatorColor(aControllerIdx, aLightColorIndex, aRed,
aGreen, aBlue);
}
} // namespace dom

2
dom/gamepad/windows/WindowsGamepad.cpp
View File

@ -850,7 +850,7 @@ bool WindowsGamepadService::HandleRawInput(HRAWINPUT handle) {
}
BYTE* rawData = raw->data.hid.bRawData;
gamepad->remapper->GetTouchData(gamepad->id, rawData);
gamepad->remapper->ProcessTouchData(gamepad->id, rawData);
return true;
}