File 0001-Use-xrdb-to-set-Xcursor.theme.patch of Package login

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Use-xrdb-to-set-Xcursor.theme.patch of Package login

From 1e8920dc85f9c80950c41ecb9923024264cc243d Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Thu, 4 Apr 2024 21:47:23 +0200
Subject: [PATCH] Use xrdb to set Xcursor.theme

XCURSOR_THEME is no longer enough.
---
 src/daemon/XorgDisplayServer.cpp | 17 +++++++++++++++--
 src/helper/xorguserhelper.cpp    | 13 +++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
index 5101cfb..2249ac2 100644
--- a/src/daemon/XorgDisplayServer.cpp
+++ b/src/daemon/XorgDisplayServer.cpp
@@ -261,6 +261,9 @@ namespace SDDM {
         // create display setup script process
         QProcess *displayScript = new QProcess();
 
+        const QString xcursorTheme = mainConfig.Theme.CursorTheme.get(),
+                      xcursorSize = mainConfig.Theme.CursorSize.get();
+
         // set process environment
         QProcessEnvironment env;
         env.insert(QStringLiteral("DISPLAY"), m_display);
@@ -268,8 +271,8 @@ namespace SDDM {
         env.insert(QStringLiteral("PATH"), mainConfig.Users.DefaultPath.get());
         env.insert(QStringLiteral("XAUTHORITY"), m_xauth.authPath());
         env.insert(QStringLiteral("SHELL"), QStringLiteral("/bin/sh"));
-        env.insert(QStringLiteral("XCURSOR_THEME"), mainConfig.Theme.CursorTheme.get());
-        QString xcursorSize = mainConfig.Theme.CursorSize.get();
+        if (!xcursorTheme.isEmpty())
+            env.insert(QStringLiteral("XCURSOR_THEME"), xcursorTheme);
         if (!xcursorSize.isEmpty())
             env.insert(QStringLiteral("XCURSOR_SIZE"), xcursorSize);
         setCursor->setProcessEnvironment(env);
@@ -287,6 +290,16 @@ namespace SDDM {
             setCursor->kill();
         }
 
+        // Unlike libXcursor, xcb-util-cursor no longer looks at XCURSOR_THEME. Set the resource.
+        if (!xcursorTheme.isEmpty()) {
+            QProcess xrdbProcess;
+            xrdbProcess.setProcessEnvironment(env);
+            xrdbProcess.start(QStringLiteral("xrdb"), QStringList{QStringLiteral("-nocpp"), QStringLiteral("-merge")});
+            xrdbProcess.write(QStringLiteral("Xcursor.theme: %1").arg(xcursorTheme).toUtf8());
+            xrdbProcess.closeWriteChannel();
+            xrdbProcess.waitForFinished(1000);
+        }
+
         // start display setup script
         qDebug() << "Running display setup script " << mainConfig.X11.DisplayCommand.get();
         QStringList displayCommand = QProcess::splitCommand(mainConfig.X11.DisplayCommand.get());
diff --git a/src/helper/xorguserhelper.cpp b/src/helper/xorguserhelper.cpp
index 3f564a2..1d8213e 100644
--- a/src/helper/xorguserhelper.cpp
+++ b/src/helper/xorguserhelper.cpp
@@ -200,9 +200,12 @@ bool XOrgUserHelper::startServer(const QString &cmd)
 
 void XOrgUserHelper::startDisplayCommand()
 {
+    const QString xcursorTheme = mainConfig.Theme.CursorTheme.get();
+
     auto env = QProcessEnvironment::systemEnvironment();
     env.insert(QStringLiteral("DISPLAY"), m_display);
     env.insert(QStringLiteral("XAUTHORITY"), m_xauth.authPath());
+    env.insert(QStringLiteral("XCURSOR_THEME"), xcursorTheme);
 
     // Set cursor
     qInfo("Setting default cursor...");
@@ -215,6 +218,16 @@ void XOrgUserHelper::startDisplayCommand()
         setCursor->deleteLater();
     }
 
+    // Unlike libXcursor, xcb-util-cursor no longer looks at XCURSOR_THEME. Set the resource.
+    if (!xcursorTheme.isEmpty()) {
+        QProcess xrdbProcess;
+        xrdbProcess.setProcessEnvironment(env);
+        xrdbProcess.start(QStringLiteral("xrdb"), QStringList{QStringLiteral("-nocpp"), QStringLiteral("-merge")});
+        xrdbProcess.write(QStringLiteral("Xcursor.theme: %1").arg(xcursorTheme).toUtf8());
+        xrdbProcess.closeWriteChannel();
+        xrdbProcess.waitForFinished(1000);
+    }
+
     // Display setup script
     auto cmd = mainConfig.X11.DisplayCommand.get();
     qInfo("Running display setup script: %s", qPrintable(cmd));
-- 
2.44.0

Places

File 0001-Use-xrdb-to-set-Xcursor.theme.patch of Package login

Places