fix: restore hardware sleep shortcuts

src/plugin-qt/shortcut/configs/org.deepin.dde.keybinding.ini

@@ -30,7 +30,9 @@ org.deepin.dde.keybinding.shortcut.music,\
 org.deepin.dde.keybinding.shortcut.numlock,\
 org.deepin.dde.keybinding.shortcut.pictures,\
 org.deepin.dde.keybinding.shortcut.power,\
+org.deepin.dde.keybinding.shortcut.sleep,\
 org.deepin.dde.keybinding.shortcut.speechtotext,\
+org.deepin.dde.keybinding.shortcut.suspend,\
 org.deepin.dde.keybinding.shortcut.texttospeech,\
 org.deepin.dde.keybinding.shortcut.tools,\
 org.deepin.dde.keybinding.shortcut.touchpadoff,\

src/plugin-qt/shortcut/configs/org.deepin.dde.keybinding.shortcut.sleep/org.deepin.shortcut.json

@@ -0,0 +1,92 @@
+{
+    "magic": "dsg.config.meta",
+    "version": "1.0",
+    "contents": {
+        "appId": {
+            "value": "org.deepin.dde.keybinding",
+            "serial": 0,
+            "flags": [],
+            "name": "appId",
+            "name[zh_CN]": "提供快捷键应用Id",
+            "description": "provide shortcut app id",
+            "permissions": "",
+            "visibility": "private"
+        },
+        "displayName": {
+            "value": "Sleep",
+            "serial": 0,
+            "flags": [],
+            "name": "displayName",
+            "name[zh_CN]": "睡眠",
+            "description": "睡眠快捷键",
+            "permissions": "",
+            "visibility": "private"
+        },
+        "hotkeys": {
+            "value": [
+                "Sleep"
+            ],
+            "serial": 0,
+            "flags": [],
+            "name": "hotkeys",
+            "name[zh_CN]": "快捷键组合",
+            "description": "快捷键组合",
+            "permissions": "",
+            "visibility": "private"
+        },
+        "triggerType": {
+            "value": 1,
+            "serial": 0,
+            "flags": [],
+            "name": "triggerType",
+            "name[zh_CN]": "快捷键触发动作类型",
+            "description": "appId类型",
+            "permissions": "",
+            "visibility": "private"
+        },
+        "triggerValue": {
+            "value": [
+                "/usr/bin/dde-shortcut-tool",
+                "power",
+                "suspend"
+            ],
+            "serial": 0,
+            "flags": [],
+            "name": "triggerValue",
+            "name[zh_CN]": "快捷键触发动作",
+            "description": "触发动作",
+            "permissions": "",
+            "visibility": "private"
+        },
+        "category": {
+            "value": "System",
+            "serial": 1,
+            "flags": [],
+            "name": "category",
+            "name[zh_CN]": "快捷键类别（System）",
+            "description": "System shortcut category",
+            "permissions": "",
+            "visibility": "private"
+        },
+        "enabled": {
+            "value": true,
+            "serial": 0,
+            "flags": [],
+            "name": "enabled",
+            "name[zh_CN]": "使能",
+            "description": "是否启用快捷键",
+            "permissions": "",
+            "visibility": "private"
+        },
+        "modifiable": {
+            "value": false,
+            "serial": 0,
+            "flags": [],
+            "name": "modifiable",
+            "name[zh_CN]": "能否修改快捷键",
+            "description": "不能修改快捷键",
+            "permissions": "",
+            "visibility": "private"
+        }
+    }
+}

src/plugin-qt/shortcut/configs/org.deepin.dde.keybinding.shortcut.suspend/org.deepin.shortcut.json

@@ -0,0 +1,92 @@
+{
+    "magic": "dsg.config.meta",
+    "version": "1.0",
+    "contents": {
+        "appId": {
+            "value": "org.deepin.dde.keybinding",
+            "serial": 0,
+            "flags": [],
+            "name": "appId",
+            "name[zh_CN]": "提供快捷键应用Id",
+            "description": "provide shortcut app id",
+            "permissions": "",
+            "visibility": "private"
+        },
+        "displayName": {
+            "value": "Suspend",
+            "serial": 0,
+            "flags": [],
+            "name": "displayName",
+            "name[zh_CN]": "睡眠",
+            "description": "睡眠快捷键",
+            "permissions": "",
+            "visibility": "private"
+        },
+        "hotkeys": {
+            "value": [
+                "Suspend"
+            ],
+            "serial": 0,
+            "flags": [],
+            "name": "hotkeys",
+            "name[zh_CN]": "快捷键组合",
+            "description": "快捷键组合",
+            "permissions": "",
+            "visibility": "private"
+        },
+        "triggerType": {
+            "value": 1,
+            "serial": 0,
+            "flags": [],
+            "name": "triggerType",
+            "name[zh_CN]": "快捷键触发动作类型",
+            "description": "appId类型",
+            "permissions": "",
+            "visibility": "private"
+        },
+        "triggerValue": {
+            "value": [
+                "/usr/bin/dde-shortcut-tool",
+                "power",
+                "suspend"
+            ],
+            "serial": 0,
+            "flags": [],
+            "name": "triggerValue",
+            "name[zh_CN]": "快捷键触发动作",
+            "description": "触发动作",
+            "permissions": "",
+            "visibility": "private"
+        },
+        "category": {
+            "value": "System",
+            "serial": 1,
+            "flags": [],
+            "name": "category",
+            "name[zh_CN]": "快捷键类别（System）",
+            "description": "System shortcut category",
+            "permissions": "",
+            "visibility": "private"
+        },
+        "enabled": {
+            "value": true,
+            "serial": 0,
+            "flags": [],
+            "name": "enabled",
+            "name[zh_CN]": "使能",
+            "description": "是否启用快捷键",
+            "permissions": "",
+            "visibility": "private"
+        },
+        "modifiable": {
+            "value": false,
+            "serial": 0,
+            "flags": [],
+            "name": "modifiable",
+            "name[zh_CN]": "能否修改快捷键",
+            "description": "不能修改快捷键",
+            "permissions": "",
+            "visibility": "private"
+        }
+    }
+}

src/plugin-qt/shortcut/src/backend/wayland/waylandkeyhandler.cpp

@@ -44,6 +44,15 @@ bool WaylandKeyHandler::registerKey(const KeyConfig &config)
 {
     if (!m_wrapper) return false;
 
+    // Treeland rejects bare Qt::Key_Sleep and rolls back the entire commit.
+    // Reject it before queuing any bindings. Remove this compatibility guard
+    // once the supported Treeland versions accept Sleep.
+    if (config.hotkeys.contains(QStringLiteral("Sleep"))) {
+        qCInfo(logShortcut) << "WaylandKeyHandler: Sleep is not supported by Treeland:"
+                           << config.getId();
+        return false;
+    }
+
     if (m_idToNames.contains(config.getId())) {
         unregisterKey(config.getId());
     }

src/plugin-qt/shortcut/src/core/qkeysequenceconverter.cpp

@@ -246,10 +246,13 @@
 {
     return (key >= Qt::Key_Back && key <= Qt::Key_Calculator) ||
            (key >= Qt::Key_AudioRewind && key <= Qt::Key_MediaLast) ||
-           (key >= Qt::Key_KeyboardLightOnOff && key <= Qt::Key_KeyboardBrightnessUp);
+           (key >= Qt::Key_KeyboardLightOnOff && key <= Qt::Key_KeyboardBrightnessUp) ||
+           // Qt places Key_Sleep outside the multimedia ranges (0x01020004),
+           // but hardware sleep keys (XF86Sleep) must still validate as hotkeys.
+           key == Qt::Key_Sleep;
 }
 
 QString QKeySequenceConverter::multimediaKeyToQKeySequenceName(Qt::Key key)
 {
     return QKeySequence(key).toString(QKeySequence::PortableText);
 }

src/plugin-qt/shortcut/tests/tst_qkeysequenceconverter.cpp

@@ -10,9 +10,11 @@
 {
     Q_OBJECT
 
 private slots:
     void symbolKeysUseXkbNames_data();
     void symbolKeysUseXkbNames();
+    void multimediaKeysAreRecognized_data();
+    void multimediaKeysAreRecognized();
 };
 
 void TestQKeySequenceConverter::symbolKeysUseXkbNames_data()
@@ -29,7 +31,11 @@
     QTest::newRow("display") << QStringLiteral("Display")
                               << QStringLiteral("XF86Display");
     QTest::newRow("webcam") << QStringLiteral("WebCam")
-                             << QStringLiteral("XF86WebCam");
+                              << QStringLiteral("XF86WebCam");
+    QTest::newRow("sleep") << QStringLiteral("Sleep")
+                            << QStringLiteral("XF86Sleep");
+    QTest::newRow("suspend") << QStringLiteral("Suspend")
+                              << QStringLiteral("XF86Suspend");
 }
 
 void TestQKeySequenceConverter::symbolKeysUseXkbNames()
@@ -41,6 +47,29 @@
     QCOMPARE(QKeySequenceConverter::xkbToQKeySequence(xkbSequence), qtSequence);
 }
 
+void TestQKeySequenceConverter::multimediaKeysAreRecognized_data()
+{
+    QTest::addColumn<int>("qtKey");
+    QTest::addColumn<bool>("expected");
+
+    // Regression: Qt::Key_Sleep (0x01020004) sits outside the classic
+    // multimedia ranges but hardware sleep keys (XF86Sleep) must validate,
+    // otherwise KeybindingManager::registerShortcut() drops the binding.
+    QTest::newRow("sleep") << static_cast<int>(Qt::Key_Sleep) << true;
+    QTest::newRow("suspend") << static_cast<int>(Qt::Key_Suspend) << true;
+    QTest::newRow("launch-mail") << static_cast<int>(Qt::Key_LaunchMail) << true;
+    QTest::newRow("mic-mute") << static_cast<int>(Qt::Key_MicMute) << true;
+    QTest::newRow("plain-a-is-not-multimedia") << static_cast<int>(Qt::Key_A) << false;
+}
+
+void TestQKeySequenceConverter::multimediaKeysAreRecognized()
+{
+    QFETCH(int, qtKey);
+    QFETCH(bool, expected);
+
+    QCOMPARE(QKeySequenceConverter::isMultimediaKey(static_cast<Qt::Key>(qtKey)), expected);
+}
+
 QTEST_GUILESS_MAIN(TestQKeySequenceConverter)
 
 #include "tst_qkeysequenceconverter.moc"