sync: from linuxdeepin/dde-session-shell

Synchronize source files from linuxdeepin/dde-session-shell.

Source-pull-request: linuxdeepin/dde-session-shell#46

Author: deepin-ci-robot

plugins/CMakeLists.txt

@@ -4,4 +4,3 @@ if (DISABLE_DSS_SNIPE)
 endif()
 # add_subdirectory(examples)
 # add_subdirectory(assist_login)
-# add_subdirectory("login-gesture")

src/dde-lock/lockframe.cpp

@@ -171,7 +171,12 @@ bool LockFrame::event(QEvent *event)
         }
 
         if (keyValue != "") {
+#ifdef ENABLE_DSS_SNIPE
+            // v25 dde-daemon接受小驼峰命名的name
+            emit sendKeyValue(qtifyName(keyValue));
+#else
             emit sendKeyValue(keyValue);
+#endif
         }
     }
     return FullScreenBackground::event(event);

src/global_util/public_func.cpp

@@ -356,3 +356,21 @@ bool isSleepLock()
     return value.toBool();
 }
 #endif
+
+QString qtifyName(const QString &name) {
+    bool next_cap = false;
+    QString result;
+    
+    for (auto it = name.cbegin(); it != name.cend(); ++it) {
+        if (*it == '-') {
+            next_cap = true;
+        } else if (next_cap) {
+            result.append(it->toUpper());
+            next_cap = false;
+        } else {
+            result.append(*it);
+        }
+    }
+    
+    return result;
+}

src/global_util/public_func.h

@@ -82,4 +82,10 @@ void configWebEngine();
 bool isSleepLock();
 #endif
 
+/**
+ * @brief convert 'some-key' to 'someKey'.
+ */
+
+QString qtifyName(const QString &name);
+
 #endif // PUBLIC_FUNC_H

src/session-widgets/lockcontent.cpp

@@ -113,14 +113,6 @@ void LockContent::init(SessionBaseModel *model)
     }
 
     DConfigHelper::instance()->bind(this, SHOW_MEDIA_WIDGET, &LockContent::OnDConfigPropertyChanged);
-
-    QString kbLayout = getCurrentKBLayout();
-    if (!kbLayout.isEmpty() && !kbLayout.toLower().startsWith("us")) {
-        m_originalKBLayout = kbLayout;
-        qCInfo(DDE_SHELL) << "Original keyboard layout:" << m_originalKBLayout;
-        // 如果键盘布局有特殊设置，则切换到英文键盘布局，认证成功后恢复
-        setKBLayout("us");
-    }
 }
 
 void LockContent::initUI()
@@ -196,13 +188,8 @@ void LockContent::initConnections()
     connect(m_model, &SessionBaseModel::userListChanged, this, &LockContent::onUserListChanged);
     connect(m_model, &SessionBaseModel::userListLoginedChanged, this, &LockContent::onUserListChanged);
     connect(m_model, &SessionBaseModel::authFinished, this, [this](bool successful) {
-        if (successful) {
+        if (successful)
             setVisible(false);
-            if (!m_originalKBLayout.isEmpty()) {
-                // 切换回原来的键盘布局
-                setKBLayout(m_originalKBLayout);
-            }
-        }
         restoreMode();
     });
     connect(m_model, &SessionBaseModel::MFAFlagChanged, this, [this](const bool isMFA) {
@@ -1027,26 +1014,3 @@ void LockContent::showShutdown()
     m_model->setCurrentModeState(SessionBaseModel::ModeStatus::ShutDownMode);
     m_model->setVisible(true);
 }
-
-QString LockContent::getCurrentKBLayout() const
-{
-    QProcess p;
-    p.start("/usr/bin/setxkbmap", {"-query"});
-    p.waitForFinished();
-
-    const QString output = QString::fromUtf8(p.readAllStandardOutput());
-    for (const QString &line : output.split('\n')) {
-        if (line.startsWith("layout:")) {
-            QString layout = line.section(':', 1).trimmed();
-            return layout;
-        }
-    }
-
-    return {};
-}
-
-void LockContent::setKBLayout(const QString &layout)
-{
-    qCDebug(DDE_SHELL) << "Set keyboard layout: " << layout;
-    QProcess::execute("/usr/bin/setxkbmap", { layout});
-}

src/session-widgets/lockcontent.h

@@ -102,8 +102,6 @@ public slots:
     void initFMAWidget();
     void initUserListWidget();
     void enableSystemShortcut(const QStringList &shortcuts, bool enabled, bool isPersistent);
-    QString getCurrentKBLayout() const;
-    void setKBLayout(const QString &layout);
 
 protected:
     SessionBaseModel *m_model = nullptr;
@@ -136,8 +134,6 @@ public slots:
     bool m_MPRISEnable = false;
     bool m_showMediaWidget = false;
     bool m_hasResetPasswordDialog = false;
-
-    QString m_originalKBLayout;
 };
 
 #endif // LOCKCONTENT_H