kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-02 16:31:23 +00:00
Code Issues Projects Releases Wiki Activity

Properly use X11 startup ids

Browse Source 
When one instance of Dolphin activates another it passes a startupId (X11) / activation token (wayland) along.

On X11 this is passed using the DESKTOP_STARTUP_ID environment variable. The code tries to read that through KStartupInfo::startupId().

That doesn't work though, since Qt at startup reads the environment variable afterwards. However, it is nice enough to allow us to access
it through QX11Info::nextStartupId(). Use that to read the token in the first instance and pass it to the second instance like we do on Wayland

The user-facing impact of this is minimal since KStartupInfo::setNewStartupId internally falls back to KWindowSystem::forceActiveWindow when no
startupId is passed.
This commit is contained in:
Nicolas Fella 2022-12-15 00:56:11 +01:00
parent 414311b8c8
commit 6d21deb6e4
5 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -50,6 +50,14 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
DBus
)
if (UNIX AND NOT APPLE)
set(HAVE_X11 TRUE)
if (QT_MAJOR_VERSION STREQUAL "5")
find_package(Qt5X11Extras REQUIRED)
endif()
endif()
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
KCMUtils
NewStuff

8
src/CMakeLists.txt
View File

@ -471,6 +471,14 @@ target_link_libraries(dolphin
KF5::Crash
)
if (HAVE_X11)
if (QT_MAJOR_VERSION STREQUAL "5")
target_link_libraries(dolphin PRIVATE Qt5::X11Extras)
else()
target_link_libraries(dolphin PRIVATE Qt::GuiPrivate)
endif()
endif()
include(DbusInterfaceMacros)
generate_and_install_dbus_interface(

1
src/config-dolphin.h.cmake
View File

@ -3,3 +3,4 @@
#cmakedefine01 HAVE_KUSERFEEDBACK
#cmakedefine01 HAVE_PACKAGEKIT
#cmakedefine01 HAVE_TERMINAL
#cmakedefine01 HAVE_X11

2
src/dolphinmainwindow.cpp
View File

@ -289,7 +289,7 @@ void DolphinMainWindow::activateWindow(const QString &activationToken)
if (KWindowSystem::isPlatformWayland()) {
KWindowSystem::setCurrentXdgActivationToken(activationToken);
} else {
KStartupInfo::setNewStartupId(window()->windowHandle(), KStartupInfo::startupId());
KStartupInfo::setNewStartupId(window()->windowHandle(), activationToken.toUtf8());
}
KWindowSystem::activateWindow(window()->windowHandle());

12
src/main.cpp
View File

@ -35,6 +35,14 @@
#include <QDBusConnectionInterface>
#include <QSessionManager>
#if HAVE_X11
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
#include <private/qtx11extras_p.h>
#else
#include <QX11Info>
#endif
#endif
#ifndef Q_OS_WIN
#include <unistd.h>
#endif
@ -181,6 +189,10 @@ int main(int argc, char **argv)
if (KWindowSystem::isPlatformWayland()) {
token = qEnvironmentVariable("XDG_ACTIVATION_TOKEN");
qunsetenv("XDG_ACTIVATION_TOKEN");
} else if (KWindowSystem::isPlatformX11()) {
#if HAVE_X11
token = QX11Info::nextStartupId();
#endif
}
if (Dolphin::attachToExistingInstance(urls, openFiles, splitView, QString(), token)) {