Changeset 561 for trunk/src/gui/kernel/qx11embed_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/qx11embed_x11.cpp (modified) (11 diffs)

trunk/src/gui/kernel/qx11embed_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$
 **
 ****************************************************************************/
 
+
 #include "qx11embed_x11.h"
 #include <qapplication.h>
@@ -123 +124 @@
 
     There are XEmbed widgets available for KDE and GTK+. The GTK+
-    equivalent of QX11EmbedWidget is GtkPlug. The KDE widget is called
-    QXEmbed.
+    equivalent of QX11EmbedWidget is GtkPlug. The 
+    QXEmbed.
 
     \sa QX11EmbedContainer, {XEmbed Specification}
@@ -177 +178 @@
     lost.
 
-    The GTK+ equivalent of QX11EmbedContainer is GtkSocket. The KDE
-    widget is called QXEmbed.
+    The GTK+ equivalent of QX11EmbedContainer is GtkSocket. The
+    widget is called QXEmbed.
 
     \sa QX11EmbedWidget, {XEmbed Specification}
@@ -827 +828 @@
                                    &bytes_after_return, &prop_return) == Success) {
                 if (nitems_return > 1) {
-                    if (((int * )prop_return)[1] & XEMBED_MAPPED) {
+                    if ((( * )prop_return)[1] & XEMBED_MAPPED) {
                         XMapWindow(x11Info().display(), internalWinId());
                     } else {
@@ -1298 +1299 @@
         // keypresses.
         if (o == window() && d->client) {
-            if (!d->isEmbedded() && d->activeContainer == this)
-                d->moveInputToProxy();
-
             if (d->clientIsXEmbed) {
                 sendXEmbedMessage(d->client, x11Info().display(), XEMBED_WINDOW_ACTIVATE);
@@ -1308 +1306 @@
                     XSetInputFocus(x11Info().display(), d->client, XRevertToParent, x11Time());
             }
+
+
         }
         break;
@@ -1672 +1672 @@
             clientIsXEmbed = true;
 
-            unsigned int *p = (unsigned int *)prop_return;
+             *)prop_return;
             if (nitems_return >= 2)
-                clientversion = p[0];
+                clientversion = p[0];
         }
 
@@ -1730 +1730 @@
         if (q->hasFocus()) {
             XSetInputFocus(q->x11Info().display(), client, XRevertToParent, x11Time());
-        } else {
-            if (!isEmbedded())
-                moveInputToProxy();
         }
+
+
+
     }
 
@@ -1750 +1750 @@
 {
     Q_Q(QX11EmbedContainer);
-    WId focus;
-    int revert_to;
-    XGetInputFocus(q->x11Info().display(), &focus, &revert_to);
-    if (focus != focusProxy->internalWinId())
-        XSetInputFocus(q->x11Info().display(), focusProxy->internalWinId(), XRevertToParent, x11Time());
+    // Following Owen Taylor's advice from the XEmbed specification to
+    // always use CurrentTime when no explicit user action is involved.
+    XSetInputFocus(q->x11Info().display(), focusProxy->internalWinId(), XRevertToParent, CurrentTime);
 }