FCL/sf/mw/qtextensions: comparison qtmobility/src/systeminfo/qsysteminfo

equal deleted inserted replaced

-:06b8e2af4411
+:6fbed849b4f4
 #include <net/if_types.h>
 #include <net/if_media.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 static QString stringFromCFString(CFStringRef value) {
 QString retVal;
 if(CFStringGetLength(value) > 1) {
 CFIndex maxLength = 2 * CFStringGetLength(value) + 1/*zero term*/; // max UTF8
 char *cstring = new char[maxLength];
 #endif
 NSObject* delegate;
 QTM_BEGIN_NAMESPACE
+Q_GLOBAL_STATIC(QSystemDeviceInfoPrivate, qsystemDeviceInfoPrivate)
 QSystemInfoPrivate *QSystemInfoPrivate::self = 0;
 QSystemInfoPrivate::QSystemInfoPrivate(QObject *parent)
 : QObject(parent)
 {
 QSystemInfoPrivate::~QSystemInfoPrivate()
 {
 if(langloopThread->isRunning()) {
 langloopThread->quit();
-langloopThread->wait();
 }
 }
 QString QSystemInfoPrivate::currentLanguage() const
 {
 return;
 }
 #ifdef MAC_SDK_10_6
-#endif
+QtMLangListener *langListener;
+#endif
 QLangLoopThread::QLangLoopThread(QObject *parent)
 :QThread(parent)
 {
 }
 void QLangLoopThread::quit()
 {
 mutex.lock();
 keepRunning = false;
+CFRunLoopStop(CFRunLoopGetCurrent());
+#ifdef MAC_SDK_10_6
+[langListener release];
+#endif
 mutex.unlock();
+wait();
 }
 void QLangLoopThread::run()
 {
 #ifdef MAC_SDK_10_6
 mutex.lock();
 keepRunning = true;
 mutex.unlock();
 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-QtMLangListener *listener;
+langListener = [[QtMLangListener alloc] init];
-listener = [[QtMLangListener alloc] init];
 NSDate *loopUntil = [NSDate dateWithTimeIntervalSinceNow:1.0];
 while (keepRunning &&
 [[NSRunLoop currentRunLoop] runMode: NSDefaultRunLoopMode beforeDate: loopUntil]) {
 loopUntil = [NSDate dateWithTimeIntervalSinceNow:1.0];
 {
 }
 QRunLoopThread::~QRunLoopThread()
 {
-#ifdef MAC_SDK_10_6
+}
-[listener dealloc];
-#endif
+void QRunLoopThread::stop()
-}
+{
-void QRunLoopThread::quit()
-{
-CFRelease(runloopSource);
 mutex.lock();
 keepRunning = false;
 mutex.unlock();
-CFRelease(storeSession);
+#ifdef MAC_SDK_10_6
+[listener release];
+[delegate release];
+#endif
+if(currentThread() != this) {
+QMetaObject::invokeMethod(this, "quit",
+Qt::QueuedConnection);
+} else {
+quit();
+}
+wait();
 }
 void QRunLoopThread::run()
 {
 keepRunning = true;
 mutex.unlock();
 listener = [[QtMNSListener alloc] init];
-NSDate *loopUntil = [NSDate dateWithTimeIntervalSinceNow:1.0];
+SInt32 result;
 while (keepRunning &&
-[[NSRunLoop currentRunLoop] runMode: NSDefaultRunLoopMode beforeDate: loopUntil]) {
+(result = CFRunLoopRunInMode(kCFRunLoopDefaultMode ,5, YES))) {
-loopUntil = [NSDate dateWithTimeIntervalSinceNow:1.0];
+}
-}
+CFRunLoopStop(CFRunLoopGetCurrent());
 [pool release];
 #endif
 }
 void QRunLoopThread::startNetworkChangeLoop()
 CFRelease(storeSession);
 return;
 }
 CFRunLoopAddSource(CFRunLoopGetCurrent(), runloopSource, kCFRunLoopDefaultMode);
+CFRelease(runloopSource);
+CFRelease(storeSession);
 return;
+}
+static bool isBtPowerOn()
+{
+//depreciated yes, but what's the replacement?
+BluetoothHCIPowerState powerState;
+IOBluetoothLocalDeviceGetPowerState(&powerState);
+if(powerState == kBluetoothHCIPowerStateON)
+return true;
+return false;
+}
+void btPowerStateChange(void *ref, io_service_t /*service*/, natural_t messageType, void */*info*/)
+{
+QBluetoothListenerThread * thread = reinterpret_cast< QBluetoothListenerThread *>(ref);
+switch (messageType) {
+case kIOMessageDeviceWillPowerOff:
+{
+if(!isBtPowerOn())
+thread->emitBtPower(false);
+}
+break;
+case kIOMessageDeviceHasPoweredOn:
+{
+if(isBtPowerOn())
+thread->emitBtPower(true);
+}
+break;
+}
+}
+QBluetoothListenerThread::QBluetoothListenerThread(QObject *parent)
+:QThread(parent)
+{
+setTerminationEnabled(true);
+}
+QBluetoothListenerThread::~QBluetoothListenerThread()
+{
+if(isRunning()) {
+terminate();
+wait();
+}
+}
+void QBluetoothListenerThread::stop()
+{
+mutex.lock();
+keepRunning = false;
+mutex.unlock();
+if(CFRunLoopContainsSource(rl,rls,kCFRunLoopDefaultMode)) {
+CFRunLoopRemoveSource(rl,
+rls,
+kCFRunLoopDefaultMode);
+CFRunLoopStop(rl);
+}
+if(currentThread() != this) {
+QMetaObject::invokeMethod(this, "quit",
+Qt::QueuedConnection);
+} else {
+quit();
+}
+mutex.lock();
+IONotificationPortDestroy(port);
+mutex.unlock();
+}
+void QBluetoothListenerThread::run()
+{
+#ifdef MAC_SDK_10_6
+mutex.lock();
+keepRunning = true;
+mutex.unlock();
+NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+io_object_t notifyObject;
+io_service_t bluetoothservice;
+io_iterator_t ioIterator;
+mach_port_t masterPort;
+CFMutableDictionaryRef serviceMatchDict;
+if (0 != IOMasterPort(MACH_PORT_NULL, &masterPort)) {
+qDebug() << "IOMasterPort failed";
+}
+serviceMatchDict = IOServiceMatching("IOBluetoothHCIController");
+if (NULL == serviceMatchDict) {
+qDebug() << "IOServiceMatching failed";
+}
+if (0 != IOServiceGetMatchingServices(masterPort, serviceMatchDict, &ioIterator)) {
+qDebug() << "IOServiceGetMatchingServices failed";
+}
+IOReturn ret;
+bluetoothservice = IOIteratorNext(ioIterator);
+if (0 == bluetoothservice) {
+IOObjectRelease(ioIterator);
+qDebug() << "IOIteratorNext failed";
+}
+IOObjectRelease(ioIterator);
+port = IONotificationPortCreate(masterPort);
+if (0 == port) {
+qDebug() << "IONotificationPortCreate failed";
+}
+ret = IOServiceAddInterestNotification(port, bluetoothservice,
+kIOGeneralInterest, btPowerStateChange,
+this, &notifyObject);
+if(ret != kIOReturnSuccess) {
+qDebug() << "IOServiceAddInterestNotification failed";
+return;
+}
+rl = CFRunLoopGetCurrent();
+rls = IONotificationPortGetRunLoopSource(port);
+CFRunLoopAddSource(rl,
+rls,
+kCFRunLoopDefaultMode);
+SInt32 result;
+while (keepRunning &&
+(result = CFRunLoopRunInMode(kCFRunLoopDefaultMode ,1, NO))) {
+}
+CFRunLoopStop(rl);
+IOObjectRelease(bluetoothservice);
+CFRunLoopRemoveSource(rl,
+rls,
+kCFRunLoopDefaultMode);
+[pool release];
+#endif
+}
+void QBluetoothListenerThread::emitBtPower(bool b)
+{
+Q_EMIT bluetoothPower(b);
 }
 QSystemNetworkInfoPrivate::QSystemNetworkInfoPrivate(QObject *parent)
 : QObject(parent), signalStrengthCache(0)
 {
 defaultInterface = "";
 qRegisterMetaType<QSystemNetworkInfo::NetworkMode>("QSystemNetworkInfo::NetworkMode");
 qRegisterMetaType<QSystemNetworkInfo::NetworkStatus>("QSystemNetworkInfo::NetworkStatus");
 #ifdef MAC_SDK_10_6
 if([[CWInterface supportedInterfaces] count] > 0 ) {
 hasWifi = true;
 } else {
 hasWifi = false;
 QSystemNetworkInfoPrivate::~QSystemNetworkInfoPrivate()
 {
 #ifdef MAC_SDK_10_6
 if(hasWifi && runloopThread->isRunning()) {
-runloopThread->quit();
+runloopThread->stop();
-runloopThread->wait();
-[delegate release];
 }
 #endif
 }
 void QSystemNetworkInfoPrivate::primaryInterface()
 }
 }
 return drivesList;
 }
-QSystemDeviceInfoPrivate *QSystemDeviceInfoPrivate::self = 0;
 void powerInfoChanged(void* runLoopInfo)
 {
 Q_UNUSED(runLoopInfo)
 QSystemDeviceInfoPrivate::instance()->batteryLevel();
 QSystemDeviceInfoPrivate::instance()->currentPowerState();
 }
 QSystemDeviceInfoPrivate::QSystemDeviceInfoPrivate(QObject *parent)
-: QObject(parent)
+: QObject(parent),btThread(0)
 {
 batteryLevelCache = 0;
 currentPowerStateCache = QSystemDeviceInfo::UnknownPower;
 batteryStatusCache = QSystemDeviceInfo::NoBatteryLevel;
-CFRunLoopSourceRef runLoopSource = (CFRunLoopSourceRef)IOPSNotificationCreateRunLoopSource(powerInfoChanged, this);
-if (runLoopSource) {
-CFRunLoopAddSource(CFRunLoopGetCurrent(), runLoopSource, kCFRunLoopDefaultMode);
-CFRelease(runLoopSource);
-}
-if(!self)
-self = this;
 }
 QSystemDeviceInfoPrivate::~QSystemDeviceInfoPrivate()
 {
-}
+btThread->stop();
+}
+QSystemDeviceInfoPrivate *QSystemDeviceInfoPrivate::instance()
+{
+return qsystemDeviceInfoPrivate();
+}
+void QSystemDeviceInfoPrivate::connectNotify(const char *signal)
+{
+if (QLatin1String(signal) == SIGNAL(bluetoothStateChanged(bool))) {
+if(!btThread) {
+btThread = new QBluetoothListenerThread(this);
+btThread->start();
+connect(btThread,SIGNAL(bluetoothPower(bool)), this, SIGNAL(bluetoothStateChanged(bool)));
+}
+}
+if (QLatin1String(signal) == SIGNAL(powerStateChanged(QSystemDeviceInfo::PowerState))) {
+CFRunLoopSourceRef runLoopSource = (CFRunLoopSourceRef)IOPSNotificationCreateRunLoopSource(powerInfoChanged, this);
+if (runLoopSource) {
+CFRunLoopAddSource(CFRunLoopGetCurrent(), runLoopSource, kCFRunLoopDefaultMode);
+CFRelease(runLoopSource);
+}
+}
+}
+void QSystemDeviceInfoPrivate::disconnectNotify(const char *signal)
+{
+if (QLatin1String(signal) == SIGNAL(bluetoothStateChanged(bool))) {
+if(btThread->isRunning()) {
+btThread->stop();
+}
+}
+}
 QSystemDeviceInfo::Profile QSystemDeviceInfoPrivate::currentProfile()
 {
 return QSystemDeviceInfo::UnknownProfile;
 }

changeset 14	6fbed849b4f4
parent 11	06b8e2af4411