chore(deps): bump com.qcloud:cos_api from 5.6.259 to 5.6.260.1

Bumps [com.qcloud:cos_api](https://github.com/tencentyun/cos-java-sdk-v5) from 5.6.259 to 5.6.260.1.
- [Release notes](https://github.com/tencentyun/cos-java-sdk-v5/releases)
- [Changelog](https://github.com/tencentyun/cos-java-sdk-v5/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tencentyun/cos-java-sdk-v5/commits)

---
updated-dependencies:
- dependency-name: com.qcloud:cos_api
  dependency-version: 5.6.260.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.2.21"
+kotlin = "2.3.0"
 slf4j = "2.0.17"
 pty4j = "0.13.10"
 tinylog = "2.7.0"
@@ -33,17 +33,17 @@ jnafilechooser = "1.1.2"
 xodus = "2.0.1"
 bip39 = "1.0.9"
 colorpicker = "2.0.1"
-rhino = "1.8.0"
+rhino = "1.9.0"
 delight-rhino-sandbox = "0.2.1"
-testcontainers = "2.0.1"
-mixpanel = "1.5.4"
+testcontainers = "2.0.3"
+mixpanel = "1.7.0"
 jSerialComm = "2.11.4"
 ini4j = "0.5.5-2"
 restart4j = "0.0.1"
 eddsa = "0.3.0"
 exposed = "1.0.0-rc-4"
 h2 = "2.3.232"
-sqlite = "3.51.1.0"
+sqlite = "3.50.3.0"
 jug = "5.2.0"
 semver4j = "6.0.0"
 jsvg = "2.0.0"

plugins/cos/build.gradle.kts

@@ -8,7 +8,7 @@ project.version = "0.0.4"
 
 dependencies {
     testImplementation(kotlin("test"))
-    implementation("com.qcloud:cos_api:5.6.259")
+    implementation("com.qcloud:cos_api:5.6.260.1")
     compileOnly(project(":"))
 }
 

plugins/editor/build.gradle.kts

@@ -10,7 +10,7 @@ project.version = "0.0.8"
 dependencies {
     testImplementation(kotlin("test"))
     compileOnly(project(":"))
-    implementation("com.fifesoft:rsyntaxtextarea:3.6.0")
+    implementation("com.fifesoft:rsyntaxtextarea:3.6.1")
     implementation("com.fifesoft:languagesupport:3.4.0")
     implementation("com.fifesoft:autocomplete:3.3.2")
 }

plugins/ftp/build.gradle.kts

@@ -7,7 +7,7 @@ project.version = "0.0.2"
 dependencies {
     testImplementation(kotlin("test"))
     compileOnly(project(":"))
-    implementation("org.apache.commons:commons-pool2:2.12.1")
+    implementation("org.apache.commons:commons-pool2:2.13.0")
     testImplementation(project(":"))
 }
 

src/main/kotlin/app/termora/SettingsOptionsPane.kt

@@ -547,6 +547,7 @@ class SettingsOptionsPane : OptionsPane() {
 
             rightClickComboBox.addItem("Copy")
             rightClickComboBox.addItem("CopyAndPaste")
+            rightClickComboBox.addItem("Nothing")
 
             rightClickComboBox.selectedItem = terminalSetting.rightClick
 
@@ -576,6 +577,8 @@ class SettingsOptionsPane : OptionsPane() {
                         text = I18n.getString("termora.settings.terminal.right-click.copy")
                     } else if (value == "CopyAndPaste") {
                         text = I18n.getString("termora.settings.terminal.right-click.copy-and-paste")
+                    }else if (value == "Nothing") {
+                        text = I18n.getString("termora.settings.terminal.right-click.nothing")
                     }
                     return super.getListCellRendererComponent(list, text, index, isSelected, cellHasFocus)
                 }

src/main/kotlin/app/termora/actions/TerminalCopyAction.kt

@@ -20,6 +20,10 @@ class TerminalCopyAction : AnAction() {
 
     override fun actionPerformed(evt: AnActionEvent) {
         val terminalPanel = evt.getData(DataProviders.TerminalPanel) ?: return
+        val selectionModel = terminalPanel.terminal.getSelectionModel()
+        if (!selectionModel.hasSelection()) {
+            return
+        }
         val text = terminalPanel.copy()
         val systemClipboard = terminalPanel.toolkit.systemClipboard
 
@@ -53,4 +57,4 @@ class TerminalCopyAction : AnAction() {
 
     }
 
-}
+}

src/main/kotlin/app/termora/plugin/internal/rdp/RDPProtocolProvider.kt

@@ -10,6 +10,8 @@ import kotlinx.coroutines.launch
 import org.apache.commons.io.FileUtils
 import org.apache.commons.io.IOUtils
 import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.Strings
+import org.apache.commons.lang3.SystemUtils
 import java.awt.datatransfer.DataFlavor
 import java.awt.datatransfer.StringSelection
 import java.net.URI
@@ -64,7 +66,15 @@ internal class RDPProtocolProvider private constructor() : GenericProtocolProvid
         }
 
         val sb = StringBuilder()
-        sb.append("full address:s:").append(host.host).append(':').append(host.port).appendLine()
+        sb.append("full address:s:")
+        if (SystemUtils.IS_OS_WINDOWS && Strings.CI.contains(host.host, ":")) {
+            var newHost = Strings.CI.removeStart(host.host, "[")
+            newHost = Strings.CI.removeEnd(newHost, "]")
+            sb.append('[').append(newHost).append(']')
+        } else {
+            sb.append(host.host)
+        }
+        sb.append(':').append(host.port).appendLine()
         sb.append("username:s:").append(host.username).appendLine()
         val desktop = host.options.extras["desktop"]
         if (desktop.isNullOrBlank().not()) {

src/main/kotlin/app/termora/terminal/panel/TerminalPanelKeyAdapter.kt

@@ -1,5 +1,6 @@
 package app.termora.terminal.panel
 
+import app.termora.actions.TerminalCopyAction
 import app.termora.keymap.KeyShortcut
 import app.termora.keymap.KeymapManager
 import app.termora.plugin.internal.AltKeyModifier
@@ -71,6 +72,7 @@ class TerminalPanelKeyAdapter(
         }
 
         val keyStroke = KeyStroke.getKeyStrokeForEvent(e)
+        val keymapActions = activeKeymap.getActionIds(KeyShortcut(keyStroke))
         for (action in terminalPanel.getTerminalActions()) {
             if (action.test(keyStroke, e)) {
                 action.actionPerformed(e)
@@ -104,7 +106,9 @@ class TerminalPanelKeyAdapter(
         }
 
         // 如果命中了全局快捷键，那么不处理
-        if (keyStroke.modifiers != 0 && activeKeymap.getActionIds(KeyShortcut(keyStroke)).isNotEmpty()) {
+        val copyShortcutWithoutSelection =
+            keymapActions.contains(TerminalCopyAction.COPY) && terminal.getSelectionModel().hasSelection().not()
+        if (keyStroke.modifiers != 0 && keymapActions.isNotEmpty() && !copyShortcutWithoutSelection) {
             return
         }
 
@@ -159,4 +163,4 @@ class TerminalPanelKeyAdapter(
         return Character.toLowerCase(e.keyCode.toChar())
     }
 
-}
+}

src/main/kotlin/app/termora/terminal/panel/TerminalPanelMouseSelectionAdapter.kt

@@ -53,30 +53,31 @@ class TerminalPanelMouseSelectionAdapter(private val terminalPanel: TerminalPane
         if (SwingUtilities.isRightMouseButton(e)) {
             // 如果有选中并且开启了选中复制，那么右键直接是粘贴
             if (selectionModel.hasSelection() && isSelectCopy.not()) {
-                triggerCopyAction(
-                    KeyEvent(
-                        e.component,
-                        KeyEvent.KEY_PRESSED,
-                        e.`when`,
-                        e.modifiersEx,
-                        KeyEvent.VK_C,
-                        'C'
-                    )
-                )
-
-                if (rightClickMode == "CopyAndPaste") {
-                    triggerPasteAction(
+                if (rightClickMode != "Nothing") {
+                    triggerCopyAction(
                         KeyEvent(
                             e.component,
                             KeyEvent.KEY_PRESSED,
                             e.`when`,
                             e.modifiersEx,
-                            KeyEvent.VK_V,
-                            'V'
+                            KeyEvent.VK_C,
+                            'C'
                         )
                     )
-                }
 
+                    if (rightClickMode == "CopyAndPaste") {
+                        triggerPasteAction(
+                            KeyEvent(
+                                e.component,
+                                KeyEvent.KEY_PRESSED,
+                                e.`when`,
+                                e.modifiersEx,
+                                KeyEvent.VK_V,
+                                'V'
+                            )
+                        )
+                    }
+                }
             } else {
                 // paste
                 triggerPasteAction(

src/main/resources/i18n/messages.properties

@@ -59,6 +59,7 @@ termora.settings.terminal.hyperlink=Hyperlink
 termora.settings.terminal.select-copy=Select copy
 termora.settings.terminal.right-click=Right click
 termora.settings.terminal.right-click.copy-and-paste=Copy and Paste
+termora.settings.terminal.right-click.nothing=Nothing
 termora.settings.terminal.right-click.copy=${termora.copy}
 termora.settings.terminal.cursor-style=Cursor type
 termora.settings.terminal.cursor-blink=Cursor blink

src/main/resources/i18n/messages_ru_RU.properties

@@ -81,6 +81,7 @@ termora.settings.terminal.hyperlink=Ссылки
 termora.settings.terminal.select-copy=Копировать выделенное
 termora.settings.terminal.right-click=правой кнопкой мыши
 termora.settings.terminal.right-click.copy-and-paste=Копировать и вставить
+termora.settings.terminal.right-click.nothing=никто
 termora.settings.terminal.cursor-style=Вид курсора
 termora.settings.terminal.cursor-blink=Мигать курсором
 termora.settings.terminal.local-shell=Локальный терминал

src/main/resources/i18n/messages_zh_CN.properties

@@ -73,6 +73,7 @@ termora.settings.terminal.hyperlink=超链接
 termora.settings.terminal.select-copy=选中复制
 termora.settings.terminal.right-click=右键点击
 termora.settings.terminal.right-click.copy-and-paste=复制 & 粘贴
+termora.settings.terminal.right-click.nothing=无操作
 termora.settings.terminal.cursor-style=光标样式
 termora.settings.terminal.cursor-blink=光标闪烁
 termora.settings.terminal.local-shell=本地终端

src/main/resources/i18n/messages_zh_TW.properties

@@ -85,6 +85,7 @@ termora.settings.terminal.hyperlink=超連結
 termora.settings.terminal.select-copy=選取複製
 termora.settings.terminal.right-click=右鍵點擊
 termora.settings.terminal.right-click.copy-and-paste=複製 & 貼上
+termora.settings.terminal.right-click.nothing=無操作
 termora.settings.terminal.cursor-style=遊標風格
 termora.settings.terminal.cursor-blink=遊標閃爍
 termora.settings.terminal.local-shell=本地端