Changeset 561 for trunk/src/gui/kernel/qclipboard_x11.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/kernel/qclipboard_x11.cpp (modified) (10 diffs)

trunk/src/gui/kernel/qclipboard_x11.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** 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
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -79 +79 @@
 #include "qvariant.h"
 #include "qdnd_p.h"
+
 
 #ifndef QT_NO_XFIXES
@@ -132 +133 @@
     requestor->createWinId();
     requestor->setObjectName(QLatin1String("internal clipboard requestor"));
+
+
+
+
+
     qAddPostRoutine(cleanup);
 }
@@ -429 +435 @@
     // clipboard.
     (void)QApplication::desktop();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     if (X11->time == CurrentTime) {
         // send a dummy event to myself to get the timestamp from X11.
@@ -756 +776 @@
     requestor = new QWidget(0);
     requestor->setObjectName(QLatin1String("internal clipboard requestor"));
+
+
+
 
     return QByteArray();
@@ -774 +797 @@
     types.append(ATOM(MULTIPLE));
     types.append(ATOM(TIMESTAMP));
+
 
     XChangeProperty(X11->display, window, property, XA_ATOM, 32,
@@ -787 +811 @@
 
     QByteArray fmt = X11->xdndAtomToString(target);
-    if (fmt.isEmpty() || !QInternalMimeData::hasFormatHelper(QString::fromAscii(fmt), d->source())) { // Not a MIME type we have
+    if (fmt.isEmpty()) { // Not a MIME type we have
         DEBUG("QClipboard: send_selection(): converting to type '%s' is not supported", fmt.data());
         return XNone;
@@ -898 +922 @@
     Display *dpy = X11->display;
 
-    if (!xevent)
+    if (!xevent) {
+        // That means application exits and we need to give clipboard
+        // content to the clipboard manager.
+        // First we check if there is a clipboard manager.
+        if (XGetSelectionOwner(X11->display, ATOM(CLIPBOARD_MANAGER)) == XNone
+            || !owner)
+            return true;
+
+        Window ownerId = owner->internalWinId();
+        Q_ASSERT(ownerId);
+        // we delete the property so the manager saves all TARGETS.
+        XDeleteProperty(X11->display, ownerId, ATOM(_QT_SELECTION));
+        XConvertSelection(X11->display, ATOM(CLIPBOARD_MANAGER), ATOM(SAVE_TARGETS),
+                          ATOM(_QT_SELECTION), ownerId, X11->time);
+        XSync(dpy, false);
+
+        XEvent event;
+        // waiting until the clipboard manager fetches the content.
+        if (!X11->clipboardWaitForEvent(ownerId, SelectionNotify, &event, 10000)) {
+            qWarning("QClipboard: Unable to receive an event from the "
+                     "clipboard manager in a reasonable time");
+        }
+
         return true;
+
 
     switch (xevent->type) {