diff options
| -rw-r--r-- | src/gui/kernel/qapplication_x11.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qt_x11_p.h | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_x11.cpp | 22 |
3 files changed, 1 insertions, 25 deletions
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 67e0865..ea44173 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -275,8 +275,6 @@ static const char * x11_atomnames = { "_NET_SYSTEM_TRAY_VISUAL\0" - "_NET_ACTIVE_WINDOW\0" - // Property formats "COMPOUND_TEXT\0" "TEXT\0" diff --git a/src/gui/kernel/qt_x11_p.h b/src/gui/kernel/qt_x11_p.h index 7383382..e1b2625 100644 --- a/src/gui/kernel/qt_x11_p.h +++ b/src/gui/kernel/qt_x11_p.h @@ -632,8 +632,6 @@ struct QX11Data _NET_SYSTEM_TRAY_VISUAL, - _NET_ACTIVE_WINDOW, - // Property formats COMPOUND_TEXT, TEXT, 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); } } |