From 3a1ed8a8a96e3b147b1ac998ff68d201b50a2f2c Mon Sep 17 00:00:00 2001 From: Doug Turner Date: Fri, 21 Aug 2009 13:49:43 -0700 Subject: [PATCH] Bug 511902 - Device Orientation Support - cocoa. r=josh --- widget/src/cocoa/Makefile.in | 1 + widget/src/cocoa/nsAccelerometerX.h | 59 ++++++++++ widget/src/cocoa/nsAccelerometerX.mm | 168 +++++++++++++++++++++++++++ widget/src/cocoa/nsWidgetFactory.mm | 6 + 4 files changed, 234 insertions(+) create mode 100644 widget/src/cocoa/nsAccelerometerX.h create mode 100644 widget/src/cocoa/nsAccelerometerX.mm diff --git a/widget/src/cocoa/Makefile.in b/widget/src/cocoa/Makefile.in index da463aabbee..31ac378e983 100644 --- a/widget/src/cocoa/Makefile.in +++ b/widget/src/cocoa/Makefile.in @@ -111,6 +111,7 @@ CMMSRCS = \ nsPrintSettingsX.mm \ nsPrintSessionX.mm \ nsIdleServiceX.mm \ + nsAccelerometerX.mm \ $(NULL) XPIDLSRCS += \ diff --git a/widget/src/cocoa/nsAccelerometerX.h b/widget/src/cocoa/nsAccelerometerX.h new file mode 100644 index 00000000000..c70459087e5 --- /dev/null +++ b/widget/src/cocoa/nsAccelerometerX.h @@ -0,0 +1,59 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Doug Turner + * Portions created by the Initial Developer are Copyright (C) 2009 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef nsAccelerometerX_h +#define nsAccelerometerX_h + +#include +#include + +#include "nsAccelerometer.h" + +class nsAccelerometerX : public nsAccelerometer +{ + public: + nsAccelerometerX(); + ~nsAccelerometerX(); + + void Startup(); + void Shutdown(); + + io_connect_t mSmsConnection; + nsCOMPtr mUpdateTimer; + static void UpdateHandler(nsITimer *aTimer, void *aClosure); +}; + +#endif diff --git a/widget/src/cocoa/nsAccelerometerX.mm b/widget/src/cocoa/nsAccelerometerX.mm new file mode 100644 index 00000000000..8fcd84ab5bc --- /dev/null +++ b/widget/src/cocoa/nsAccelerometerX.mm @@ -0,0 +1,168 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Doug Turner + * Portions created by the Initial Developer are Copyright (C) 2009 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsAccelerometerX.h" +#include "nsIServiceManager.h" +#include "stdlib.h" + +nsAccelerometerX::nsAccelerometerX() +{ +} + +nsAccelerometerX::~nsAccelerometerX() +{ +} + +// Data format returned from IOConnectMethodStructureIStructureO. +// I am not sure what the other bits in this structure are, +// or if there are any, but this has to be 40 bytes long or +// the call to read fails. + +typedef struct +{ + PRInt16 x; + PRInt16 y; + PRInt16 z; + PRInt8 unknown[34]; +} SmsData; + +void +nsAccelerometerX::UpdateHandler(nsITimer *aTimer, void *aClosure) +{ + nsAccelerometerX *self = reinterpret_cast(aClosure); + if (!self) { + NS_ERROR("no self"); + return; + } + + const int bufferLen = sizeof(SmsData); + + void * input = malloc(bufferLen); + void * output = malloc(bufferLen); + + if (!input || !output) + return; + + memset(input, 0, bufferLen); + memset(output, 0, bufferLen); + + IOByteCount structureOutputSize = bufferLen; + kern_return_t result = ::IOConnectMethodStructureIStructureO(self->mSmsConnection, + 5, /* Magic number for SMCMotionSensor */ + bufferLen, + &structureOutputSize, + input, + output); + if (result != kIOReturnSuccess) { + free(input); + free(output); + return; + } + + SmsData *data = (SmsData*) output; + + float xf, yf, zf; + + // we want to normalize the return result from the chip to + // something between -1 and 1 where 0 is the balance point. + + const int normalizeFactor = 250.5; + + // x seems to be the opposite of what i would expect. we want lifting the + // right side of the MacBookPro to mean a negative x. + + xf = ((float)data->x) / normalizeFactor * (-1); + yf = ((float)data->y) / normalizeFactor; + zf = ((float)data->z) / normalizeFactor; + + free(input); + free(output); + + self->AccelerationChanged( xf, yf, zf ); +} + +void nsAccelerometerX::Startup() +{ + // we can fail, and that just means the caller will not see any changes. + + mach_port_t port; + kern_return_t result = ::IOMasterPort(MACH_PORT_NULL, &port); + if (result != kIOReturnSuccess) + return; + + CFMutableDictionaryRef dict = ::IOServiceMatching("SMCMotionSensor"); + if (!dict) + return; + + io_iterator_t iter; + result = ::IOServiceGetMatchingServices(port, dict, &iter); + if (result != kIOReturnSuccess) + return; + + io_object_t device = ::IOIteratorNext(iter); + + ::IOObjectRelease(iter); + + if (!device) + return; + + result = ::IOServiceOpen(device, mach_task_self(), 0, &mSmsConnection); + ::IOObjectRelease(device); + + if (result != kIOReturnSuccess) + return; + + mach_port_deallocate(mach_task_self(), port); + + mUpdateTimer = do_CreateInstance("@mozilla.org/timer;1"); + if (mUpdateTimer) + mUpdateTimer->InitWithFuncCallback(UpdateHandler, + this, + 200, /* todo -- we want to pref this? or maybe add this to some API? */ + nsITimer::TYPE_REPEATING_SLACK); +} + +void nsAccelerometerX::Shutdown() +{ + if (mSmsConnection) + ::IOServiceClose(mSmsConnection); + + if (mUpdateTimer) { + mUpdateTimer->Cancel(); + mUpdateTimer = nsnull; + } +} + diff --git a/widget/src/cocoa/nsWidgetFactory.mm b/widget/src/cocoa/nsWidgetFactory.mm index 858332021a2..9863996bf55 100644 --- a/widget/src/cocoa/nsWidgetFactory.mm +++ b/widget/src/cocoa/nsWidgetFactory.mm @@ -57,6 +57,7 @@ #include "nsLookAndFeel.h" +#include "nsAccelerometerX.h" #include "nsSound.h" #include "nsIdleServiceX.h" @@ -71,6 +72,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFilePicker) NS_GENERIC_FACTORY_CONSTRUCTOR(nsToolkit) NS_GENERIC_FACTORY_CONSTRUCTOR(nsLookAndFeel) NS_GENERIC_FACTORY_CONSTRUCTOR(nsSound) +NS_GENERIC_FACTORY_CONSTRUCTOR(nsAccelerometerX) NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransferable) NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLFormatConverter) NS_GENERIC_FACTORY_CONSTRUCTOR(nsClipboard) @@ -125,6 +127,10 @@ static const nsModuleComponentInfo gComponents[] = NS_SOUND_CID, "@mozilla.org/sound;1", nsSoundConstructor }, + { "Accelerometer", + NS_ACCELEROMETER_CID, + NS_ACCELEROMETER_CONTRACTID, + nsAccelerometerXConstructor }, { "Transferable", NS_TRANSFERABLE_CID, "@mozilla.org/widget/transferable;1",