X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcolorpickerwidget.cpp;h=a9b8ce860973cb5aa22c3ad999bbf04efcb15664;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=66f828d8acae49bf9ab37a807c87164cc5a3c19b;hpb=124722a50e83ba1fc5aca2b998d190b90c9ae87a;p=kdenlive

diff --git a/src/colorpickerwidget.cpp b/src/colorpickerwidget.cpp
index 66f828d8..a9b8ce86 100644
--- a/src/colorpickerwidget.cpp
+++ b/src/colorpickerwidget.cpp
@@ -21,36 +21,39 @@
 #include "colorpickerwidget.h"
 
 #include <QMouseEvent>
-#include <QPushButton>
+#include <QHBoxLayout>
+#include <QToolButton>
+#include <QLabel>
+#include <QSpinBox>
 #include <QDesktopWidget>
+#include <QFrame>
 
 #include <KApplication>
-#include <KColorDialog>
 #include <KIcon>
+#include <KDebug>
 #include <KLocalizedString>
 
 #ifdef Q_WS_X11
-#include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <QX11Info>
 #include <fixx11h.h>
+#endif 
 
-class KCDPickerFilter: public QWidget
+MyFrame::MyFrame(QWidget* parent) :
+    QFrame(parent)
 {
-public:
-    KCDPickerFilter(QWidget* parent): QWidget(parent) {}
-
-    virtual bool x11Event(XEvent* event) {
-        if (event->type == ButtonRelease) {
-            QMouseEvent e(QEvent::MouseButtonRelease, QPoint(),
-            QPoint(event->xmotion.x_root, event->xmotion.y_root) , Qt::NoButton, Qt::NoButton, Qt::NoModifier);
-            QApplication::sendEvent(parentWidget(), &e);
-            return true;
-        }
-        return false;
-    }
-};
-#endif 
+    setFrameStyle(QFrame::Box | QFrame::Plain);
+    setWindowOpacity(0.5);
+    setWindowFlags(Qt::FramelessWindowHint);
+}
+
+// virtual
+void MyFrame::hideEvent ( QHideEvent * event )
+{
+    QFrame::hideEvent(event);
+    // We need a timer here since hiding the frame will trigger a monitor refresh timer that will
+    // repaint the monitor after 70 ms.
+    QTimer::singleShot(250, this, SIGNAL(getColor()));
+}
 
 
 ColorPickerWidget::ColorPickerWidget(QWidget *parent) :
@@ -58,65 +61,203 @@ ColorPickerWidget::ColorPickerWidget(QWidget *parent) :
         m_filterActive(false)
 {
 #ifdef Q_WS_X11
-    m_filter = 0;
+    m_image = NULL;
 #endif
 
-    QPushButton *button = new QPushButton(this);
+    QHBoxLayout *layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+
+    QToolButton *button = new QToolButton(this);
     button->setIcon(KIcon("color-picker"));
-    button->setToolTip(i18n("Pick a color on the screen"));
+    button->setToolTip("<p>" + i18n("Pick a color on the screen. By pressing the mouse button and then moving your mouse you can select a section of the screen from which to get an average color.") + "</p>");
+    button->setAutoRaise(true);
     connect(button, SIGNAL(clicked()), this, SLOT(slotSetupEventFilter()));
+
+    layout->addWidget(button);
+    setFocusPolicy(Qt::StrongFocus);
+
+    m_grabRectFrame = new MyFrame();
+    m_grabRectFrame->hide();
 }
 
 ColorPickerWidget::~ColorPickerWidget()
 {
+    delete m_grabRectFrame;
+    if (m_filterActive) removeEventFilter(this);
+}
+
+void ColorPickerWidget::slotGetAverageColor()
+{
+    disconnect(m_grabRectFrame, SIGNAL(getColor()), this, SLOT(slotGetAverageColor()));
+    m_grabRect = m_grabRect.normalized();
+
+    int numPixel = m_grabRect.width() * m_grabRect.height();
+
+    int sumR = 0;
+    int sumG = 0;
+    int sumB = 0;
+
+    // only show message for larger rects because of the overhead displayMessage creates
+    if (numPixel > 40000)
+        emit displayMessage(i18n("Requesting color information..."), 0);
+
+    /*
+     Only getting the image once for the whole rect
+     results in a vast speed improvement.
+    */
 #ifdef Q_WS_X11
-    if (m_filterActive && kapp)
-        kapp->removeX11EventFilter(m_filter);
+    Window root = RootWindow(QX11Info::display(), QX11Info::appScreen());
+    m_image = XGetImage(QX11Info::display(), root, m_grabRect.x(), m_grabRect.y(), m_grabRect.width(), m_grabRect.height(), -1, ZPixmap);
+#else
+    QWidget *desktop = QApplication::desktop();
+    m_image = QPixmap::grabWindow(desktop->winId(), m_grabRect.x(), m_grabRect.y(), m_grabRect.width(), m_grabRect.height()).toImage();
 #endif
+
+    for (int x = 0; x < m_grabRect.width(); ++x) {
+        for (int y = 0; y < m_grabRect.height(); ++y) {
+            QColor color = grabColor(QPoint(x, y), false);
+            sumR += color.red();
+            sumG += color.green();
+            sumB += color.blue();
+        }
+
+        // Warning: slows things down, so don't do it for every pixel (the inner for loop)
+        if (numPixel > 40000)
+            emit displayMessage(i18n("Requesting color information..."), (int)(x * m_grabRect.height() / (qreal)numPixel * 100));
+    }
+
+#ifdef Q_WS_X11
+    XDestroyImage(m_image);
+    m_image = NULL;
+#endif
+
+    if (numPixel > 40000)
+        emit displayMessage(i18n("Calculated average color for rectangle."), -1);
+
+    emit colorPicked(QColor(sumR / numPixel, sumG / numPixel, sumB / numPixel));
+    emit disableCurrentFilter(false);
 }
 
-void ColorPickerWidget::mouseReleaseEvent(QMouseEvent* event)
+void ColorPickerWidget::mousePressEvent(QMouseEvent* event)
+{
+    if (event->button() != Qt::LeftButton) {
+        closeEventFilter();
+	emit disableCurrentFilter(false);
+        event->accept();
+        return;
+    }
+
+    if (m_filterActive) {
+        m_grabRect = QRect(event->globalPos(), QSize(0, 0));
+        m_grabRectFrame->setGeometry(m_grabRect);
+        m_grabRectFrame->show();
+    }
+
+    QWidget::mousePressEvent(event);
+}
+
+void ColorPickerWidget::mouseReleaseEvent(QMouseEvent *event)
 {
     if (m_filterActive) {
         closeEventFilter();
-        emit colorPicked(KColorDialog::grabColor(event->globalPos()));
+
+        m_grabRect.setWidth(event->globalX() - m_grabRect.x());
+        m_grabRect.setHeight(event->globalY() - m_grabRect.y());
+
+        if (m_grabRect.width() * m_grabRect.height() == 0) {
+	    m_grabRectFrame->hide();
+            emit colorPicked(grabColor(event->globalPos()));
+	    emit disableCurrentFilter(false);
+        } else {
+            // delay because m_grabRectFrame does not hide immediately
+            connect(m_grabRectFrame, SIGNAL(getColor()), this, SLOT(slotGetAverageColor()));
+	    m_grabRectFrame->hide();
+        }
         return;
     }
     QWidget::mouseReleaseEvent(event);
 }
 
-void ColorPickerWidget::keyPressEvent(QKeyEvent* event)
+void ColorPickerWidget::mouseMoveEvent(QMouseEvent* event)
 {
     if (m_filterActive) {
-        if (event->key() == Qt::Key_Escape)
-            closeEventFilter();
-        event->accept();
-        return;
+        m_grabRect.setWidth(event->globalX() - m_grabRect.x());
+        m_grabRect.setHeight(event->globalY() - m_grabRect.y());
+        m_grabRectFrame->setGeometry(m_grabRect.normalized());
     }
-    QWidget::keyPressEvent(event);
+    QWidget::mouseMoveEvent(event);
 }
 
 void ColorPickerWidget::slotSetupEventFilter()
 {
+    emit disableCurrentFilter(true);
     m_filterActive = true;
-#ifdef Q_WS_X11
-    m_filter = new KCDPickerFilter(this);
-    kapp->installX11EventFilter(m_filter);
-#endif
-    grabMouse(Qt::CrossCursor);
+    setFocus();
+    installEventFilter(this);
+    grabMouse(QCursor(KIcon("color-picker").pixmap(22, 22), 0, 21));
     grabKeyboard();
 }
 
 void ColorPickerWidget::closeEventFilter()
 {
     m_filterActive = false;
-#ifdef Q_WS_X11
-    kapp->removeX11EventFilter(m_filter);
-    delete m_filter;
-    m_filter = 0;
-#endif
     releaseMouse();
     releaseKeyboard();
+    removeEventFilter(this);
+}
+
+bool ColorPickerWidget::eventFilter(QObject *object, QEvent *event)
+{
+    // Close color picker on any key press
+    if (event->type() == QEvent::KeyPress || event->type() == QEvent::ShortcutOverride) {
+        closeEventFilter();
+	emit disableCurrentFilter(false);
+        event->setAccepted(true);
+        return true;
+    }
+    return QObject::eventFilter(object, event);
+
+}
+
+QColor ColorPickerWidget::grabColor(const QPoint &p, bool destroyImage)
+{
+#ifdef Q_WS_X11
+    /*
+     we use the X11 API directly in this case as we are not getting back a valid
+     return from QPixmap::grabWindow in the case where the application is using
+     an argb visual
+    */
+    if( !qApp->desktop()->geometry().contains( p ))
+        return QColor();
+    unsigned long xpixel;
+    if (m_image == NULL) {
+        Window root = RootWindow(QX11Info::display(), QX11Info::appScreen());
+        m_image = XGetImage(QX11Info::display(), root, p.x(), p.y(), 1, 1, -1, ZPixmap);
+        xpixel = XGetPixel(m_image, 0, 0);
+    } else {
+        xpixel = XGetPixel(m_image, p.x(), p.y());
+    }
+    if (destroyImage) {
+        XDestroyImage(m_image);
+        m_image = 0;
+    }
+    XColor xcol;
+    xcol.pixel = xpixel;
+    xcol.flags = DoRed | DoGreen | DoBlue;
+    XQueryColor(QX11Info::display(),
+                DefaultColormap(QX11Info::display(), QX11Info::appScreen()),
+                &xcol);
+    return QColor::fromRgbF(xcol.red / 65535.0, xcol.green / 65535.0, xcol.blue / 65535.0);
+#else
+    if (m_image.isNull()) {
+        QWidget *desktop = QApplication::desktop();
+        QPixmap pm = QPixmap::grabWindow(desktop->winId(), p.x(), p.y(), 1, 1);
+        QImage i = pm.toImage();
+        return i.pixel(0, 0);
+    } else {
+        return m_image.pixel(p.x(), p.y());
+    }
+#endif
 }
 
 #include "colorpickerwidget.moc"