Make plain executables foreground processes.
Non-bundled executables are started as background processes which does not have a dock icon or a task switcher entry. This is generally not what we want for Qt gui applications so change the process type. Change-Id: I0d29eb9b70655e95bc0b9500803fbf3955d264e4 Reviewed-on: http://codereview.qt.nokia.com/3387 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
This commit is contained in:
parent
12b55d9631
commit
38364209a9
@ -12,7 +12,8 @@ OBJECTIVE_SOURCES += main.mm \
|
||||
qcocoaglcontext.mm \
|
||||
qcocoanativeinterface.mm \
|
||||
qcocoaeventdispatcher.mm \
|
||||
qcocoamenuloader.mm
|
||||
qcocoamenuloader.mm \
|
||||
qcocoahelpers.mm \
|
||||
|
||||
HEADERS += qcocoaintegration.h \
|
||||
qcocoabackingstore.h \
|
||||
@ -23,7 +24,9 @@ HEADERS += qcocoaintegration.h \
|
||||
qcocoaglcontext.h \
|
||||
qcocoanativeinterface.h \
|
||||
qcocoaeventdispatcher.h \
|
||||
qcocoamenuloader.h
|
||||
qcocoamenuloader.h \
|
||||
qcocoahelpers.h \
|
||||
|
||||
|
||||
RESOURCES += qcocoaresources.qrc
|
||||
|
||||
|
81
src/plugins/platforms/cocoa/qcocoahelpers.h
Normal file
81
src/plugins/platforms/cocoa/qcocoahelpers.h
Normal file
@ -0,0 +1,81 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** All rights reserved.
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
** This file is part of the plugins of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU Lesser
|
||||
** General Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU General
|
||||
** Public License version 3.0 as published by the Free Software Foundation
|
||||
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU General
|
||||
** Public License version 3.0 requirements will be met:
|
||||
** http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef QCOCOAHELPERS_H
|
||||
#define QCOCOAHELPERS_H
|
||||
|
||||
//
|
||||
// W A R N I N G
|
||||
// -------------
|
||||
//
|
||||
// This file is not part of the Qt API. It provides helper functions
|
||||
// for the Cocoa lighthouse plugin. This header file may
|
||||
// change from version to version without notice, or even be removed.
|
||||
//
|
||||
// We mean it.
|
||||
//
|
||||
|
||||
#include <QtCore/private/qcore_mac_p.h>
|
||||
#include <Cocoa/Cocoa.h>
|
||||
|
||||
class QString;
|
||||
|
||||
// Conversion functions
|
||||
QStringList qt_mac_NSArrayToQStringList(void *nsarray);
|
||||
void *qt_mac_QStringListToNSMutableArrayVoid(const QStringList &list);
|
||||
|
||||
inline NSMutableArray *qt_mac_QStringListToNSMutableArray(const QStringList &qstrlist)
|
||||
{ return reinterpret_cast<NSMutableArray *>(qt_mac_QStringListToNSMutableArrayVoid(qstrlist)); }
|
||||
|
||||
inline QString qt_mac_NSStringToQString(const NSString *nsstr)
|
||||
{ return QCFString::toQString(reinterpret_cast<const CFStringRef>(nsstr)); }
|
||||
|
||||
inline NSString *qt_mac_QStringToNSString(const QString &qstr)
|
||||
{ return [reinterpret_cast<const NSString *>(QCFString::toCFStringRef(qstr)) autorelease]; }
|
||||
|
||||
// Misc
|
||||
|
||||
void qt_mac_transformProccessToForegroundApplication();
|
||||
|
||||
|
||||
|
||||
#endif //QCOCOAHELPERS_H
|
||||
|
120
src/plugins/platforms/cocoa/qcocoahelpers.mm
Normal file
120
src/plugins/platforms/cocoa/qcocoahelpers.mm
Normal file
@ -0,0 +1,120 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
||||
** All rights reserved.
|
||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
||||
**
|
||||
** This file is part of the plugins of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:LGPL$
|
||||
** GNU Lesser General Public License Usage
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU Lesser
|
||||
** General Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU General
|
||||
** Public License version 3.0 as published by the Free Software Foundation
|
||||
** and appearing in the file LICENSE.GPL included in the packaging of this
|
||||
** file. Please review the following information to ensure the GNU General
|
||||
** Public License version 3.0 requirements will be met:
|
||||
** http://www.gnu.org/copyleft/gpl.html.
|
||||
**
|
||||
** Other Usage
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
**
|
||||
** $QT_END_LICENSE$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "qcocoahelpers.h"
|
||||
|
||||
#include <QtCore>
|
||||
#include <QtGui>
|
||||
|
||||
//
|
||||
// Conversion Functions
|
||||
//
|
||||
|
||||
QStringList qt_mac_NSArrayToQStringList(void *nsarray)
|
||||
{
|
||||
QStringList result;
|
||||
NSArray *array = static_cast<NSArray *>(nsarray);
|
||||
for (NSUInteger i=0; i<[array count]; ++i)
|
||||
result << qt_mac_NSStringToQString([array objectAtIndex:i]);
|
||||
return result;
|
||||
}
|
||||
|
||||
void *qt_mac_QStringListToNSMutableArrayVoid(const QStringList &list)
|
||||
{
|
||||
NSMutableArray *result = [NSMutableArray arrayWithCapacity:list.size()];
|
||||
for (int i=0; i<list.size(); ++i){
|
||||
[result addObject:reinterpret_cast<const NSString *>(QCFString::toCFStringRef(list[i]))];
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// Misc
|
||||
//
|
||||
|
||||
// Changes the process type for this process to kProcessTransformToForegroundApplication,
|
||||
// unless either LSUIElement or LSBackgroundOnly is set in the Info.plist.
|
||||
void qt_mac_transformProccessToForegroundApplication()
|
||||
{
|
||||
ProcessSerialNumber psn;
|
||||
if (GetCurrentProcess(&psn) == noErr) {
|
||||
bool forceTransform = true;
|
||||
CFTypeRef value = CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(),
|
||||
CFSTR("LSUIElement"));
|
||||
if (value) {
|
||||
CFTypeID valueType = CFGetTypeID(value);
|
||||
// Officially it's supposed to be a string, a boolean makes sense, so we'll check.
|
||||
// A number less so, but OK.
|
||||
if (valueType == CFStringGetTypeID())
|
||||
forceTransform = !(QCFString::toQString(static_cast<CFStringRef>(value)).toInt());
|
||||
else if (valueType == CFBooleanGetTypeID())
|
||||
forceTransform = !CFBooleanGetValue(static_cast<CFBooleanRef>(value));
|
||||
else if (valueType == CFNumberGetTypeID()) {
|
||||
int valueAsInt;
|
||||
CFNumberGetValue(static_cast<CFNumberRef>(value), kCFNumberIntType, &valueAsInt);
|
||||
forceTransform = !valueAsInt;
|
||||
}
|
||||
}
|
||||
|
||||
if (forceTransform) {
|
||||
value = CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(),
|
||||
CFSTR("LSBackgroundOnly"));
|
||||
if (value) {
|
||||
CFTypeID valueType = CFGetTypeID(value);
|
||||
if (valueType == CFBooleanGetTypeID())
|
||||
forceTransform = !CFBooleanGetValue(static_cast<CFBooleanRef>(value));
|
||||
else if (valueType == CFStringGetTypeID())
|
||||
forceTransform = !(QCFString::toQString(static_cast<CFStringRef>(value)).toInt());
|
||||
else if (valueType == CFNumberGetTypeID()) {
|
||||
int valueAsInt;
|
||||
CFNumberGetValue(static_cast<CFNumberRef>(value), kCFNumberIntType, &valueAsInt);
|
||||
forceTransform = !valueAsInt;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (forceTransform) {
|
||||
TransformProcessType(&psn, kProcessTransformToForegroundApplication);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -46,6 +46,7 @@
|
||||
#include "qcocoanativeinterface.h"
|
||||
#include "qcocoamenuloader.h"
|
||||
#include "qcocoaeventdispatcher.h"
|
||||
#include "qcocoahelpers.h"
|
||||
|
||||
#include <QtPlatformSupport/private/qbasicunixfontdatabase_p.h>
|
||||
|
||||
@ -81,12 +82,20 @@ QCocoaIntegration::QCocoaIntegration()
|
||||
[NSApplication sharedApplication];
|
||||
// [[OurApplication alloc] init];
|
||||
|
||||
// Applications launched from plain executables (without an app
|
||||
// bundle) are "background" applications that does not take keybaord
|
||||
// focus or have a dock icon or task switcher entry. Qt Gui apps generally
|
||||
// wants to be foreground applications so change the process type. (But
|
||||
// see the function implementation for exceptions.)
|
||||
qt_mac_transformProccessToForegroundApplication();
|
||||
|
||||
// Move the application window to front to avoid launching behind the terminal.
|
||||
// Ignoring other apps is neccessary (we must ignore the terminal), but makes
|
||||
// Qt apps play slightly less nice with other apps when lanching from Finder
|
||||
// (See the activateIgnoringOtherApps docs.)
|
||||
[[NSApplication sharedApplication] activateIgnoringOtherApps : YES];
|
||||
|
||||
// Load the application menu. This menu contains Preferences, Hide, Quit.
|
||||
QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader = [[QT_MANGLE_NAMESPACE(QCocoaMenuLoader) alloc] init];
|
||||
qt_mac_loadMenuNib(qtMenuLoader);
|
||||
[[NSApplication sharedApplication] setMenu:[qtMenuLoader menu]];
|
||||
|
Loading…
Reference in New Issue
Block a user