diff options
author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-03-24 09:20:24 (GMT) |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-03-24 09:20:24 (GMT) |
commit | 555175f9d9e5633b8fcfd6e6f6a11c84faa9946e (patch) | |
tree | a0be0a104e3cccf1822fda457dc47cfbef275fcf /src/gui/kernel/qwidget_x11.cpp | |
parent | e6bb8a4971b5d48190f9b8e6105926fcd1c47bda (diff) | |
download | Qt-555175f9d9e5633b8fcfd6e6f6a11c84faa9946e.zip Qt-555175f9d9e5633b8fcfd6e6f6a11c84faa9946e.tar.gz Qt-555175f9d9e5633b8fcfd6e6f6a11c84faa9946e.tar.bz2 |
Revert "Make QWidget::activateWindow() NET window manager aware."
This reverts commit 6390248b11b3596d8c946c232e9b0d832dc42941,
which caused the following regressions:
TESTFUNCTION_FAIL qshortcut::ambiguousItems (pulse_linux-g++)
TESTFUNCTION_FAIL qshortcut::ambiguousRotation (pulse_linux-g++)
TESTFUNCTION_FAIL qshortcut::disabledItems (pulse_linux-g++)
TESTFUNCTION_FAIL qshortcut::keypressConsumption (pulse_linux-g++)
TESTFUNCTION_FAIL qshortcut::number (pulse_linux-g++)
TESTFUNCTION_FAIL qshortcut::text (pulse_linux-g++)
TESTFUNCTION_FAIL qshortcut::unicodeCompare (pulse_linux-g++)
Diffstat (limited to 'src/gui/kernel/qwidget_x11.cpp')
-rw-r--r-- | src/gui/kernel/qwidget_x11.cpp | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp index c1363d2..2266379 100644 --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp @@ -1641,27 +1641,7 @@ void QWidget::activateWindow() if (X11->userTime == 0) X11->userTime = X11->time; qt_net_update_user_time(tlw, X11->userTime); - - if (X11->isSupportedByWM(ATOM(_NET_ACTIVE_WINDOW))) { - XEvent e; - e.xclient.type = ClientMessage; - e.xclient.message_type = ATOM(_NET_ACTIVE_WINDOW); - e.xclient.display = X11->display; - e.xclient.window = tlw->internalWinId(); - e.xclient.format = 32; - e.xclient.data.l[0] = 1; // 1 == application - e.xclient.data.l[1] = X11->userTime; - if (QWidget *aw = QApplication::activeWindow()) - e.xclient.data.l[2] = aw->internalWinId(); - else - e.xclient.data.l[2] = XNone; - e.xclient.data.l[3] = 0; - e.xclient.data.l[4] = 0; - XSendEvent(X11->display, RootWindow(X11->display, tlw->x11Info().screen()), - false, SubstructureNotifyMask | SubstructureRedirectMask, &e); - } else { - XSetInputFocus(X11->display, tlw->internalWinId(), XRevertToParent, X11->time); - } + XSetInputFocus(X11->display, tlw->internalWinId(), XRevertToParent, X11->time); } } |