summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-08 02:36:26 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-08 02:36:26 +0000
commit0258055bdc8530c38bdcc4f45ef036bb75ec4579 (patch)
tree02c5da504585c35351b23e4ffdee74db0f35c99a /content
parentb71ab48a22a59ec017928d1c603732e409fb898a (diff)
downloadchromium_src-0258055bdc8530c38bdcc4f45ef036bb75ec4579.zip
chromium_src-0258055bdc8530c38bdcc4f45ef036bb75ec4579.tar.gz
chromium_src-0258055bdc8530c38bdcc4f45ef036bb75ec4579.tar.bz2
Add Mac implementation of data_fetcher for gamepad.
BUG=79050 Review URL: http://codereview.chromium.org/8799022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/gamepad/data_fetcher.h1
-rw-r--r--content/browser/gamepad/data_fetcher_mac.h75
-rw-r--r--content/browser/gamepad/data_fetcher_mac.mm287
-rw-r--r--content/browser/gamepad/gamepad_provider.cc16
-rw-r--r--content/content_browser.gypi2
5 files changed, 379 insertions, 2 deletions
diff --git a/content/browser/gamepad/data_fetcher.h b/content/browser/gamepad/data_fetcher.h
index 587969f..94bf4ae 100644
--- a/content/browser/gamepad/data_fetcher.h
+++ b/content/browser/gamepad/data_fetcher.h
@@ -16,6 +16,7 @@ class GamepadDataFetcher {
virtual ~GamepadDataFetcher() {}
virtual void GetGamepadData(WebKit::WebGamepads* pads,
bool devices_changed_hint) = 0;
+ virtual void PauseHint(bool paused) {}
};
} // namespace content
diff --git a/content/browser/gamepad/data_fetcher_mac.h b/content/browser/gamepad/data_fetcher_mac.h
new file mode 100644
index 0000000..34f7d4b
--- /dev/null
+++ b/content/browser/gamepad/data_fetcher_mac.h
@@ -0,0 +1,75 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CONTENT_BROWSER_GAMEPAD_DATA_FETCHER_MAC_H_
+#define CONTENT_BROWSER_GAMEPAD_DATA_FETCHER_MAC_H_
+
+#include "build/build_config.h"
+
+#include "base/compiler_specific.h"
+#include "base/mac/scoped_cftyperef.h"
+#include "content/browser/gamepad/data_fetcher.h"
+#include "content/common/gamepad_hardware_buffer.h"
+
+#include <CoreFoundation/CoreFoundation.h>
+#include <IOKit/hid/IOHIDManager.h>
+
+#if defined(__OBJC__)
+@class NSArray;
+#else
+class NSArray;
+#endif
+
+namespace content {
+
+class GamepadDataFetcherMac : public GamepadDataFetcher {
+ public:
+ GamepadDataFetcherMac();
+ virtual ~GamepadDataFetcherMac();
+ virtual void GetGamepadData(WebKit::WebGamepads* pads,
+ bool devices_changed_hint) OVERRIDE;
+ virtual void PauseHint(bool paused) OVERRIDE;
+ private:
+ bool enabled_;
+ base::mac::ScopedCFTypeRef<IOHIDManagerRef> hid_manager_ref_;
+
+ static GamepadDataFetcherMac* InstanceFromContext(void* context);
+ static void DeviceAddCallback(void* context,
+ IOReturn result,
+ void* sender,
+ IOHIDDeviceRef ref);
+ static void DeviceRemoveCallback(void* context,
+ IOReturn result,
+ void* sender,
+ IOHIDDeviceRef ref);
+ static void ValueChangedCallback(void* context,
+ IOReturn result,
+ void* sender,
+ IOHIDValueRef ref);
+
+ void DeviceAdd(IOHIDDeviceRef device);
+ void AddButtonsAndAxes(NSArray* elements, size_t slot);
+ void DeviceRemove(IOHIDDeviceRef device);
+ void ValueChanged(IOHIDValueRef value);
+
+ void RegisterForNotifications();
+ void UnregisterFromNotifications();
+
+ WebKit::WebGamepads data_;
+
+ // Side-band data that's not passed to the consumer, but we need to maintain
+ // to update data_.
+ struct AssociatedData {
+ IOHIDDeviceRef device_ref;
+ IOHIDElementRef button_elements[WebKit::WebGamepad::buttonsLengthCap];
+ IOHIDElementRef axis_elements[WebKit::WebGamepad::buttonsLengthCap];
+ CFIndex axis_minimums[WebKit::WebGamepad::axesLengthCap];
+ CFIndex axis_maximums[WebKit::WebGamepad::axesLengthCap];
+ };
+ AssociatedData associated_[WebKit::WebGamepads::itemsLengthCap];
+};
+
+} // namespace content
+
+#endif // CONTENT_BROWSER_GAMEPAD_DATA_FETCHER_MAC_H_
diff --git a/content/browser/gamepad/data_fetcher_mac.mm b/content/browser/gamepad/data_fetcher_mac.mm
new file mode 100644
index 0000000..b06f01a
--- /dev/null
+++ b/content/browser/gamepad/data_fetcher_mac.mm
@@ -0,0 +1,287 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "content/browser/gamepad/data_fetcher_mac.h"
+
+#include "base/mac/foundation_util.h"
+#include "base/memory/scoped_nsobject.h"
+#include "base/string16.h"
+#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
+
+#include <IOKit/hid/IOHIDKeys.h>
+#import <Foundation/Foundation.h>
+
+namespace content {
+
+namespace {
+
+NSDictionary* DeviceMatching(uint32_t usage_page, uint32_t usage) {
+ return [NSDictionary dictionaryWithObjectsAndKeys:
+ [NSNumber numberWithUnsignedInt:usage_page],
+ base::mac::CFToNSCast(CFSTR(kIOHIDDeviceUsagePageKey)),
+ [NSNumber numberWithUnsignedInt:usage],
+ base::mac::CFToNSCast(CFSTR(kIOHIDDeviceUsageKey)),
+ nil];
+}
+
+float NormalizeAxis(CFIndex value, CFIndex min, CFIndex max) {
+ return (2.f * (value - min) / static_cast<float>(max - min)) - 1.f;
+}
+
+// http://www.usb.org/developers/hidpage
+const uint32_t kGenericDesktopUsagePage = 0x01;
+const uint32_t kButtonUsagePage = 0x09;
+const uint32_t kJoystickUsageNumber = 0x04;
+const uint32_t kGameUsageNumber = 0x05;
+const uint32_t kMultiAxisUsageNumber = 0x08;
+const uint32_t kAxisMinimumUsageNumber = 0x30;
+const uint32_t kAxisMaximumUsageNumber = 0x35;
+
+} // namespace
+
+GamepadDataFetcherMac::GamepadDataFetcherMac() : enabled_(true) {
+ hid_manager_ref_.reset(IOHIDManagerCreate(kCFAllocatorDefault,
+ kIOHIDOptionsTypeNone));
+ if (CFGetTypeID(hid_manager_ref_) != IOHIDManagerGetTypeID()) {
+ enabled_ = false;
+ return;
+ }
+
+ scoped_nsobject<NSArray> criteria([[NSArray alloc] initWithObjects:
+ DeviceMatching(kGenericDesktopUsagePage, kJoystickUsageNumber),
+ DeviceMatching(kGenericDesktopUsagePage, kGameUsageNumber),
+ DeviceMatching(kGenericDesktopUsagePage, kMultiAxisUsageNumber),
+ nil]);
+ IOHIDManagerSetDeviceMatchingMultiple(
+ hid_manager_ref_,
+ base::mac::NSToCFCast(criteria));
+
+ RegisterForNotifications();
+}
+
+void GamepadDataFetcherMac::RegisterForNotifications() {
+ // Register for plug/unplug notifications.
+ IOHIDManagerRegisterDeviceMatchingCallback(
+ hid_manager_ref_,
+ &DeviceAddCallback,
+ this);
+ IOHIDManagerRegisterDeviceRemovalCallback(
+ hid_manager_ref_,
+ DeviceRemoveCallback,
+ this);
+
+ // Register for value change notifications.
+ IOHIDManagerRegisterInputValueCallback(
+ hid_manager_ref_,
+ ValueChangedCallback,
+ this);
+
+ IOHIDManagerScheduleWithRunLoop(
+ hid_manager_ref_,
+ CFRunLoopGetMain(),
+ kCFRunLoopDefaultMode);
+
+ enabled_ = IOHIDManagerOpen(hid_manager_ref_,
+ kIOHIDOptionsTypeSeizeDevice) == kIOReturnSuccess;
+}
+
+void GamepadDataFetcherMac::UnregisterFromNotifications() {
+ IOHIDManagerUnscheduleFromRunLoop(
+ hid_manager_ref_,
+ CFRunLoopGetCurrent(),
+ kCFRunLoopDefaultMode);
+ IOHIDManagerClose(hid_manager_ref_, kIOHIDOptionsTypeNone);
+}
+
+void GamepadDataFetcherMac::PauseHint(bool pause) {
+ if (pause)
+ UnregisterFromNotifications();
+ else
+ RegisterForNotifications();
+}
+
+GamepadDataFetcherMac::~GamepadDataFetcherMac() {
+ UnregisterFromNotifications();
+}
+
+GamepadDataFetcherMac* GamepadDataFetcherMac::InstanceFromContext(
+ void* context) {
+ return reinterpret_cast<GamepadDataFetcherMac*>(context);
+}
+
+void GamepadDataFetcherMac::DeviceAddCallback(void* context,
+ IOReturn result,
+ void* sender,
+ IOHIDDeviceRef ref) {
+ InstanceFromContext(context)->DeviceAdd(ref);
+}
+
+void GamepadDataFetcherMac::DeviceRemoveCallback(void* context,
+ IOReturn result,
+ void* sender,
+ IOHIDDeviceRef ref) {
+ InstanceFromContext(context)->DeviceRemove(ref);
+}
+
+void GamepadDataFetcherMac::ValueChangedCallback(void* context,
+ IOReturn result,
+ void* sender,
+ IOHIDValueRef ref) {
+ InstanceFromContext(context)->ValueChanged(ref);
+}
+
+void GamepadDataFetcherMac::AddButtonsAndAxes(NSArray* elements,
+ size_t slot) {
+ WebKit::WebGamepad& pad = data_.items[slot];
+ AssociatedData& associated = associated_[slot];
+
+ pad.axesLength = 0;
+ pad.buttonsLength = 0;
+ memset(pad.axes, 0, sizeof(pad.axes));
+ memset(pad.buttons, 0, sizeof(pad.buttons));
+
+ for (id elem in elements) {
+ IOHIDElementRef element = reinterpret_cast<IOHIDElementRef>(elem);
+ uint32_t usagePage = IOHIDElementGetUsagePage(element);
+ uint32_t usage = IOHIDElementGetUsage(element);
+ if (IOHIDElementGetType(element) == kIOHIDElementTypeInput_Button &&
+ usagePage == kButtonUsagePage) {
+ uint32_t button_index = usage - 1;
+ if (button_index < WebKit::WebGamepad::buttonsLengthCap) {
+ associated.button_elements[button_index] = element;
+ pad.buttonsLength = std::max(pad.buttonsLength, button_index + 1);
+ }
+ }
+ else if (IOHIDElementGetType(element) == kIOHIDElementTypeInput_Misc) {
+ uint32_t axis_index = usage - kAxisMinimumUsageNumber;
+ if (axis_index < WebKit::WebGamepad::axesLengthCap) {
+ associated.axis_minimums[axis_index] =
+ IOHIDElementGetLogicalMin(element);
+ associated.axis_maximums[axis_index] =
+ IOHIDElementGetLogicalMax(element);
+ associated.axis_elements[axis_index] = element;
+ pad.axesLength = std::max(pad.axesLength, axis_index + 1);
+ }
+ }
+ }
+}
+
+void GamepadDataFetcherMac::DeviceAdd(IOHIDDeviceRef device) {
+ using WebKit::WebGamepad;
+ using WebKit::WebGamepads;
+ using base::mac::CFToNSCast;
+ using base::mac::CFCastStrict;
+ size_t slot;
+
+ if (!enabled_)
+ return;
+
+ // Find an index for this device.
+ for (slot = 0; slot < WebGamepads::itemsLengthCap; ++slot) {
+ // If we already have this device, and it's already connected, don't do
+ // anything now.
+ if (associated_[slot].device_ref == device && data_.items[slot].connected)
+ return;
+ if (!data_.items[slot].connected)
+ break;
+ }
+
+ // We can't handle this many connected devices.
+ if (slot == WebGamepads::itemsLengthCap)
+ return;
+
+ NSNumber* vendor_id = CFToNSCast(CFCastStrict<CFNumberRef>(
+ IOHIDDeviceGetProperty(device, CFSTR(kIOHIDVendorIDKey))));
+ NSNumber* product_id = CFToNSCast(CFCastStrict<CFNumberRef>(
+ IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductIDKey))));
+ NSString* product = CFToNSCast(CFCastStrict<CFStringRef>(
+ IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey))));
+
+ NSString* ident([NSString stringWithFormat:
+ @"%@ (Vendor: %04x Product: %04x)",
+ product,
+ [vendor_id intValue],
+ [product_id intValue]]);
+ NSData* as16 = [ident dataUsingEncoding:NSUTF16StringEncoding];
+
+ const size_t kOutputLengthBytes = sizeof(data_.items[slot].id);
+ memset(&data_.items[slot].id, 0, kOutputLengthBytes);
+ [as16 getBytes:data_.items[slot].id
+ length:kOutputLengthBytes - sizeof(WebKit::WebUChar)];
+
+ base::mac::ScopedCFTypeRef<CFArrayRef> elements(
+ IOHIDDeviceCopyMatchingElements(device, NULL, kIOHIDOptionsTypeNone));
+ AddButtonsAndAxes(CFToNSCast(elements), slot);
+
+ associated_[slot].device_ref = device;
+ data_.items[slot].connected = true;
+ if (slot >= data_.length)
+ data_.length = slot + 1;
+}
+
+void GamepadDataFetcherMac::DeviceRemove(IOHIDDeviceRef device) {
+ using WebKit::WebGamepads;
+ size_t slot;
+ if (!enabled_)
+ return;
+
+ // Find the index for this device.
+ for (slot = 0; slot < WebGamepads::itemsLengthCap; ++slot) {
+ if (associated_[slot].device_ref == device && data_.items[slot].connected)
+ break;
+ }
+ DCHECK(slot < WebGamepads::itemsLengthCap);
+ // Leave associated device_ref so that it will be reconnected in the same
+ // location. Simply mark it as disconnected.
+ data_.items[slot].connected = false;
+}
+
+void GamepadDataFetcherMac::ValueChanged(IOHIDValueRef value) {
+ if (!enabled_)
+ return;
+
+ IOHIDElementRef element = IOHIDValueGetElement(value);
+ IOHIDDeviceRef device = IOHIDElementGetDevice(element);
+
+ // Find device slot.
+ size_t slot;
+ for (slot = 0; slot < data_.length; ++slot) {
+ if (data_.items[slot].connected && associated_[slot].device_ref == device)
+ break;
+ }
+ if (slot == data_.length)
+ return;
+
+ WebKit::WebGamepad& pad = data_.items[slot];
+ AssociatedData& associated = associated_[slot];
+
+ // Find and fill in the associated button event, if any.
+ for (size_t i = 0; i < pad.buttonsLength; ++i) {
+ if (associated.button_elements[i] == element) {
+ pad.buttons[i] = IOHIDValueGetIntegerValue(value) ? 1.f : 0.f;
+ return;
+ }
+ }
+
+ // Find and fill in the associated axis event, if any.
+ for (size_t i = 0; i < pad.axesLength; ++i) {
+ if (associated.axis_elements[i] == element) {
+ pad.axes[i] = NormalizeAxis(IOHIDValueGetIntegerValue(value),
+ associated.axis_minimums[i],
+ associated.axis_maximums[i]);
+ return;
+ }
+ }
+}
+
+void GamepadDataFetcherMac::GetGamepadData(WebKit::WebGamepads* pads, bool) {
+ if (!enabled_) {
+ pads->length = 0;
+ return;
+ }
+ memcpy(pads, &data_, sizeof(WebKit::WebGamepads));
+}
+
+} // namespace content
diff --git a/content/browser/gamepad/gamepad_provider.cc b/content/browser/gamepad/gamepad_provider.cc
index c16245b..54d38a5 100644
--- a/content/browser/gamepad/gamepad_provider.cc
+++ b/content/browser/gamepad/gamepad_provider.cc
@@ -19,6 +19,8 @@
#if defined(OS_WIN)
#include "content/browser/gamepad/data_fetcher_win.h"
+#elif defined(OS_MACOSX)
+#include "content/browser/gamepad/data_fetcher_mac.h"
#endif
namespace content {
@@ -29,6 +31,10 @@ namespace content {
typedef GamepadDataFetcherWindows GamepadPlatformDataFetcher;
+#elif defined(OS_MACOSX)
+
+typedef GamepadDataFetcherMac GamepadPlatformDataFetcher;
+
#else
class GamepadEmptyDataFetcher : public GamepadDataFetcher {
@@ -80,8 +86,12 @@ base::SharedMemoryHandle GamepadProvider::GetRendererSharedMemoryHandle(
}
void GamepadProvider::Pause() {
- base::AutoLock lock(is_paused_lock_);
- is_paused_ = true;
+ {
+ base::AutoLock lock(is_paused_lock_);
+ is_paused_ = true;
+ }
+ if (data_fetcher_.get())
+ data_fetcher_->PauseHint(true);
}
void GamepadProvider::Resume() {
@@ -91,6 +101,8 @@ void GamepadProvider::Resume() {
return;
is_paused_ = false;
}
+ if (data_fetcher_.get())
+ data_fetcher_->PauseHint(false);
MessageLoop* polling_loop = polling_thread_->message_loop();
polling_loop->PostTask(
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index c5faabe..fde5730 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -209,6 +209,8 @@
'browser/font_list_async.cc',
'browser/font_list_async.h',
'browser/gamepad/data_fetcher.h',
+ 'browser/gamepad/data_fetcher_mac.mm',
+ 'browser/gamepad/data_fetcher_mac.h',
'browser/gamepad/data_fetcher_win.cc',
'browser/gamepad/data_fetcher_win.h',
'browser/gamepad/gamepad_provider.cc',