hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 16:25:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

core: Preserve existing XDG_CURRENT_DESKTOP (#7347)

Browse source 
* Preserve existing XDG_CURRENT_DESKTOP

* fix

---------

Co-authored-by: vaxerski <vaxry@vaxry.net>
This commit is contained in:
Vladimir-csp 2024-08-15 19:14:48 +03:00 committed by GitHub
parent 520e91238f
commit 15f942000e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Compositor.cpp
View file

@ -305,6 +305,10 @@ void CCompositor::initServer(std::string socketName, int socketFd) {
setenv("WAYLAND_DISPLAY", m_szWLDisplaySocket.c_str(), 1); setenv("WAYLAND_DISPLAY", m_szWLDisplaySocket.c_str(), 1);
setenv("XDG_SESSION_TYPE", "wayland", 1); setenv("XDG_SESSION_TYPE", "wayland", 1);
if (!getenv("XDG_CURRENT_DESKTOP")) {
setenv("XDG_CURRENT_DESKTOP", "Hyprland", 1);
m_bDesktopEnvSet = true;
}
initManagers(STAGE_BASICINIT); initManagers(STAGE_BASICINIT);
@ -422,7 +426,8 @@ void CCompositor::cleanEnvironment() {
// in main // in main
unsetenv("HYPRLAND_CMD"); unsetenv("HYPRLAND_CMD");
unsetenv("XDG_BACKEND"); unsetenv("XDG_BACKEND");
unsetenv("XDG_CURRENT_DESKTOP"); if (m_bDesktopEnvSet)
unsetenv("XDG_CURRENT_DESKTOP");
if (m_pAqBackend->hasSession()) { if (m_pAqBackend->hasSession()) {
const auto CMD = const auto CMD =

1
src/Compositor.hpp
View file

@ -91,6 +91,7 @@ class CCompositor {
bool m_bNextIsUnsafe = false; bool m_bNextIsUnsafe = false;
CMonitor* m_pUnsafeOutput = nullptr; // fallback output for the unsafe state CMonitor* m_pUnsafeOutput = nullptr; // fallback output for the unsafe state
bool m_bIsShuttingDown = false; bool m_bIsShuttingDown = false;
bool m_bDesktopEnvSet = false;
// ------------------------------------------------- // // ------------------------------------------------- //

1
src/main.cpp
View file

@ -36,7 +36,6 @@ int main(int argc, char** argv) {
setenv("XDG_BACKEND", "wayland", 1); setenv("XDG_BACKEND", "wayland", 1);
setenv("_JAVA_AWT_WM_NONREPARENTING", "1", 1); setenv("_JAVA_AWT_WM_NONREPARENTING", "1", 1);
setenv("MOZ_ENABLE_WAYLAND", "1", 1); setenv("MOZ_ENABLE_WAYLAND", "1", 1);
setenv("XDG_CURRENT_DESKTOP", "Hyprland", 1);
// parse some args // parse some args
std::string configPath; std::string configPath;