sync: from linuxdeepin/dde-session-shell

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

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

Author: deepin-ci-robot

src/session-widgets/lockcontent.cpp

@@ -112,6 +112,13 @@ void LockContent::init(SessionBaseModel *model)
     }
 
     DConfigHelper::instance()->bind(this, SHOW_MEDIA_WIDGET, &LockContent::OnDConfigPropertyChanged);
+
+    if (m_model->appType() == AuthCommon::Login && keyboardLayoutHasSpecialSetting()) {
+        m_originalKBLayout = getCurrentKBLayoutAndVariant();
+        qCInfo(DDE_SHELL) << "Original keyboard layout:" << m_originalKBLayout;
+        // 如果是登录界面且键盘布局有特殊设置，则切换到英文键盘布局
+        setKBLayoutAndVariant("us");
+    }
 }
 
 void LockContent::initUI()
@@ -184,8 +191,13 @@ 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()) {
+                // 切换回原来的键盘布局
+                setKBLayoutAndVariant(m_originalKBLayout);
+            }
+        }
         restoreMode();
     });
     connect(m_model, &SessionBaseModel::MFAFlagChanged, this, [this](const bool isMFA) {
@@ -985,3 +997,53 @@ void LockContent::showShutdown()
     m_model->setCurrentModeState(SessionBaseModel::ModeStatus::ShutDownMode);
     m_model->setVisible(true);
 }
+
+// 判断键盘布局是否有特殊设置，如XKBVARIANT=tib（藏文键盘布局），这个配置文件可通过安装器后配置键盘布局修改
+// 如果设置特殊键盘布局，则在greeter阶段会导致无法输入的问题，密码输入框等设置过滤规则（如大小写，数字，符号等）
+bool LockContent::keyboardLayoutHasSpecialSetting() const
+{
+    QFile file("/etc/default/keyboard");
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+        return false;
+
+    QTextStream in(&file);
+    while (!in.atEnd()) {
+        QString line = in.readLine().trimmed();
+        if (line.startsWith("XKBVARIANT=")) {
+            QString val = line.section('=', 1).trimmed();
+            if (val.startsWith('"') && val.endsWith('"'))
+                val = val.mid(1, val.length() - 2);  // Remove quotes
+            return !val.trimmed().isEmpty();
+        }
+    }
+
+    return false;
+}
+
+QString LockContent::getCurrentKBLayoutAndVariant() const
+{
+    QProcess p;
+    p.start("/usr/bin/setxkbmap", {"-query"});
+    p.waitForFinished();
+    QString layout, variant;
+
+    const QString output = QString::fromUtf8(p.readAllStandardOutput());
+    for (const QString &line : output.split('\n')) {
+        if (line.startsWith("layout:"))
+            layout = line.section(':', 1).trimmed();
+        else if (line.startsWith("variant:"))
+            variant = line.section(':', 1).trimmed();
+    }
+
+    return variant.isEmpty() ? layout : layout + "+" + variant;
+}
+
+void LockContent::setKBLayoutAndVariant(const QString &layoutVariant)
+{
+    qCInfo(DDE_SHELL) << "Set keyboard layout and variant: " << layoutVariant;
+    const QStringList parts = layoutVariant.split('+');
+    if (parts.size() == 2)
+        QProcess::execute("/usr/bin/setxkbmap", {parts[0], "-variant", parts[1]});
+    else if (parts.size() == 1)
+        QProcess::execute("/usr/bin/setxkbmap", {parts[0]});
+}

src/session-widgets/lockcontent.h

@@ -101,6 +101,9 @@ public slots:
     void initFMAWidget();
     void initUserListWidget();
     void enableSystemShortcut(const QStringList &shortcuts, bool enabled, bool isPersistent);
+    bool keyboardLayoutHasSpecialSetting() const;
+    QString getCurrentKBLayoutAndVariant() const;
+    void setKBLayoutAndVariant(const QString &layoutVariant);
 
 protected:
     SessionBaseModel *m_model = nullptr;
@@ -133,6 +136,8 @@ public slots:
     bool m_MPRISEnable = false;
     bool m_showMediaWidget = false;
     bool m_hasResetPasswordDialog = false;
+
+    QString m_originalKBLayout;
 };
 
 #endif // LOCKCONTENT_H

src/widgets/inhibitwarnview.cpp

@@ -10,10 +10,22 @@
 #include <DLabel>
 #include <DToolTip>
 
+#ifdef ENABLE_DSS_SNIPE
+#include <DSGApplication>
+#include <DUtil>
+#include <DDBusSender>
+#endif
+
 #include <QHBoxLayout>
 
 DWIDGET_USE_NAMESPACE
 
+#ifdef ENABLE_DSS_SNIPE
+#define AMDBUS_SERVICE "org.desktopspec.ApplicationManager1"
+#define AMDBUS_PATH_APP_PREFIX "/org/desktopspec/ApplicationManager1"
+#define AMDBUS_APP_INTERFACE "org.desktopspec.ApplicationManager1.Application"
+#endif
+
 const int ButtonWidth = 200;
 const int ButtonHeight = 64;
 const int FIXED_INHIBITOR_WIDTH = 328;
@@ -86,16 +98,41 @@ void InhibitWarnView::setInhibitorList(const QList<InhibitorData> &list)
     for (const InhibitorData &inhibitor : list) {
         QIcon icon;
 
-        if (inhibitor.icon.isEmpty() && inhibitor.pid) {
+        if (inhibitor.icon.isEmpty()) {
+            QString iconName;
+#ifdef ENABLE_DSS_SNIPE
+            do {
+                const auto appId = Dtk::Core::DSGApplication::getId(inhibitor.pid);
+                if (appId.isEmpty())
+                    break;
+                const auto amDBusAppPath = QString("%1/%2").arg(AMDBUS_PATH_APP_PREFIX, DUtil::escapeToObjectPath(appId));
+                QDBusReply<QDBusVariant> reply = DDBusSender()
+                    .service(AMDBUS_SERVICE)
+                    .path(amDBusAppPath)
+                    .interface(AMDBUS_APP_INTERFACE)
+                    .property("Icons")
+                    .get();
+                if (reply.isValid()) {
+                    auto ret = qdbus_cast<QMap<QString, QString>>(reply.value().variant());
+                    iconName = ret.value("Desktop Entry");
+                } else {
+                    qCWarning(DDE_SHELL) << "Get icon error:" << reply.error().message();
+                    break;
+                }
+            } while(0);
+#endif
+
+            if (iconName.isEmpty() && inhibitor.pid) {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-            QFileInfo executable_info(QFile::symLinkTarget(QString("/proc/%1/exe").arg(inhibitor.pid)));
+                QFileInfo executable_info(QFile::symLinkTarget(QString("/proc/%1/exe").arg(inhibitor.pid)));
 #else
-            QFileInfo executable_info(QFile::readLink(QString("/proc/%1/exe").arg(inhibitor.pid)));
+                QFileInfo executable_info(QFile::readLink(QString("/proc/%1/exe").arg(inhibitor.pid)));
 #endif
-
-            if (executable_info.exists()) {
-                icon = QIcon::fromTheme(executable_info.fileName());
+                // 玲珑应用的exe指向的路径是容器内的路径，在容器外无法访问，因此不能判断文件是否存在
+                QString iconName = executable_info.fileName();
             }
+
+            icon = QIcon::fromTheme(iconName);
         } else {
             icon = QIcon::fromTheme(inhibitor.icon, QIcon::fromTheme("application-x-desktop"));
         }