Terminal: add QTermWidget::addCustomKeyboardLayoutDir

Author: KangLin

.github/workflows/msvc.yml

@@ -438,7 +438,7 @@ jobs:
           copy /Y ${{env.INSTALL_DIR}}\lib\*.dll install\bin
           copy /Y vcpkg_installed\${{matrix.VCPKG_TARGET_TRIPLET}}\bin\*.dll install\bin
           IF EXIST "${{env.INSTALL_DIR}}\share\qtermwidget6" (
-              copy /Y ${{env.INSTALL_DIR}}\share\qtermwidget6 install\share
+              xcopy "${{env.INSTALL_DIR}}\share\qtermwidget6" install\share\qtermwidget6 /Y /S /I
           )
           C:\msys64\usr\bin\wget https://npcap.com/dist/npcap-1.80.exe
           copy npcap-1.80.exe install\bin

Plugins/SSH/BackendSSH.cpp

@@ -6,10 +6,12 @@
 
 static Q_LOGGING_CATEGORY(log, "Plugin.SSH.Backend")
 
+#define TERMWIDGET_EVENT_TYPE (QEvent::User + 1976)
+
 class QEventTerminal: public QEvent
 {
 public:
-    explicit QEventTerminal(char* data, int len) : QEvent(QEvent::User)
+    explicit QEventTerminal(char* data, int len) : QEvent((QEvent::Type)TERMWIDGET_EVENT_TYPE)
         , m_Data(data, len)
     {
     }
@@ -121,7 +123,7 @@ int CBackendSSH::OnClean()
 bool CBackendSSH::event(QEvent *event)
 {
     switch (event->type()) {
-    case QEvent::User:
+    case TERMWIDGET_EVENT_TYPE:
     {
         QEventTerminal *d = (QEventTerminal*)event;
         if(m_pChannelSSH && d->m_Data.length() > 0) {

Script/build_depend.sh

@@ -513,7 +513,7 @@ if [ $QTERMWIDGET -eq 1 ]; then
         cmake --build . --config Release --target install
     fi
     if [ ! -d ${INSTALL_DIR}/lib/cmake/qtermwidget6 ]; then
-        git clone -b 2.2.0 --depth=1 https://github.com/lxqt/qtermwidget.git
+        git clone https://github.com/KangLin/qtermwidget.git
         cd qtermwidget
         cmake -E make_directory build
         cd build

Src/Terminal/OperateTerminal.cpp

@@ -21,19 +21,26 @@ COperateTerminal::COperateTerminal(CPlugin *parent)
       m_pThread(nullptr),
       m_pParameters(nullptr)
 {
+    QTermWidget::addCustomColorSchemeDir(QApplication::applicationDirPath()
+                                         + QDir::separator() + "color-schemes");
+    QTermWidget::addCustomColorSchemeDir(QApplication::applicationDirPath()
+                                         + QDir::separator() + ".."
+                                         + QDir::separator() + "share"
+                                         + QDir::separator() + "qtermwidget6"
+                                         + QDir::separator() + "color-schemes");
+    /*QTermWidget::addCustomKeyboardLayoutDir(QApplication::applicationDirPath()
+                                            + QDir::separator() + "kb-layouts");
+    QTermWidget::addCustomKeyboardLayoutDir(QApplication::applicationDirPath()
+                                            + QDir::separator() + ".."
+                                            + QDir::separator() + "share"
+                                            + QDir::separator() + "qtermwidget6"
+                                            + QDir::separator() + "kb-layouts");//*/
     m_pTerminal = new QTermWidget(0);
     if(!m_pTerminal) {
         qCritical(log) << "new QTermWidget() fail";
         return;
     }
     m_pTerminal->setAutoClose(true);
-    m_pTerminal->addCustomColorSchemeDir(QApplication::applicationDirPath()
-                                         + QDir::separator() + "color-schemes");
-    m_pTerminal->addCustomColorSchemeDir(QApplication::applicationDirPath()
-                                         + QDir::separator() + ".."
-                                         + QDir::separator() + "share"
-                                         + QDir::separator() + "qtermwidget6"
-                                         + QDir::separator() + "color-schemes");
 
     bool check = false;
     m_pTerminal->setContextMenuPolicy(Qt::CustomContextMenu);

Src/Terminal/ParameterTerminalUI.cpp

@@ -100,14 +100,7 @@ int CParameterTerminalUI::SetParameter(CParameter *pParameter)
     ui->cbCursorShape->addItem(tr("UnderlineCursor"), (int)Konsole::Emulation::KeyboardCursorShape::UnderlineCursor);
     ui->cbCursorShape->addItem(tr("IBeamCursor"), (int)Konsole::Emulation::KeyboardCursorShape::BlockCursor);
     ui->cbCursorShape->setCurrentIndex((int)m_pPara->GetCursorShape());
-    
-    QTermWidget::addCustomColorSchemeDir(QApplication::applicationDirPath()
-                                         + QDir::separator() + "color-schemes");
-    QTermWidget::addCustomColorSchemeDir(QApplication::applicationDirPath()
-                                         + QDir::separator() + ".."
-                                         + QDir::separator() + "share"
-                                         + QDir::separator() + "qtermwidget6"
-                                         + QDir::separator() + "color-schemes");
+
     ui->cbColorScheme->addItems(QTermWidget::availableColorSchemes());
     if(!m_pPara->GetColorScheme().isEmpty())
         ui->cbColorScheme->setCurrentText(m_pPara->GetColorScheme());
@@ -121,7 +114,7 @@ int CParameterTerminalUI::SetParameter(CParameter *pParameter)
     ui->cbFlowControl->setChecked(m_pPara->GetFlowControl());
     ui->cbBiDirectional->setChecked(m_pPara->GetDirectional());
     ui->leImage->setText(m_pPara->GetBackgroupImage());
-    
+
     ui->cbKeyBinding->addItems(QTermWidget::availableKeyBindings());
     ui->cbKeyBinding->setCurrentText(m_pPara->GetKeyBindings());
 

snap/snapcraft.yaml

@@ -240,9 +240,10 @@ parts:
     # See 'snapcraft plugins'
     # see: https://snapcraft.io/docs/supported-plugins
     plugin: cmake # See: https://snapcraft.io/docs/cmake-plugin
-    source: https://github.com/lxqt/qtermwidget.git
+    source: https://github.com/KangLin/qtermwidget.git
     source-type: git
-    source-tag: 2.2.0
+    #source-tag: 2.2.0
+    source-branch: master
     source-depth: 1
     after:
       - lxqt-build-tools