Move QColorMap into QtWidgets

Remove the remaining dependency in qnativeimage
and move the whole class into QtGui for compatibility.

The class is not needed anymore since we're not going
to support 8bit/indexed displays going forward.

Change-Id: I7b5f1b2a5661db4ed77bb3801039114c7518512d
Reviewed-on: http://codereview.qt.nokia.com/3199
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

4 files changed, 475 insertions, 0 deletions

diff --git a/src/widgets/util/qcolormap.h b/src/widgets/util/qcolormap.h
new file mode 100644
index 0000000000..7ac818fc2e
--- /dev/null
+++ b/src/widgets/util/qcolormap.h
@@ -0,0 +1,97 @@
+/****************************************************************************
+**
+** 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 QtGui module 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 QCOLORMAP_H
+#define QCOLORMAP_H
+
+#include <QtCore/qatomic.h>
+#include <QtGui/qrgb.h>
+#include <QtCore/qvector.h>
+#include <QtGui/qwindowdefs.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Gui)
+
+class QColor;
+class QColormapPrivate;
+
+class Q_GUI_EXPORT QColormap
+{
+public:
+    enum Mode { Direct, Indexed, Gray };
+
+    static void initialize();
+    static void cleanup();
+
+    static QColormap instance(int screen = -1);
+
+    QColormap(const QColormap &colormap);
+    ~QColormap();
+
+    QColormap &operator=(const QColormap &colormap);
+
+    Mode mode() const;
+
+    int depth() const;
+    int size() const;
+
+    uint pixel(const QColor &color) const;
+    const QColor colorAt(uint pixel) const;
+
+    const QVector<QColor> colormap() const;
+
+#ifdef Q_WS_WIN
+    static HPALETTE hPal();
+#endif
+
+private:
+    QColormap();
+    QColormapPrivate *d;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QCOLORMAP_H
diff --git a/src/widgets/util/qcolormap.qdoc b/src/widgets/util/qcolormap.qdoc
new file mode 100644
index 0000000000..99b97a54b4
--- /dev/null
+++ b/src/widgets/util/qcolormap.qdoc
@@ -0,0 +1,148 @@
+/****************************************************************************
+**
+** 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 documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** 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$
+**
+****************************************************************************/
+
+/*!
+    \class QColormap
+    \ingroup painting
+
+    \brief The QColormap class maps device independent QColors to device
+    dependent pixel values.
+*/
+
+/*! \enum QColormap::Mode
+
+    This enum describes how QColormap maps device independent RGB
+    values to device dependent pixel values.
+
+    \value Direct Pixel values are derived directly from the RGB
+    values, also known as "True Color."
+
+    \value Indexed Pixel values represent indexes into a vector of
+    available colors, i.e. QColormap uses the index of the color that
+    most closely matches an RGB value.
+
+    \value Gray Similar to \c Indexed, pixel values represent a vector
+    of available gray tones.  QColormap uses the index of the gray
+    tone that most closely matches the computed gray tone of an RGB
+    value.
+*/
+
+/*!
+    \fn QColormap QColormap::instance(int screen)
+
+    Returns the colormap for the specified \a screen.  If \a screen is
+    -1, this function returns the colormap for the default screen.
+*/
+
+/*!
+    \fn QColormap::QColormap(const QColormap &colormap)
+
+    Constructs a copy of another \a colormap.
+*/
+
+/*!
+    \fn QColormap::~QColormap()
+    
+    Destroys the colormap.
+*/
+
+/*!
+    \fn int QColormap::size() const
+
+    Returns the size of the colormap for \c Indexed and \c Gray modes;
+    Returns -1 for \c Direct mode.
+
+    \sa colormap()
+*/
+
+/*!
+    \fn uint QColormap::pixel(const QColor &color) const
+
+    Returns a device dependent pixel value for the \a color.
+
+    \sa colorAt()
+*/
+
+/*!
+    \fn int QColormap::depth() const
+
+    Returns the depth of the device.
+
+    \sa size()
+*/
+
+/*!
+    \fn QColormap::Mode QColormap::mode() const
+
+    Returns the mode of this colormap.
+
+    \sa QColormap::Mode
+*/
+
+/*!
+    \fn const QColor QColormap::colorAt(uint pixel) const
+
+    Returns a QColor for the \a pixel.
+
+    \sa pixel()
+*/
+
+/*!
+    \fn const QVector<QColor> QColormap::colormap() const
+
+    Returns a vector of colors which represents the devices colormap
+    for \c Indexed and \c Gray modes.  This function returns an empty
+    vector for \c Direct mode.
+
+    \sa size()
+*/
+
+/*! \fn HPALETTE QColormap::hPal()
+
+    This function is only available on Windows.
+
+    Returns an handle to the HPALETTE used by this colormap.  If no
+    HPALETTE is being used, this function returns zero.
+*/
+
+/*! \since 4.2
+
+    \fn QColormap &QColormap::operator=(const QColormap &colormap)
+
+    Assigns the given \a colormap to \e this color map and returns
+    a reference to \e this color map.
+*/
+
+/*!
+   \fn void QColormap::initialize()
+   \internal
+*/
+
+/*!
+   \fn void QColormap::cleanup()
+   \internal
+*/
diff --git a/src/widgets/util/qcolormap_qpa.cpp b/src/widgets/util/qcolormap_qpa.cpp
new file mode 100644
index 0000000000..6ad3abb3aa
--- /dev/null
+++ b/src/widgets/util/qcolormap_qpa.cpp
@@ -0,0 +1,228 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module 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 "qcolormap.h"
+#include "qcolor.h"
+#include "qpaintdevice.h"
+#include "qscreen.h"
+#include "qguiapplication.h"
+
+QT_BEGIN_NAMESPACE
+
+class QColormapPrivate
+{
+public:
+    inline QColormapPrivate()
+        : ref(1), mode(QColormap::Direct), depth(0), numcolors(0)
+    { }
+
+    QAtomicInt ref;
+
+    QColormap::Mode mode;
+    int depth;
+    int numcolors;
+};
+
+static QColormapPrivate *screenMap = 0;
+
+void QColormap::initialize()
+{
+    screenMap = new QColormapPrivate;
+
+    screenMap->depth = QGuiApplication::primaryScreen()->depth();
+    if (screenMap->depth < 8) {
+        screenMap->mode = QColormap::Indexed;
+        screenMap->numcolors = 256;
+    } else {
+        screenMap->mode = QColormap::Direct;
+        screenMap->numcolors = -1;
+    }
+}
+
+void QColormap::cleanup()
+{
+    delete screenMap;
+    screenMap = 0;
+}
+
+QColormap QColormap::instance(int /*screen*/)
+{
+    return QColormap();
+}
+
+QColormap::QColormap()
+    : d(screenMap)
+{ d->ref.ref(); }
+
+QColormap::QColormap(const QColormap &colormap)
+    :d (colormap.d)
+{ d->ref.ref(); }
+
+QColormap::~QColormap()
+{
+    if (!d->ref.deref())
+        delete d;
+}
+
+QColormap::Mode QColormap::mode() const
+{ return d->mode; }
+
+
+int QColormap::depth() const
+{ return d->depth; }
+
+
+int QColormap::size() const
+{
+    return d->numcolors;
+}
+
+#ifndef QT_QWS_DEPTH16_RGB
+#define QT_QWS_DEPTH16_RGB 565
+#endif
+static const int qt_rbits = (QT_QWS_DEPTH16_RGB/100);
+static const int qt_gbits = (QT_QWS_DEPTH16_RGB/10%10);
+static const int qt_bbits = (QT_QWS_DEPTH16_RGB%10);
+static const int qt_red_shift = qt_bbits+qt_gbits-(8-qt_rbits);
+static const int qt_green_shift = qt_bbits-(8-qt_gbits);
+static const int qt_neg_blue_shift = 8-qt_bbits;
+static const int qt_blue_mask = (1<<qt_bbits)-1;
+static const int qt_green_mask = (1<<(qt_gbits+qt_bbits))-(1<<qt_bbits);
+static const int qt_red_mask = (1<<(qt_rbits+qt_gbits+qt_bbits))-(1<<(qt_gbits+qt_bbits));
+
+static const int qt_red_rounding_shift = qt_red_shift + qt_rbits;
+static const int qt_green_rounding_shift = qt_green_shift + qt_gbits;
+static const int qt_blue_rounding_shift = qt_bbits - qt_neg_blue_shift;
+
+inline ushort qt_convRgbTo16(QRgb c)
+{
+    const int tr = qRed(c) << qt_red_shift;
+    const int tg = qGreen(c) << qt_green_shift;
+    const int tb = qBlue(c) >> qt_neg_blue_shift;
+
+    return (tb & qt_blue_mask) | (tg & qt_green_mask) | (tr & qt_red_mask);
+}
+
+inline QRgb qt_conv16ToRgb(ushort c)
+{
+    const int r=(c & qt_red_mask);
+    const int g=(c & qt_green_mask);
+    const int b=(c & qt_blue_mask);
+    const int tr = r >> qt_red_shift | r >> qt_red_rounding_shift;
+    const int tg = g >> qt_green_shift | g >> qt_green_rounding_shift;
+    const int tb = b << qt_neg_blue_shift | b >> qt_blue_rounding_shift;
+
+    return qRgb(tr,tg,tb);
+}
+
+uint QColormap::pixel(const QColor &color) const
+{
+    QRgb rgb = color.rgba();
+    if (d->mode == QColormap::Direct) {
+        switch(d->depth) {
+        case 16:
+            return qt_convRgbTo16(rgb);
+        case 24:
+        case 32:
+        {
+            const int r = qRed(rgb);
+            const int g = qGreen(rgb);
+            const int b = qBlue(rgb);
+            const int red_shift = 16;
+            const int green_shift = 8;
+            const int red_mask   = 0xff0000;
+            const int green_mask = 0x00ff00;
+            const int blue_mask  = 0x0000ff;
+            const int tg = g << green_shift;
+#ifdef QT_QWS_DEPTH_32_BGR
+            if (qt_screen->pixelType() == QScreen::BGRPixel) {
+                const int tb = b << red_shift;
+                return 0xff000000 | (r & blue_mask) | (tg & green_mask) | (tb & red_mask);
+            }
+#endif
+            const int tr = r << red_shift;
+            return 0xff000000 | (b & blue_mask) | (tg & green_mask) | (tr & red_mask);
+        }
+        }
+    }
+    //XXX
+    //return qt_screen->alloc(qRed(rgb), qGreen(rgb), qBlue(rgb));
+    return 0;
+}
+
+const QColor QColormap::colorAt(uint pixel) const
+{
+    if (d->mode == Direct) {
+        if (d->depth == 16) {
+            pixel = qt_conv16ToRgb(pixel);
+        }
+        const int red_shift = 16;
+        const int green_shift = 8;
+        const int red_mask   = 0xff0000;
+        const int green_mask = 0x00ff00;
+        const int blue_mask  = 0x0000ff;
+#ifdef QT_QWS_DEPTH_32_BGR
+        if (qt_screen->pixelType() == QScreen::BGRPixel) {
+            return QColor((pixel & blue_mask),
+                          (pixel & green_mask) >> green_shift,
+                          (pixel & red_mask) >> red_shift);
+        }
+#endif
+        return QColor((pixel & red_mask) >> red_shift,
+                      (pixel & green_mask) >> green_shift,
+                      (pixel & blue_mask));
+    }
+#if 0 // XXX
+    Q_ASSERT_X(int(pixel) < qt_screen->numCols(), "QColormap::colorAt", "pixel out of bounds of palette");
+    return QColor(qt_screen->clut()[pixel]);
+#endif
+    return QColor();
+}
+
+const QVector<QColor> QColormap::colormap() const
+{
+    return QVector<QColor>();
+}
+
+QColormap &QColormap::operator=(const QColormap &colormap)
+{ qAtomicAssign(d, colormap.d); return *this; }
+
+QT_END_NAMESPACE
diff --git a/src/widgets/util/util.pri b/src/widgets/util/util.pri
index 1ba8011ee3..2eec946338 100644
--- a/src/widgets/util/util.pri
+++ b/src/widgets/util/util.pri
@@ -2,6 +2,7 @@
 
 HEADERS += \
         util/qsystemtrayicon.h \
+        util/qcolormap.h \
         util/qcompleter.h \
         util/qcompleter_p.h \
         util/qsystemtrayicon_p.h \
@@ -17,6 +18,7 @@ HEADERS += \
 
 SOURCES += \
         util/qsystemtrayicon.cpp \
+        util/qcolormap_qpa.cpp \
         util/qcompleter.cpp \
         util/qscroller.cpp \
         util/qscrollerproperties.cpp \