summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/io/qfile.cpp5
-rw-r--r--src/corelib/io/qfileinfo.cpp22
-rw-r--r--src/corelib/io/qfileinfo.h1
-rw-r--r--src/corelib/tools/qbitarray.cpp29
-rw-r--r--src/corelib/tools/qdatetime.cpp23
-rw-r--r--src/corelib/tools/qdatetime.h3
-rw-r--r--src/gui/kernel/qpalette.h9
-rw-r--r--src/gui/kernel/qscreen.cpp17
-rw-r--r--src/gui/kernel/qscreen.h2
-rw-r--r--src/gui/kernel/qwindow.cpp2
-rw-r--r--src/gui/text/qfontengine_qpf.cpp1202
-rw-r--r--src/gui/text/qfontengine_qpf_p.h299
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.cpp6
-rw-r--r--src/widgets/dialogs/qmessagebox.cpp51
-rw-r--r--src/widgets/kernel/qsizepolicy.h21
15 files changed, 127 insertions, 1565 deletions
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
index e46ba28f47..d991e86839 100644
--- a/src/corelib/io/qfile.cpp
+++ b/src/corelib/io/qfile.cpp
@@ -421,12 +421,15 @@ QFile::exists() const
/*!
Returns true if the file specified by \a fileName exists; otherwise
returns false.
+
+ \note If \a fileName is a symlink that points to a non-existing
+ file, false is returned.
*/
bool
QFile::exists(const QString &fileName)
{
- return QFileInfo(fileName).exists();
+ return QFileInfo::exists(fileName);
}
/*!
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index 93444cb47c..1d5f16c9d9 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -667,6 +667,28 @@ bool QFileInfo::exists() const
}
/*!
+ Returns true if the \a file exists; otherwise returns false.
+
+ \note If \a file is a symlink that points to a non-existing
+ file, false is returned.
+
+ \note Using this function is faster for than using
+ \c QFileInfo(file).exists() for file system access.
+*/
+bool QFileInfo::exists(const QString &file)
+{
+ QFileSystemEntry entry(file);
+ QFileSystemMetaData data;
+ QAbstractFileEngine *engine =
+ QFileSystemEngine::resolveEntryAndCreateLegacyEngine(entry, data);
+ // Expensive fallback to non-QFileSystemEngine implementation
+ if (engine)
+ return QFileInfo(file).exists();
+ QFileSystemEngine::fillMetaData(entry, data, QFileSystemMetaData::ExistsAttribute);
+ return data.exists();
+}
+
+/*!
Refreshes the information about the file, i.e. reads in information
from the file system the next time a cached property is fetched.
diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h
index 211c18d0a0..0f18261943 100644
--- a/src/corelib/io/qfileinfo.h
+++ b/src/corelib/io/qfileinfo.h
@@ -84,6 +84,7 @@ public:
void setFile(const QFile &file);
void setFile(const QDir &dir, const QString &file);
bool exists() const;
+ static bool exists(const QString &file);
void refresh();
QString filePath() const;
diff --git a/src/corelib/tools/qbitarray.cpp b/src/corelib/tools/qbitarray.cpp
index fb60534495..42e29f641c 100644
--- a/src/corelib/tools/qbitarray.cpp
+++ b/src/corelib/tools/qbitarray.cpp
@@ -169,30 +169,25 @@ QBitArray::QBitArray(int size, bool value)
int QBitArray::count(bool on) const
{
int numBits = 0;
- int len = size();
-#if 0
- for (int i = 0; i < len; ++i)
- numBits += testBit(i);
-#else
const quint8 *bits = reinterpret_cast<const quint8 *>(d.data()) + 1;
- while (len >= 32) {
+
+ // the loops below will try to read from *end
+ // it's the QByteArray implicit NUL, so it will not change the bit count
+ const quint8 *const end = reinterpret_cast<const quint8 *>(d.end());
+
+ while (bits + 3 <= end) {
quint32 v = quint32(bits[0]) | (quint32(bits[1]) << 8) | (quint32(bits[2]) << 16) | (quint32(bits[3]) << 24);
- len -= 32;
bits += 4;
numBits += int(qPopulationCount(v));
}
- while (len >= 24) {
- quint32 v = quint32(bits[0]) | (quint32(bits[1]) << 8) | (quint32(bits[2]) << 16);
- len -= 24;
- bits += 3;
+ if (bits + 1 < end) {
+ quint16 v = quint16(bits[0]) | (quint16(bits[1]) << 8);
+ bits += 2;
numBits += int(qPopulationCount(v));
}
- while (len > 0) {
- --len;
- if (bits[len / 8] & (1 << (len & 7)))
- ++numBits;
- }
-#endif
+ if (bits < end)
+ numBits += int(qPopulationCount(bits[0]));
+
return on ? numBits : size() - numBits;
}
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index 6c8fb85233..174b694eee 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -1864,6 +1864,25 @@ int QTime::msecsTo(const QTime &t) const
*/
/*!
+ \fn QTime QTime::fromMSecsSinceStartOfDay(int msecs)
+
+ Returns a new QTime instance with the time set to the number of \a msecs
+ since the start of the day, i.e. since 00:00:00.
+
+ If \a msecs falls outside the valid range an invalid QTime will be returned.
+
+ \sa msecsSinceStartOfDay()
+*/
+
+/*!
+ \fn int QTime::msecsSinceStartOfDay() const
+
+ Returns the number of msecs since the start of the day, i.e. since 00:00:00.
+
+ \sa fromMSecsSinceStartOfDay()
+*/
+
+/*!
\fn QTime::currentTime()
Returns the current time as reported by the system clock.
@@ -2695,7 +2714,7 @@ void QDateTime::setMSecsSinceEpoch(qint64 msecs)
}
d->date = QDate(1970, 1, 1).addDays(ddays);
- d->time = QTime(0, 0, 0).addMSecs(msecs);
+ d->time = QTime::fromMSecsSinceStartOfDay(msecs);
if (d->spec == QDateTimePrivate::OffsetFromUTC)
utcToOffset(&d->date, &d->time, d->m_offsetFromUtc);
@@ -4449,7 +4468,7 @@ uint qHash(const QDate &key, uint seed) Q_DECL_NOTHROW
*/
uint qHash(const QTime &key, uint seed) Q_DECL_NOTHROW
{
- return qHash(QTime(0, 0, 0, 0).msecsTo(key), seed);
+ return qHash(key.msecsSinceStartOfDay(), seed);
}
QT_END_NAMESPACE
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h
index 8b63c5a377..779aae5b5b 100644
--- a/src/corelib/tools/qdatetime.h
+++ b/src/corelib/tools/qdatetime.h
@@ -168,6 +168,9 @@ public:
bool operator>(const QTime &other) const { return mds > other.mds; }
bool operator>=(const QTime &other) const { return mds >= other.mds; }
+ static inline QTime fromMSecsSinceStartOfDay(int msecs) { QTime t; t.mds = msecs; return t; }
+ inline int msecsSinceStartOfDay() const { return mds == NullTime ? 0 : mds; }
+
static QTime currentTime();
#ifndef QT_NO_DATESTRING
static QTime fromString(const QString &s, Qt::DateFormat f = Qt::TextDate);
diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h
index 2248f6727e..9abca30f12 100644
--- a/src/gui/kernel/qpalette.h
+++ b/src/gui/kernel/qpalette.h
@@ -174,11 +174,12 @@ private:
void detach();
QPalettePrivate *d;
+ struct Data {
+ uint current_group : 4;
+ uint resolve_mask : 28;
+ };
union {
- struct {
- uint current_group : 4;
- uint resolve_mask : 28;
- } data;
+ Data data;
quint32 for_faster_swapping_dont_use;
};
friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &s, const QPalette &p);
diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp
index 2168cdf43a..558eca6b1d 100644
--- a/src/gui/kernel/qscreen.cpp
+++ b/src/gui/kernel/qscreen.cpp
@@ -443,6 +443,23 @@ Qt::ScreenOrientation QScreen::primaryOrientation() const
return d->primaryOrientation;
}
+/*!
+ \property QScreen::nativeOrientation
+ \brief the native screen orientation
+ \since 5.2
+
+ The native orientation of the screen is the orientation where the logo
+ sticker of the device appears the right way up, or Qt::PrimaryOrientation
+ if the platform does not support this functionality.
+
+ The native orientation is a property of the hardware, and does not change.
+*/
+Qt::ScreenOrientation QScreen::nativeOrientation() const
+{
+ Q_D(const QScreen);
+ return d->platformScreen->nativeOrientation();
+}
+
// i must be power of two
static int log2(uint i)
{
diff --git a/src/gui/kernel/qscreen.h b/src/gui/kernel/qscreen.h
index 9fe4379646..bdd5939657 100644
--- a/src/gui/kernel/qscreen.h
+++ b/src/gui/kernel/qscreen.h
@@ -85,6 +85,7 @@ class Q_GUI_EXPORT QScreen : public QObject
Q_PROPERTY(qreal logicalDotsPerInch READ logicalDotsPerInch NOTIFY logicalDotsPerInchChanged)
Q_PROPERTY(Qt::ScreenOrientation primaryOrientation READ primaryOrientation NOTIFY primaryOrientationChanged)
Q_PROPERTY(Qt::ScreenOrientation orientation READ orientation NOTIFY orientationChanged)
+ Q_PROPERTY(Qt::ScreenOrientation nativeOrientation READ nativeOrientation)
Q_PROPERTY(qreal refreshRate READ refreshRate NOTIFY refreshRateChanged)
public:
@@ -122,6 +123,7 @@ public:
Qt::ScreenOrientation primaryOrientation() const;
Qt::ScreenOrientation orientation() const;
+ Qt::ScreenOrientation nativeOrientation() const;
Qt::ScreenOrientations orientationUpdateMask() const;
void setOrientationUpdateMask(Qt::ScreenOrientations mask);
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 11a6238fa1..deb8613056 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -1779,7 +1779,7 @@ void QWindow::exposeEvent(QExposeEvent *ev)
}
/*!
- Override this to handle mouse events (\a ev).
+ Override this to handle window move events (\a ev).
*/
void QWindow::moveEvent(QMoveEvent *ev)
{
diff --git a/src/gui/text/qfontengine_qpf.cpp b/src/gui/text/qfontengine_qpf.cpp
deleted file mode 100644
index 78bc3f871a..0000000000
--- a/src/gui/text/qfontengine_qpf.cpp
+++ /dev/null
@@ -1,1202 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, 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, Digia gives you certain additional
-** rights. These rights are described in the Digia 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.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qfontengine_qpf_p.h"
-
-#include "private/qpaintengine_raster_p.h"
-#include <QtCore/qlibraryinfo.h>
-#include <QtCore/qfileinfo.h>
-
-#include <QtCore/qfile.h>
-#include <QtCore/qdir.h>
-#include <QtCore/qbuffer.h>
-#if !defined(QT_NO_FREETYPE)
-#include "private/qfontengine_ft_p.h"
-#endif
-#include "private/qcore_unix_p.h" // overrides QT_OPEN
-
-// for mmap
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <errno.h>
-
-QT_BEGIN_NAMESPACE
-
-#ifndef QT_NO_QWS_QPF2
-
-#include "qpfutil.cpp"
-
-QT_BEGIN_INCLUDE_NAMESPACE
-
-#include "qplatformdefs.h"
-QT_END_INCLUDE_NAMESPACE
-
-//#define DEBUG_HEADER
-//#define DEBUG_FONTENGINE
-
-#if defined(DEBUG_HEADER)
-# define DEBUG_VERIFY qDebug
-#else
-# define DEBUG_VERIFY if (0) qDebug
-#endif
-
-#define READ_VERIFY(type, variable) \
- if (tagPtr + sizeof(type) > endPtr) { \
- DEBUG_VERIFY() << "read verify failed in line" << __LINE__; \
- return 0; \
- } \
- variable = qFromBigEndian<type>(tagPtr); \
- DEBUG_VERIFY() << "read value" << variable << "of type " #type; \
- tagPtr += sizeof(type)
-
-template <typename T>
-T readValue(const uchar *&data)
-{
- T value = qFromBigEndian<T>(data);
- data += sizeof(T);
- return value;
-}
-
-#define VERIFY(condition) \
- if (!(condition)) { \
- DEBUG_VERIFY() << "condition " #condition " failed in line" << __LINE__; \
- return 0; \
- }
-
-#define VERIFY_TAG(condition) \
- if (!(condition)) { \
- DEBUG_VERIFY() << "verifying tag condition " #condition " failed in line" << __LINE__ << "with tag" << tag; \
- return 0; \
- }
-
-static inline const uchar *verifyTag(const uchar *tagPtr, const uchar *endPtr)
-{
- quint16 tag, length;
- READ_VERIFY(quint16, tag);
- READ_VERIFY(quint16, length);
- if (tag == QFontEngineQPF::Tag_EndOfHeader)
- return endPtr;
- if (tag < QFontEngineQPF::NumTags) {
- switch (tagTypes[tag]) {
- case QFontEngineQPF::BitFieldType:
- case QFontEngineQPF::StringType:
- // can't do anything...
- break;
- case QFontEngineQPF::UInt32Type:
- VERIFY_TAG(length == sizeof(quint32));
- break;
- case QFontEngineQPF::FixedType:
- VERIFY_TAG(length == sizeof(quint32));
- break;
- case QFontEngineQPF::UInt8Type:
- VERIFY_TAG(length == sizeof(quint8));
- break;
- }
-#if defined(DEBUG_HEADER)
- if (length == 1)
- qDebug() << "tag data" << hex << *tagPtr;
- else if (length == 4)
- qDebug() << "tag data" << hex << tagPtr[0] << tagPtr[1] << tagPtr[2] << tagPtr[3];
-#endif
- }
- return tagPtr + length;
-}
-
-const QFontEngineQPF::Glyph *QFontEngineQPF::findGlyph(glyph_t g) const
-{
- if (!g || g >= glyphMapEntries)
- return 0;
- const quint32 *gmapPtr = reinterpret_cast<const quint32 *>(fontData + glyphMapOffset);
- quint32 glyphPos = qFromBigEndian<quint32>(gmapPtr[g]);
- if (glyphPos > glyphDataSize) {
- if (glyphPos == 0xffffffff)
- return 0;
-#if defined(DEBUG_FONTENGINE)
- qDebug() << "glyph" << g << "outside of glyphData, remapping font file";
-#endif
-#if !defined(QT_NO_FREETYPE) && !defined(QT_FONTS_ARE_RESOURCES)
- const_cast<QFontEngineQPF *>(this)->remapFontData();
-#endif
- if (glyphPos > glyphDataSize)
- return 0;
- }
- return reinterpret_cast<const Glyph *>(fontData + glyphDataOffset + glyphPos);
-}
-
-bool QFontEngineQPF::verifyHeader(const uchar *data, int size)
-{
- VERIFY(size >= int(sizeof(Header)));
- const Header *header = reinterpret_cast<const Header *>(data);
- if (header->magic[0] != 'Q'
- || header->magic[1] != 'P'
- || header->magic[2] != 'F'
- || header->magic[3] != '2')
- return false;
-
- VERIFY(header->majorVersion <= CurrentMajorVersion);
- const quint16 dataSize = qFromBigEndian<quint16>(header->dataSize);
- VERIFY(size >= int(sizeof(Header)) + dataSize);
-
- const uchar *tagPtr = data + sizeof(Header);
- const uchar *tagEndPtr = tagPtr + dataSize;
- while (tagPtr < tagEndPtr - 3) {
- tagPtr = verifyTag(tagPtr, tagEndPtr);
- VERIFY(tagPtr);
- }
-
- VERIFY(tagPtr <= tagEndPtr);
- return true;
-}
-
-QVariant QFontEngineQPF::extractHeaderField(const uchar *data, HeaderTag requestedTag)
-{
- const Header *header = reinterpret_cast<const Header *>(data);
- const uchar *tagPtr = data + sizeof(Header);
- const uchar *endPtr = tagPtr + qFromBigEndian<quint16>(header->dataSize);
- while (tagPtr < endPtr - 3) {
- quint16 tag = readValue<quint16>(tagPtr);
- quint16 length = readValue<quint16>(tagPtr);
- if (tag == requestedTag) {
- switch (tagTypes[requestedTag]) {
- case StringType:
- return QVariant(QString::fromUtf8(reinterpret_cast<const char *>(tagPtr), length));
- case UInt32Type:
- return QVariant(readValue<quint32>(tagPtr));
- case UInt8Type:
- return QVariant(uint(*tagPtr));
- case FixedType:
- return QVariant(QFixed::fromFixed(readValue<quint32>(tagPtr)).toReal());
- case BitFieldType:
- return QVariant(QByteArray(reinterpret_cast<const char *>(tagPtr), length));
- }
- return QVariant();
- } else if (tag == Tag_EndOfHeader) {
- break;
- }
- tagPtr += length;
- }
-
- return QVariant();
-}
-
-#endif // QT_NO_QWS_QPF2
-
-QString qws_fontCacheDir()
-{
- QString dir;
- dir = QDir::tempPath();
- dir.append(QLatin1String("/fonts/"));
- QDir qd(dir);
- if (!qd.exists() && !qd.mkpath(dir))
- dir = QDir::tempPath();
- return dir;
-}
-
-#ifndef QT_NO_QWS_QPF2
-
-#ifndef QT_FONTS_ARE_RESOURCES
-QList<QByteArray> QFontEngineQPF::cleanUpAfterClientCrash(const QList<int> &crashedClientIds)
-{
- QList<QByteArray> removedFonts;
- QDir dir(qws_fontCacheDir(), QLatin1String("*.qsf"));
- for (int i = 0; i < int(dir.count()); ++i) {
- const QByteArray fileName = QFile::encodeName(dir.absoluteFilePath(dir[i]));
-
- int fd = QT_OPEN(fileName.constData(), O_RDONLY, 0);
- if (fd >= 0) {
- QT_STATBUF st;
- int nDataSize = 0;
- if (QT_FSTAT(fd, &st)) {
-#if defined(DEBUG_FONTENGINE)
- qDebug() << "stat failed! " << fileName;
-#endif
- } else {
- nDataSize = st.st_size;
- }
-
- if (nDataSize >= (int)sizeof(QFontEngineQPF::Header)) {
- void *header = ::mmap(0, sizeof(QFontEngineQPF::Header), PROT_READ, MAP_SHARED, fd, 0);
- if (header && header != MAP_FAILED) {
- quint32 lockValue = reinterpret_cast<QFontEngineQPF::Header *>(header)->lock;
-
- if (lockValue && crashedClientIds.contains(lockValue)) {
- removedFonts.append(fileName);
- QFile::remove(QFile::decodeName(fileName));
- }
-
- ::munmap(header, sizeof(QFontEngineQPF::Header));
- }
- } else {
-#if defined(DEBUG_FONTENGINE)
- qDebug() << "Unsufficient header data in QSF file " << fileName;
-#endif
- }
- QT_CLOSE(fd);
- }
- }
- if (!removedFonts.isEmpty())
- qDebug() << "list of corrupted and removed fonts:" << removedFonts;
- return removedFonts;
-}
-#endif
-
-static inline unsigned int getChar(const QChar *str, int &i, const int len)
-{
- uint ucs4 = str[i].unicode();
- if (str[i].isHighSurrogate() && i < len-1 && str[i+1].isLowSurrogate()) {
- ++i;
- ucs4 = QChar::surrogateToUcs4(ucs4, str[i].unicode());
- }
- return ucs4;
-}
-#ifdef QT_FONTS_ARE_RESOURCES
-QFontEngineQPF::QFontEngineQPF(const QFontDef &def, const uchar *bytes, int size)
- : fd(-1), fontData(bytes), dataSize(size), renderingFontEngine(0)
-#else
-QFontEngineQPF::QFontEngineQPF(const QFontDef &def, int fileDescriptor, QFontEngine *fontEngine)
- : fd(fileDescriptor), fontData(0), dataSize(0), renderingFontEngine(fontEngine)
-#endif
-{
- fontDef = def;
- cache_cost = 100;
- freetype = 0;
- externalCMap = 0;
- cmapOffset = 0;
- cmapSize = 0;
- glyphMapOffset = 0;
- glyphMapEntries = 0;
- glyphDataOffset = 0;
- glyphDataSize = 0;
- if (renderingFontEngine)
- glyphFormat = renderingFontEngine->glyphFormat;
- kerning_pairs_loaded = false;
- readOnly = true;
-
-#if defined(DEBUG_FONTENGINE)
- qDebug() << "QFontEngineQPF::QFontEngineQPF( fd =" << fd << ", renderingFontEngine =" << renderingFontEngine << ')';
-#endif
-
-#ifndef QT_FONTS_ARE_RESOURCES
- if (fd < 0) {
- if (!renderingFontEngine)
- return;
-
- fileName = fontDef.family.toLower() + QLatin1Char('_')
- + QString::number(fontDef.pixelSize)
- + QLatin1Char('_') + QString::number(fontDef.weight)
- + (fontDef.style != QFont::StyleNormal ?
- QLatin1String("_italic") : QLatin1String(""))
- + QLatin1String(".qsf");
- fileName.replace(QLatin1Char(' '), QLatin1Char('_'));
- fileName.prepend(qws_fontCacheDir());
-
- encodedFileName = QFile::encodeName(fileName);
- if (::access(encodedFileName, F_OK) == 0) {
-#if defined(DEBUG_FONTENGINE)
- qDebug() << "found existing qpf:" << fileName;
-#endif
- if (::access(encodedFileName, W_OK | R_OK) == 0) {
- fd = QT_OPEN(encodedFileName, O_RDWR);
- }
- // read-write access failed - try read-only access
- if (fd == -1 && ::access(encodedFileName, R_OK) == 0) {
- fd = QT_OPEN(encodedFileName, O_RDONLY);
- if (fd == -1) {
-#if defined(DEBUG_FONTENGINE)
- qErrnoWarning("QFontEngineQPF: unable to open %s", encodedName.constData());
-#endif
- return;
- }
- }
- if (fd == -1) {
-#if defined(DEBUG_FONTENGINE)
- qWarning("QFontEngineQPF: insufficient access rights to %s", encodedName.constData());
-#endif
- return;
- }
- } else {
-#if defined(DEBUG_FONTENGINE)
- qDebug() << "creating qpf on the fly:" << fileName;
-#endif
- if (::access(QFile::encodeName(qws_fontCacheDir()), W_OK) == 0) {
- fd = QT_OPEN(encodedFileName, O_RDWR | O_EXCL | O_CREAT, 0644);
- if (fd == -1) {
-#if defined(DEBUG_FONTENGINE)
- qErrnoWarning(errno, "QFontEngineQPF: open() failed for %s", encodedName.constData());
-#endif
- return;
- }
-
- QBuffer buffer;
- buffer.open(QIODevice::ReadWrite);
- QPFGenerator generator(&buffer, renderingFontEngine);
- generator.generate();
- buffer.close();
- const QByteArray &data = buffer.data();
- if (QT_WRITE(fd, data.constData(), data.size()) == -1) {
-#if defined(DEBUG_FONTENGINE)
- qErrnoWarning(errno, "QFontEngineQPF: write() failed for %s", encodedName.constData());
-#endif
- QFile::remove(fileName);
- return;
- }
- } else {
-#if defined(DEBUG_FONTENGINE)
- qErrnoWarning(errno, "QFontEngineQPF: access() failed for %s", qPrintable(qws_fontCacheDir()));
-#endif
- return;
- }
- }
- }
-
- QT_STATBUF st;
- if (QT_FSTAT(fd, &st)) {
-#if defined(DEBUG_FONTENGINE)
- qErrnoWarning(errno, "QFontEngineQPF: fstat failed!");
-#endif
- return;
- }
- dataSize = st.st_size;
-
-
- fontData = (const uchar *)::mmap(0, st.st_size, PROT_READ | (renderingFontEngine ? PROT_WRITE : 0), MAP_SHARED, fd, 0);
- if (!fontData || fontData == (const uchar *)MAP_FAILED) {
-#if defined(DEBUG_FONTENGINE)
- perror("mmap failed");
-#endif
- fontData = 0;
- return;
- }
-#endif //QT_FONTS_ARE_RESOURCES
-
- if (!verifyHeader(fontData, dataSize)) {
-#if defined(DEBUG_FONTENGINE)
- qDebug() << "verifyHeader failed!";
-#endif
- return;
- }
-
- const Header *header = reinterpret_cast<const Header *>(fontData);
-
- readOnly = (header->lock == 0xffffffff);
-
- const uchar *data = fontData + sizeof(Header) + qFromBigEndian<quint16>(header->dataSize);
- const uchar *endPtr = fontData + dataSize;
- while (data <= endPtr - 8) {
- quint16 blockTag = readValue<quint16>(data);
- data += 2; // skip padding
- quint32 blockSize = readValue<quint32>(data);
-
- if (blockTag == CMapBlock) {
- cmapOffset = data - fontData;
- cmapSize = blockSize;
- } else if (blockTag == GMapBlock) {
- glyphMapOffset = data - fontData;
- glyphMapEntries = blockSize / 4;
- } else if (blockTag == GlyphBlock) {
- glyphDataOffset = data - fontData;
- glyphDataSize = blockSize;
- }
-
- data += blockSize;
- }
-
- face_id.filename = QFile::encodeName(extractHeaderField(fontData, Tag_FileName).toString());
- face_id.index = extractHeaderField(fontData, Tag_FileIndex).toInt();
-#if !defined(QT_NO_FREETYPE) && !defined(QT_FONTS_ARE_RESOURCES)
- freetype = QFreetypeFace::getFace(face_id);
- if (!freetype) {
- QString newPath =
- QLibraryInfo::location(QLibraryInfo::LibrariesPath) +
- QLatin1String("/fonts/") +
- QFileInfo(QFile::decodeName(face_id.filename)).fileName();
- face_id.filename = QFile::encodeName(newPath);
- freetype = QFreetypeFace::getFace(face_id);
- }
- if (freetype) {
- const quint32 qpfTtfRevision = extractHeaderField(fontData, Tag_FontRevision).toUInt();
- uchar data[4];
- uint length = 4;
- bool ok = freetype->getSfntTable(MAKE_TAG('h', 'e', 'a', 'd'), data, &length);
- if (!ok || length != 4
- || qFromBigEndian<quint32>(data) != qpfTtfRevision) {
- freetype->release(face_id);
- freetype = 0;
- }
- }
- if (!cmapOffset && freetype) {
- freetypeCMapTable = getSfntTable(MAKE_TAG('c', 'm', 'a', 'p'));
- externalCMap = reinterpret_cast<const uchar *>(freetypeCMapTable.constData());
- cmapSize = freetypeCMapTable.size();
- }
-#endif
-
- // get the real cmap
- if (cmapOffset) {
- int tableSize = cmapSize;
- const uchar *cmapPtr = getCMap(fontData + cmapOffset, tableSize, &symbol, &cmapSize);
- if (cmapPtr)
- cmapOffset = cmapPtr - fontData;
- else
- cmapOffset = 0;
- } else if (externalCMap) {
- int tableSize = cmapSize;
- externalCMap = getCMap(externalCMap, tableSize, &symbol, &cmapSize);
- }
-
- // verify all the positions in the glyphMap
- if (glyphMapOffset) {
- const quint32 *gmapPtr = reinterpret_cast<const quint32 *>(fontData + glyphMapOffset);
- for (uint i = 0; i < glyphMapEntries; ++i) {
- quint32 glyphDataPos = qFromBigEndian<quint32>(gmapPtr[i]);
- if (glyphDataPos == 0xffffffff)
- continue;
- if (glyphDataPos >= glyphDataSize) {
- // error
- glyphMapOffset = 0;
- glyphMapEntries = 0;
- break;
- }
- }
- }
-
-#if defined(DEBUG_FONTENGINE)
- if (!isValid())
- qDebug() << "fontData" << fontData << "dataSize" << dataSize
- << "externalCMap" << externalCMap << "cmapOffset" << cmapOffset
- << "glyphMapOffset" << glyphMapOffset << "glyphDataOffset" << glyphDataOffset
- << "fd" << fd << "glyphDataSize" << glyphDataSize;
-#endif
-}
-
-QFontEngineQPF::~QFontEngineQPF()
-{
- delete renderingFontEngine;
- if (fontData) {
- if (munmap((void *)fontData, dataSize) == -1) {
-#if defined(DEBUG_FONTENGINE)
- qErrnoWarning(errno, "~QFontEngineQPF: Unable to munmap");
-#endif
- }
- }
- if (fd != -1)
- ::close(fd);
-#if !defined(QT_NO_FREETYPE)
- if (freetype)
- freetype->release(face_id);
-#endif
-}
-
-bool QFontEngineQPF::getSfntTableData(uint tag, uchar *buffer, uint *length) const
-{
-#if !defined(QT_NO_FREETYPE)
- if (freetype)
- return freetype->getSfntTable(tag, buffer, length);
-#endif
- Q_UNUSED(tag);
- Q_UNUSED(buffer);
- *length = 0;
- return false;
-}
-
-bool QFontEngineQPF::stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, QFontEngine::ShaperFlags flags) const
-{
- if (!externalCMap && !cmapOffset && renderingFontEngine) {
- if (!renderingFontEngine->stringToCMap(str, len, glyphs, nglyphs, flags))
- return false;
-#ifndef QT_NO_FREETYPE
- const_cast<QFontEngineQPF *>(this)->ensureGlyphsLoaded(*glyphs);
-#endif
- return true;
- }
-
- if (*nglyphs < len) {
- *nglyphs = len;
- return false;
- }
-
-#if defined(DEBUG_FONTENGINE)
- QSet<QChar> seenGlyphs;
-#endif
-
- const uchar *cmap = externalCMap ? externalCMap : (fontData + cmapOffset);
-
- bool mirrored = flags & RightToLeft;
- int glyph_pos = 0;
- if (symbol) {
- for (int i = 0; i < len; ++i) {
- unsigned int uc = getChar(str, i, len);
- glyphs->glyphs[glyph_pos] = getTrueTypeGlyphIndex(cmap, uc);
- if(!glyphs->glyphs[glyph_pos] && uc < 0x100)
- glyphs->glyphs[glyph_pos] = getTrueTypeGlyphIndex(cmap, uc + 0xf000);
- ++glyph_pos;
- }
- } else {
- for (int i = 0; i < len; ++i) {
- unsigned int uc = getChar(str, i, len);
- if (mirrored)
- uc = QChar::mirroredChar(uc);
- glyphs->glyphs[glyph_pos] = getTrueTypeGlyphIndex(cmap, uc);
-#if 0 && defined(DEBUG_FONTENGINE)
- QChar c(uc);
- if (!findGlyph(glyphs[glyph_pos].glyph) && !seenGlyphs.contains(c))
- qDebug() << "glyph for character" << c << '/' << hex << uc << "is" << dec << glyphs[glyph_pos].glyph;
-
- seenGlyphs.insert(c);
-#endif
- ++glyph_pos;
- }
- }
-
- *nglyphs = glyph_pos;
- glyphs->numGlyphs = glyph_pos;
-
- if (!(flags & GlyphIndicesOnly))
- recalcAdvances(glyphs, flags);
-
- return true;
-}
-
-void QFontEngineQPF::recalcAdvances(QGlyphLayout *glyphs, QFontEngine::ShaperFlags) const
-{
-#ifndef QT_NO_FREETYPE
- const_cast<QFontEngineQPF *>(this)->ensureGlyphsLoaded(*glyphs);
-#endif
- for (int i = 0; i < glyphs->numGlyphs; ++i) {
- const Glyph *g = findGlyph(glyphs->glyphs[i]);
- if (!g) {
- glyphs->glyphs[i] = 0;
- continue;
- }
- glyphs->advances_x[i] = g->advance;
- glyphs->advances_y[i] = 0;
- }
-}
-
-QImage QFontEngineQPF::alphaMapForGlyph(glyph_t g)
-{
- const Glyph *glyph = findGlyph(g);
- if (!glyph)
- return QImage();
-
- const uchar *bits = ((const uchar *) glyph) + sizeof(Glyph);
-
- QImage image(glyph->width, glyph->height, QImage::Format_Indexed8);
- for (int j=0; j<256; ++j)
- image.setColor(j, qRgba(0, 0, 0, j));
-
- for (int i=0; i<glyph->height; ++i) {
- memcpy(image.scanLine(i), bits, glyph->bytesPerLine);
- bits += glyph->bytesPerLine;
- }
- return image;
-}
-
-void QFontEngineQPF::draw(QPaintEngine *p, qreal _x, qreal _y, const QTextItemInt &si)
-{
- QPaintEngineState *pState = p->state;
- QRasterPaintEngine *paintEngine = static_cast<QRasterPaintEngine*>(p);
-
- QTransform matrix = pState->transform();
- matrix.translate(_x, _y);
- QFixed x = QFixed::fromReal(matrix.dx());
- QFixed y = QFixed::fromReal(matrix.dy());
-
- QVarLengthArray<QFixedPoint> positions;
- QVarLengthArray<glyph_t> glyphs;
- getGlyphPositions(si.glyphs, matrix, si.flags, glyphs, positions);
- if (glyphs.size() == 0)
- return;
-
- for(int i = 0; i < glyphs.size(); i++) {
- const Glyph *glyph = findGlyph(glyphs[i]);
- if (!glyph)
- continue;
-
- const int depth = 8; //###
-
- paintEngine->alphaPenBlt(reinterpret_cast<const uchar *>(glyph) + sizeof(Glyph), glyph->bytesPerLine, depth,
- qRound(positions[i].x) + glyph->x,
- qRound(positions[i].y) + glyph->y,
- glyph->width, glyph->height);
- }
-}
-
-void QFontEngineQPF::addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags)
-{
- if (renderingFontEngine && renderingFontEngine->type() != QFontEngine::Proxy) {
- renderingFontEngine->addOutlineToPath(x, y, glyphs, path, flags);
- return;
- }
- addBitmapFontToPath(x, y, glyphs, path, flags);
-}
-
-glyph_metrics_t QFontEngineQPF::boundingBox(const QGlyphLayout &glyphs)
-{
-#ifndef QT_NO_FREETYPE
- const_cast<QFontEngineQPF *>(this)->ensureGlyphsLoaded(glyphs);
-#endif
-
- glyph_metrics_t overall;
- // initialize with line height, we get the same behaviour on all platforms
- overall.y = -ascent();
- overall.height = ascent() + descent() + 1;
-
- QFixed ymax = 0;
- QFixed xmax = 0;
- for (int i = 0; i < glyphs.numGlyphs; i++) {
- const Glyph *g = findGlyph(glyphs.glyphs[i]);
- if (!g)
- continue;
-
- QFixed x = overall.xoff + glyphs.offsets[i].x + g->x;
- QFixed y = overall.yoff + glyphs.offsets[i].y + g->y;
- overall.x = qMin(overall.x, x);
- overall.y = qMin(overall.y, y);
- xmax = qMax(xmax, x + g->width);
- ymax = qMax(ymax, y + g->height);
- overall.xoff += g->advance;
- }
- overall.height = qMax(overall.height, ymax - overall.y);
- overall.width = xmax - overall.x;
-
- return overall;
-}
-
-glyph_metrics_t QFontEngineQPF::boundingBox(glyph_t glyph)
-{
-#ifndef QT_NO_FREETYPE
- {
- QGlyphLayoutArray<1> tmp;
- tmp.glyphs[0] = glyph;
- const_cast<QFontEngineQPF *>(this)->ensureGlyphsLoaded(tmp);
- }
-#endif
- glyph_metrics_t overall;
- const Glyph *g = findGlyph(glyph);
- if (!g)
- return overall;
- overall.x = g->x;
- overall.y = g->y;
- overall.width = g->width;
- overall.height = g->height;
- overall.xoff = g->advance;
- return overall;
-}
-
-QFixed QFontEngineQPF::ascent() const
-{
- return QFixed::fromReal(extractHeaderField(fontData, Tag_Ascent).value<qreal>());
-}
-
-QFixed QFontEngineQPF::descent() const
-{
- return QFixed::fromReal(extractHeaderField(fontData, Tag_Descent).value<qreal>());
-}
-
-QFixed QFontEngineQPF::leading() const
-{
- return QFixed::fromReal(extractHeaderField(fontData, Tag_Leading).value<qreal>());
-}
-
-qreal QFontEngineQPF::maxCharWidth() const
-{
- return extractHeaderField(fontData, Tag_MaxCharWidth).value<qreal>();
-}
-
-qreal QFontEngineQPF::minLeftBearing() const
-{
- return extractHeaderField(fontData, Tag_MinLeftBearing).value<qreal>();
-}
-
-qreal QFontEngineQPF::minRightBearing() const
-{
- return extractHeaderField(fontData, Tag_MinRightBearing).value<qreal>();
-}
-
-QFixed QFontEngineQPF::underlinePosition() const
-{
- return QFixed::fromReal(extractHeaderField(fontData, Tag_UnderlinePosition).value<qreal>());
-}
-
-QFixed QFontEngineQPF::lineThickness() const
-{
- return QFixed::fromReal(extractHeaderField(fontData, Tag_LineThickness).value<qreal>());
-}
-
-QFontEngine::Type QFontEngineQPF::type() const
-{
- return QFontEngine::QPF2;
-}
-
-bool QFontEngineQPF::canRender(const QChar *string, int len)
-{
- const uchar *cmap = externalCMap ? externalCMap : (fontData + cmapOffset);
-
- if (symbol) {
- for (int i = 0; i < len; ++i) {
- unsigned int uc = getChar(string, i, len);
- glyph_t g = getTrueTypeGlyphIndex(cmap, uc);
- if(!g && uc < 0x100)
- g = getTrueTypeGlyphIndex(cmap, uc + 0xf000);
- if (!g)
- return false;
- }
- } else {
- for (int i = 0; i < len; ++i) {
- unsigned int uc = getChar(string, i, len);
- if (!getTrueTypeGlyphIndex(cmap, uc))
- return false;
- }
- }
- return true;
-}
-
-bool QFontEngineQPF::isValid() const
-{
- return fontData && dataSize && (cmapOffset || externalCMap || renderingFontEngine)
- && glyphMapOffset && glyphDataOffset && (fd >= 0 || glyphDataSize > 0);
-}
-
-#if !defined(QT_NO_FREETYPE)
-FT_Face QFontEngineQPF::lockFace() const
-{
- Q_ASSERT(freetype);
- freetype->lock();
- FT_Face face = freetype->face;
-
- // ### not perfect
- const int ysize = qRound(fontDef.pixelSize * qreal(64));
- const int xsize = ysize;
-
- if (freetype->xsize != xsize || freetype->ysize != ysize) {
- FT_Set_Char_Size(face, xsize, ysize, 0, 0);
- freetype->xsize = xsize;
- freetype->ysize = ysize;
- }
- FT_Matrix identityMatrix;
- identityMatrix.xx = 0x10000;
- identityMatrix.yy = 0x10000;
- identityMatrix.xy = 0;
- identityMatrix.yx = 0;
- if (freetype->matrix.xx != identityMatrix.xx ||
- freetype->matrix.yy != identityMatrix.yy ||
- freetype->matrix.xy != identityMatrix.xy ||
- freetype->matrix.yx != identityMatrix.yx) {
- freetype->matrix = identityMatrix;
- FT_Set_Transform(face, &freetype->matrix, 0);
- }
- return face;
-}
-
-void QFontEngineQPF::unlockFace() const
-{
- freetype->unlock();
-}
-
-void QFontEngineQPF::doKerning(QGlyphLayout *g, QFontEngine::ShaperFlags flags) const
-{
- if (!kerning_pairs_loaded) {
- kerning_pairs_loaded = true;
- if (freetype) {
- lockFace();
- if (freetype->face->size->metrics.x_ppem != 0) {
- QFixed scalingFactor(freetype->face->units_per_EM/freetype->face->size->metrics.x_ppem);
- unlockFace();
- const_cast<QFontEngineQPF *>(this)->loadKerningPairs(scalingFactor);
- } else {
- unlockFace();
- }
- }
- }
- QFontEngine::doKerning(g, flags);
-}
-
-int QFontEngineQPF::getPointInOutline(glyph_t glyph, int flags, quint32 point, QFixed *xpos, QFixed *ypos, quint32 *nPoints)
-{
- if (!freetype)
- return Err_Not_Covered;
- lockFace();
- int result = freetype->getPointInOutline(glyph, flags, point, xpos, ypos, nPoints);
- unlockFace();
- return result;
-}
-
-QFixed QFontEngineQPF::emSquareSize() const
-{
- if (!freetype)
- return QFontEngine::emSquareSize();
- if (FT_IS_SCALABLE(freetype->face))
- return freetype->face->units_per_EM;
- else
- return freetype->face->size->metrics.y_ppem;
-}
-
-void QFontEngineQPF::ensureGlyphsLoaded(const QGlyphLayout &glyphs)
-{
- if (readOnly)
- return;
- bool locked = false;
- for (int i = 0; i < glyphs.numGlyphs; ++i) {
- if (!glyphs.glyphs[i])
- continue;
- const Glyph *g = findGlyph(glyphs.glyphs[i]);
- if (g)
- continue;
- if (!locked) {
- if (!lockFile())
- return;
- locked = true;
- g = findGlyph(glyphs.glyphs[i]);
- if (g)
- continue;
- }
- loadGlyph(glyphs.glyphs[i]);
- }
- if (locked) {
- unlockFile();
-#if defined(DEBUG_FONTENGINE)
- qDebug() << "Finished rendering glyphs\n";
-#endif
- }
-}
-
-void QFontEngineQPF::loadGlyph(glyph_t glyph)
-{
- quint32 glyphPos = ~0;
-
- if (!renderingFontEngine)
- return;
- QImage img = renderingFontEngine->alphaMapForGlyph(glyph);
- if (img.format() != QImage::Format_Indexed8) {
- bool mono = img.depth() == 1;
- img = img.convertToFormat(QImage::Format_Indexed8);
- if (mono) {
- //### we know that 1 is opaque and 0 is transparent
- uchar *byte = img.bits();
- int count = img.byteCount();
- while (count--)
- *byte++ *= 0xff;
- }
- }
- glyph_metrics_t metrics = renderingFontEngine->boundingBox(glyph);
- renderingFontEngine->removeGlyphFromCache(glyph);
-
- off_t oldSize = ::lseek(fd, 0, SEEK_END);
- if (oldSize == (off_t)-1)
- return;
-
- Glyph g;
- g.width = img.width();
- g.height = img.height();
- g.bytesPerLine = img.bytesPerLine();
- g.x = qRound(metrics.x);
- g.y = qRound(metrics.y);
- g.advance = qRound(metrics.xoff);
-
- QT_WRITE(fd, &g, sizeof(g));
- QT_WRITE(fd, img.bits(), img.byteCount());
-
- glyphPos = oldSize - glyphDataOffset;
-#if 0 && defined(DEBUG_FONTENGINE)
- qDebug() << "glyphPos for new glyph" << glyph << "is" << glyphPos << "oldSize" << oldSize << "glyphDataOffset" << glyphDataOffset;
-#endif
-
- quint32 *gmap = (quint32 *)(fontData + glyphMapOffset);
- gmap[glyph] = qToBigEndian(glyphPos);
-
- glyphDataSize = glyphPos + sizeof(g) + img.byteCount();
- quint32 *blockSizePtr = (quint32 *)(fontData + glyphDataOffset - 4);
- *blockSizePtr = qToBigEndian(glyphDataSize);
-}
-
-bool QFontEngineQPF::lockFile()
-{
- // #### this does not handle the case when the process holding the
- // lock hangs for some reason
- struct flock lock;
- lock.l_type = F_WRLCK;
- lock.l_whence = SEEK_SET;
- lock.l_start = 0;
- lock.l_len = 0; // lock the whole file
- while (fcntl(fd, F_SETLKW, &lock) != 0) {
- if (errno == EINTR)
- continue;
- perror("locking qpf");
- return false;
- }
- Header *header = (Header *)fontData;
- if (header->lock) {
- lock.l_type = F_UNLCK;
- if (fcntl(fd, F_SETLK, &lock) != 0)
- perror("unlocking possibly corrupt qpf");
- return false;
- }
- header->lock = 1;
- return true;
-}
-
-void QFontEngineQPF::unlockFile()
-{
- ((Header *)fontData)->lock = 0;
-
- struct flock lock;
- lock.l_type = F_UNLCK;
- lock.l_whence = SEEK_SET;
- lock.l_start = 0;
- lock.l_len = 0; // lock the whole file
- if (fcntl(fd, F_SETLK, &lock) != 0) {
- perror("unlocking qpf");
- }
-
- remapFontData();
-}
-
-void QFontEngineQPF::remapFontData()
-{
- off_t newFileSize = ::lseek(fd, 0, SEEK_END);
- if (newFileSize == (off_t)-1) {
-#ifdef DEBUG_FONTENGINE
- perror("QFontEngineQPF::remapFontData: lseek failed");
-#endif
- fontData = 0;
- return;
- }
-
-#ifndef QT_NO_MREMAP
- fontData = static_cast<uchar *>(::mremap(const_cast<uchar *>(fontData), dataSize, newFileSize, MREMAP_MAYMOVE));
- if (!fontData || fontData == (const uchar *)MAP_FAILED) {
-# if defined(DEBUG_FONTENGINE)
- perror("QFontEngineQPF::remapFontData(): mremap failed");
-# endif
- fontData = 0;
- }
-
- if (!fontData)
-#endif // QT_NO_MREMAP
- {
- int status = ::munmap((void *)fontData, dataSize);
- if (status != 0)
- qErrnoWarning(status, "QFontEngineQPF::remapFomrData: munmap failed!");
-
- fontData = (const uchar *)::mmap(0, newFileSize, PROT_READ | (renderingFontEngine ? PROT_WRITE : 0),
- MAP_SHARED, fd, 0);
- if (!fontData || fontData == (const uchar *)MAP_FAILED) {
-# if defined(DEBUG_FONTENGINE)
- perror("mmap failed");
-# endif
- fontData = 0;
- return;
- }
- }
-
- dataSize = newFileSize;
- glyphDataSize = newFileSize - glyphDataOffset;
-#if defined(DEBUG_FONTENGINE)
- qDebug() << "remapped the font file to" << newFileSize << "bytes";
-#endif
-}
-
-#endif // QT_NO_FREETYPE
-
-void QPFGenerator::generate()
-{
- writeHeader();
- writeGMap();
- writeBlock(QFontEngineQPF::GlyphBlock, QByteArray());
-
- dev->seek(4); // position of header.lock
- writeUInt32(0);
-}
-
-void QPFGenerator::writeHeader()
-{
- QFontEngineQPF::Header header;
-
- header.magic[0] = 'Q';
- header.magic[1] = 'P';
- header.magic[2] = 'F';
- header.magic[3] = '2';
- header.lock = 1;
- header.majorVersion = QFontEngineQPF::CurrentMajorVersion;
- header.minorVersion = QFontEngineQPF::CurrentMinorVersion;
- header.dataSize = 0;
- dev->write((const char *)&header, sizeof(header));
-
- writeTaggedString(QFontEngineQPF::Tag_FontName, fe->fontDef.family.toUtf8());
-
- QFontEngine::FaceId face = fe->faceId();
- writeTaggedString(QFontEngineQPF::Tag_FileName, face.filename);
- writeTaggedUInt32(QFontEngineQPF::Tag_FileIndex, face.index);
-
- {
- uchar data[4];
- uint len = 4;
- bool ok = fe->getSfntTableData(MAKE_TAG('h', 'e', 'a', 'd'), data, &len);
- if (ok) {
- const quint32 revision = qFromBigEndian<quint32>(data);
- writeTaggedUInt32(QFontEngineQPF::Tag_FontRevision, revision);
- }
- }
-
- writeTaggedQFixed(QFontEngineQPF::Tag_Ascent, fe->ascent());
- writeTaggedQFixed(QFontEngineQPF::Tag_Descent, fe->descent());
- writeTaggedQFixed(QFontEngineQPF::Tag_Leading, fe->leading());
- writeTaggedQFixed(QFontEngineQPF::Tag_XHeight, fe->xHeight());
- writeTaggedQFixed(QFontEngineQPF::Tag_AverageCharWidth, fe->averageCharWidth());
- writeTaggedQFixed(QFontEngineQPF::Tag_MaxCharWidth, QFixed::fromReal(fe->maxCharWidth()));
- writeTaggedQFixed(QFontEngineQPF::Tag_LineThickness, fe->lineThickness());
- writeTaggedQFixed(QFontEngineQPF::Tag_MinLeftBearing, QFixed::fromReal(fe->minLeftBearing()));
- writeTaggedQFixed(QFontEngineQPF::Tag_MinRightBearing, QFixed::fromReal(fe->minRightBearing()));
- writeTaggedQFixed(QFontEngineQPF::Tag_UnderlinePosition, fe->underlinePosition());
- writeTaggedUInt8(QFontEngineQPF::Tag_PixelSize, fe->fontDef.pixelSize);
- writeTaggedUInt8(QFontEngineQPF::Tag_Weight, fe->fontDef.weight);
- writeTaggedUInt8(QFontEngineQPF::Tag_Style, fe->fontDef.style);
-
- writeTaggedUInt8(QFontEngineQPF::Tag_GlyphFormat, QFontEngineQPF::AlphamapGlyphs);
-
- writeTaggedString(QFontEngineQPF::Tag_EndOfHeader, QByteArray());
- align4();
-
- const quint64 size = dev->pos();
- header.dataSize = qToBigEndian<quint16>(size - sizeof(header));
- dev->seek(0);
- dev->write((const char *)&header, sizeof(header));
- dev->seek(size);
-}
-
-void QPFGenerator::writeGMap()
-{
- const quint16 glyphCount = fe->glyphCount();
-
- writeUInt16(QFontEngineQPF::GMapBlock);
- writeUInt16(0); // padding
- writeUInt32(glyphCount * 4);
-
- QByteArray &buffer = dev->buffer();
- const int numBytes = glyphCount * sizeof(quint32);
- qint64 pos = buffer.size();
- buffer.resize(pos + numBytes);
- memset(buffer.data() + pos, 0xff, numBytes);
- dev->seek(pos + numBytes);
-}
-
-void QPFGenerator::writeBlock(QFontEngineQPF::BlockTag tag, const QByteArray &data)
-{
- writeUInt16(tag);
- writeUInt16(0); // padding
- const int padSize = ((data.size() + 3) / 4) * 4 - data.size();
- writeUInt32(data.size() + padSize);
- dev->write(data);
- for (int i = 0; i < padSize; ++i)
- writeUInt8(0);
-}
-
-void QPFGenerator::writeTaggedString(QFontEngineQPF::HeaderTag tag, const QByteArray &string)
-{
- writeUInt16(tag);
- writeUInt16(string.length());
- dev->write(string);
-}
-
-void QPFGenerator::writeTaggedUInt32(QFontEngineQPF::HeaderTag tag, quint32 value)
-{
- writeUInt16(tag);
- writeUInt16(sizeof(value));
- writeUInt32(value);
-}
-
-void QPFGenerator::writeTaggedUInt8(QFontEngineQPF::HeaderTag tag, quint8 value)
-{
- writeUInt16(tag);
- writeUInt16(sizeof(value));
- writeUInt8(value);
-}
-
-void QPFGenerator::writeTaggedQFixed(QFontEngineQPF::HeaderTag tag, QFixed value)
-{
- writeUInt16(tag);
- writeUInt16(sizeof(quint32));
- writeUInt32(value.value());
-}
-
-#endif // QT_NO_QWS_QPF2
-
-/*
- Creates a new multi qws engine.
-
- This function takes ownership of the QFontEngine, increasing it's refcount.
-*/
-QFontEngineMultiQWS::QFontEngineMultiQWS(QFontEngine *fe, int _script, const QStringList &fallbacks)
- : QFontEngineMulti(fallbacks.size() + 1),
- fallbackFamilies(fallbacks), script(_script)
-{
- engines[0] = fe;
- fe->ref.ref();
- fontDef = engines[0]->fontDef;
-}
-
-void QFontEngineMultiQWS::loadEngine(int at)
-{
- Q_ASSERT(at < engines.size());
- Q_ASSERT(engines.at(at) == 0);
-
- QFontDef request = fontDef;
- request.styleStrategy |= QFont::NoFontMerging;
- request.family = fallbackFamilies.at(at-1);
- engines[at] = QFontDatabase::findFont(script,
- /*fontprivate*/0,
- request);
- Q_ASSERT(engines[at]);
- engines[at]->ref.ref();
- engines[at]->fontDef = request;
-}
-
-void QFontEngineMultiQWS::draw(QPaintEngine */*p*/, qreal /*x*/, qreal /*y*/, const QTextItemInt &/*si*/)
-{
- qFatal("QFontEngineMultiQWS::draw should never be called!");
-}
-
-QT_END_NAMESPACE
diff --git a/src/gui/text/qfontengine_qpf_p.h b/src/gui/text/qfontengine_qpf_p.h
deleted file mode 100644
index 35355d3a65..0000000000
--- a/src/gui/text/qfontengine_qpf_p.h
+++ /dev/null
@@ -1,299 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, 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, Digia gives you certain additional
-** rights. These rights are described in the Digia 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.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QFONTENGINE_QPF_P_H
-#define QFONTENGINE_QPF_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qfontengine_p.h"
-#include <qendian.h>
-#include <qbuffer.h>
-
-#ifndef QT_NO_QWS_QPF2
-#if !defined(QT_NO_FREETYPE)
-# include "qfontengine_ft_p.h"
-#endif
-#endif
-
-QT_BEGIN_NAMESPACE
-
-#ifndef QT_NO_QWS_QPF2
-
-class QFontEngine;
-class QFreetypeFace;
-
-class Q_GUI_EXPORT QFontEngineQPF : public QFontEngine
-{
-public:
- // if you add new tags please make sure to update the tables in
- // qpfutil.cpp and tools/makeqpf/qpf2.cpp
- enum HeaderTag {
- Tag_FontName, // 0 string
- Tag_FileName, // 1 string
- Tag_FileIndex, // 2 quint32
- Tag_FontRevision, // 3 quint32
- Tag_FreeText, // 4 string
- Tag_Ascent, // 5 QFixed
- Tag_Descent, // 6 QFixed
- Tag_Leading, // 7 QFixed
- Tag_XHeight, // 8 QFixed
- Tag_AverageCharWidth, // 9 QFixed
- Tag_MaxCharWidth, // 10 QFixed
- Tag_LineThickness, // 11 QFixed
- Tag_MinLeftBearing, // 12 QFixed
- Tag_MinRightBearing, // 13 QFixed
- Tag_UnderlinePosition, // 14 QFixed
- Tag_GlyphFormat, // 15 quint8
- Tag_PixelSize, // 16 quint8
- Tag_Weight, // 17 quint8
- Tag_Style, // 18 quint8
- Tag_EndOfHeader, // 19 string
- Tag_WritingSystems, // 20 bitfield
-
- NumTags
- };
-
- enum TagType {
- StringType,
- FixedType,
- UInt8Type,
- UInt32Type,
- BitFieldType
- };
-
- struct Tag
- {
- quint16 tag;
- quint16 size;
- };
-
- enum GlyphFormat {
- BitmapGlyphs = 1,
- AlphamapGlyphs = 8
- };
-
- enum {
- CurrentMajorVersion = 2,
- CurrentMinorVersion = 0
- };
-
- // The CMap is identical to the TrueType CMap table format
- // The GMap table is a normal array with the total number of
- // covered glyphs in the TrueType font
- enum BlockTag {
- CMapBlock,
- GMapBlock,
- GlyphBlock
- };
-
- struct Q_PACKED Header
- {
- char magic[4]; // 'QPF2'
- quint32 lock; // values: 0 = unlocked, 0xffffffff = read-only, otherwise qws client id of locking process
- quint8 majorVersion;
- quint8 minorVersion;
- quint16 dataSize;
- };
-
- struct Q_PACKED Block
- {
- quint16 tag;
- quint16 pad;
- quint32 dataSize;
- };
-
- struct Q_PACKED Glyph
- {
- quint8 width;
- quint8 height;
- quint8 bytesPerLine;
- qint8 x;
- qint8 y;
- qint8 advance;
- };
-
-#ifdef QT_FONTS_ARE_RESOURCES
- QFontEngineQPF(const QFontDef &def, const uchar *bytes, int size);
-#else
- QFontEngineQPF(const QFontDef &def, int fd, QFontEngine *renderingFontEngine = 0);
-#endif
- ~QFontEngineQPF();
-
- FaceId faceId() const { return face_id; }
- bool getSfntTableData(uint tag, uchar *buffer, uint *length) const;
-
- bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const;
- void recalcAdvances(QGlyphLayout *, ShaperFlags) const;
-
- void draw(QPaintEngine *p, qreal x, qreal y, const QTextItemInt &si);
- void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags);
- QImage alphaMapForGlyph(glyph_t t);
-
- glyph_metrics_t boundingBox(const QGlyphLayout &glyphs);
- glyph_metrics_t boundingBox(glyph_t glyph);
-
- QFixed ascent() const;
- QFixed descent() const;
- QFixed leading() const;
- qreal maxCharWidth() const;
- qreal minLeftBearing() const;
- qreal minRightBearing() const;
- QFixed underlinePosition() const;
- QFixed lineThickness() const;
-
- Type type() const;
-
- bool canRender(const QChar *string, int len);
- inline const char *name() const { return "QPF2"; }
-
- virtual int glyphCount() const { return glyphMapEntries; }
-
- bool isValid() const;
-
- const Glyph *findGlyph(glyph_t g) const;
-
- static bool verifyHeader(const uchar *data, int size);
- static QVariant extractHeaderField(const uchar *data, HeaderTag tag);
- static QList<QByteArray> cleanUpAfterClientCrash(const QList<int> &crashedClientIds);
-
-#if !defined(QT_NO_FREETYPE)
- FT_Face lockFace() const;
- void unlockFace() const;
- void doKerning(QGlyphLayout *g, ShaperFlags flags) const;
- virtual int getPointInOutline(glyph_t glyph, int flags, quint32 point, QFixed *xpos, QFixed *ypos, quint32 *nPoints);
- virtual QFixed emSquareSize() const;
-#endif
-
- inline QString fontFile() const { return fileName; }
-
- QFontEngine *renderingEngine() const { return renderingFontEngine; }
-
- QFontEngine *takeRenderingEngine()
- {
- QFontEngine *engine = renderingFontEngine;
- renderingFontEngine = 0;
- return engine;
- }
-
-private:
-#if !defined(QT_NO_FREETYPE)
- void ensureGlyphsLoaded(const QGlyphLayout &glyphs);
- void loadGlyph(glyph_t glyph);
- bool lockFile();
- void unlockFile();
- void remapFontData();
-#endif
-
- int fd;
- const uchar *fontData;
- int dataSize;
- const uchar *externalCMap;
- quint32 cmapOffset;
- int cmapSize;
- quint32 glyphMapOffset;
- quint32 glyphMapEntries;
- quint32 glyphDataOffset;
- quint32 glyphDataSize;
- QString fileName;
- QByteArray encodedFileName;
- bool readOnly;
-
- QFreetypeFace *freetype;
- FaceId face_id;
- QByteArray freetypeCMapTable;
- mutable bool kerning_pairs_loaded;
- QFontEngine *renderingFontEngine;
-};
-
-struct QPFGenerator
-{
- QPFGenerator(QBuffer *device, QFontEngine *engine)
- : dev(device), fe(engine) {}
-
- void generate();
- void writeHeader();
- void writeGMap();
- void writeBlock(QFontEngineQPF::BlockTag tag, const QByteArray &data);
-
- void writeTaggedString(QFontEngineQPF::HeaderTag tag, const QByteArray &string);
- void writeTaggedUInt32(QFontEngineQPF::HeaderTag tag, quint32 value);
- void writeTaggedUInt8(QFontEngineQPF::HeaderTag tag, quint8 value);
- void writeTaggedQFixed(QFontEngineQPF::HeaderTag tag, QFixed value);
-
- void writeUInt16(quint16 value) { value = qToBigEndian(value); dev->write((const char *)&value, sizeof(value)); }
- void writeUInt32(quint32 value) { value = qToBigEndian(value); dev->write((const char *)&value, sizeof(value)); }
- void writeUInt8(quint8 value) { dev->write((const char *)&value, sizeof(value)); }
- void writeInt8(qint8 value) { dev->write((const char *)&value, sizeof(value)); }
-
- void align4() { while (dev->pos() & 3) { dev->putChar('\0'); } }
-
- QBuffer *dev;
- QFontEngine *fe;
-};
-
-#endif // QT_NO_QWS_QPF2
-
-class QFontEngineMultiQWS : public QFontEngineMulti
-{
-public:
- QFontEngineMultiQWS(QFontEngine *fe, int script, const QStringList &fallbacks);
-
- void loadEngine(int at);
- void draw(QPaintEngine *p, qreal x, qreal y, const QTextItemInt &si);
-
-private:
- QStringList fallbackFamilies;
- int script;
-};
-
-QT_END_NAMESPACE
-
-#endif // QFONTENGINE_QPF_P_H
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 8bd7b13be8..9b1903b136 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -51,6 +51,8 @@
#include <qtextstream.h>
#include <qdebug.h>
+#include <algorithm>
+
#include <ctype.h>
QT_BEGIN_NAMESPACE
@@ -362,8 +364,8 @@ int SizePolicyHandle::compare(const SizePolicyHandle &rhs) const
WriteInitialization::LayoutDefaultHandler::LayoutDefaultHandler()
{
- qFill(m_state, m_state + NumProperties, 0u);
- qFill(m_defaultValues, m_defaultValues + NumProperties, 0);
+ std::fill_n(m_state, int(NumProperties), 0u);
+ std::fill_n(m_defaultValues, int(NumProperties), 0);
}
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp
index 161dc65987..f545d1ffd2 100644
--- a/src/widgets/dialogs/qmessagebox.cpp
+++ b/src/widgets/dialogs/qmessagebox.cpp
@@ -271,13 +271,7 @@ void QMessageBoxPrivate::init(const QString &title, const QString &text)
label->setTextInteractionFlags(Qt::TextInteractionFlags(q->style()->styleHint(QStyle::SH_MessageBox_TextInteractionFlags, 0, q)));
label->setAlignment(Qt::AlignVCenter | Qt::AlignLeft);
label->setOpenExternalLinks(true);
-#if defined(Q_OS_MAC)
- label->setContentsMargins(16, 0, 0, 0);
-#else
- label->setContentsMargins(2, 0, 0, 0);
- label->setIndent(9);
-#endif
- iconLabel = new QLabel;
+ iconLabel = new QLabel(q);
iconLabel->setObjectName(QLatin1String("qt_msgboxex_icon_label"));
iconLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
@@ -305,26 +299,37 @@ void QMessageBoxPrivate::setupLayout()
Q_Q(QMessageBox);
delete q->layout();
QGridLayout *grid = new QGridLayout;
- grid->addWidget(iconLabel, 0, 0, 2, 1, Qt::AlignTop);
- grid->addWidget(label, 0, 1, 1, 1);
- if (informativeLabel)
- grid->addWidget(informativeLabel, 1, 1, 1, 1);
-#ifndef Q_OS_MAC
- grid->addWidget(buttonBox, 2, 0, 1, 2);
+ bool hasIcon = iconLabel->pixmap() && !iconLabel->pixmap()->isNull();
+
+ if (hasIcon)
+ grid->addWidget(iconLabel, 0, 0, 2, 1, Qt::AlignTop);
+ iconLabel->setVisible(hasIcon);
+#ifdef Q_OS_MAC
+ QSpacerItem *indentSpacer = new QSpacerItem(14, 1, QSizePolicy::Fixed, QSizePolicy::Fixed);
#else
- grid->addWidget(buttonBox, 3, 1, 1, 1);
+ QSpacerItem *indentSpacer = new QSpacerItem(hasIcon ? 7 : 15, 1, QSizePolicy::Fixed, QSizePolicy::Fixed);
#endif
- if (detailsText)
- grid->addWidget(detailsText, grid->rowCount(), 0, 1, grid->columnCount());
+ grid->addItem(indentSpacer, 0, hasIcon ? 1 : 0, 2, 1);
+ grid->addWidget(label, 0, hasIcon ? 2 : 1, 1, 1);
+ if (informativeLabel) {
+#ifndef Q_OS_MAC
+ informativeLabel->setContentsMargins(0, 7, 0, 7);
+#endif
+ grid->addWidget(informativeLabel, 1, hasIcon ? 2 : 1, 1, 1);
+ }
#ifdef Q_OS_MAC
+ grid->addWidget(buttonBox, 3, hasIcon ? 2 : 1, 1, 1);
grid->setMargin(0);
grid->setVerticalSpacing(8);
grid->setHorizontalSpacing(0);
q->setContentsMargins(24, 15, 24, 20);
grid->setRowStretch(1, 100);
grid->setRowMinimumHeight(2, 6);
+#else
+ grid->addWidget(buttonBox, 2, 0, 1, grid->columnCount());
#endif
-
+ if (detailsText)
+ grid->addWidget(detailsText, grid->rowCount(), 0, 1, grid->columnCount());
grid->setSizeConstraint(QLayout::SetNoConstraint);
q->setLayout(grid);
@@ -1233,8 +1238,8 @@ void QMessageBox::setIconPixmap(const QPixmap &pixmap)
{
Q_D(QMessageBox);
d->iconLabel->setPixmap(pixmap);
- d->updateSize();
d->icon = NoIcon;
+ d->setupLayout();
}
/*!
@@ -2532,9 +2537,6 @@ void QMessageBox::setInformativeText(const QString &text)
d->informativeLabel->deleteLater();
}
d->informativeLabel = 0;
-#ifndef Q_OS_MAC
- d->label->setContentsMargins(2, 0, 0, 0);
-#endif
} else {
if (!d->informativeLabel) {
QLabel *label = new QLabel;
@@ -2543,12 +2545,7 @@ void QMessageBox::setInformativeText(const QString &text)
label->setAlignment(Qt::AlignTop | Qt::AlignLeft);
label->setOpenExternalLinks(true);
label->setWordWrap(true);
-#ifndef Q_OS_MAC
- d->label->setContentsMargins(2, 0, 0, 0);
- label->setContentsMargins(2, 0, 0, 6);
- label->setIndent(9);
-#else
- label->setContentsMargins(16, 0, 0, 0);
+#ifdef Q_OS_MAC
// apply a smaller font the information label on the mac
label->setFont(qt_app_fonts_hash()->value("QTipLabel"));
#endif
diff --git a/src/widgets/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h
index 9c6d67410a..8c3724affb 100644
--- a/src/widgets/kernel/qsizepolicy.h
+++ b/src/widgets/kernel/qsizepolicy.h
@@ -144,17 +144,18 @@ private:
#endif
QSizePolicy(int i) : data(i) { }
+ struct Bits {
+ quint32 horStretch : 8;
+ quint32 verStretch : 8;
+ quint32 horPolicy : 4;
+ quint32 verPolicy : 4;
+ quint32 ctype : 5;
+ quint32 hfw : 1;
+ quint32 wfh : 1;
+ quint32 retainSizeWhenHidden : 1;
+ };
union {
- struct {
- quint32 horStretch : 8;
- quint32 verStretch : 8;
- quint32 horPolicy : 4;
- quint32 verPolicy : 4;
- quint32 ctype : 5;
- quint32 hfw : 1;
- quint32 wfh : 1;
- quint32 retainSizeWhenHidden : 1;
- } bits;
+ Bits bits;
quint32 data;
};
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 10:35:30 +0000