mirror of
https://github.com/TermoraDev/termora.git
synced 2026-01-16 02:12:58 +08:00
Compare commits
13 Commits
dependabot
...
dependabot
| Author | SHA1 | Date | |
|---|---|---|---|
|
496a3750a8 | ||
|
|
2327c5fd48 | ||
|
|
bfc63a3983 | ||
|
|
c727925791 | ||
|
|
cae1173180 | ||
|
|
10d2736232 | ||
|
|
97f01b7e3f | ||
|
|
21c7dd7a42 | ||
|
|
bbc64043ed | ||
|
|
79842f4625 | ||
|
|
626b344088 | ||
|
|
5b165ed587 | ||
|
|
d73b3b706e |
@@ -4,13 +4,13 @@ slf4j = "2.0.17"
|
||||
pty4j = "0.13.10"
|
||||
tinylog = "2.7.0"
|
||||
kotlinx-coroutines = "1.10.2"
|
||||
flatlaf = "3.6.2"
|
||||
flatlaf = "3.7"
|
||||
kotlinx-serialization-json = "1.9.0"
|
||||
commons-codec = "1.20.0"
|
||||
commons-lang3 = "3.20.0"
|
||||
commons-csv = "1.14.1"
|
||||
commons-net = "3.12.0"
|
||||
commons-text = "1.14.0"
|
||||
commons-text = "1.15.0"
|
||||
commons-compress = "1.28.0"
|
||||
commons-vfs2 = "2.10.0"
|
||||
swingx = "1.6.5-1"
|
||||
@@ -20,14 +20,14 @@ oshi = "6.9.1"
|
||||
versioncompare = "1.4.1"
|
||||
jna = "5.18.1"
|
||||
jSystemThemeDetector = "3.9.1"
|
||||
commons-io = "2.20.0"
|
||||
commons-io = "2.21.0"
|
||||
jbr-api = "17.1.10.1"
|
||||
hutool = "5.8.40"
|
||||
jsch = "2.27.3"
|
||||
okhttp = "5.3.2"
|
||||
okhttp = "5.3.0"
|
||||
sshj = "0.39.0"
|
||||
sshd-core = "2.15.0"
|
||||
jgit = "7.4.0.202509020913-r"
|
||||
jgit = "7.5.0.202512021534-r"
|
||||
commonmark = "0.27.0"
|
||||
jnafilechooser = "1.1.2"
|
||||
xodus = "2.0.1"
|
||||
@@ -41,10 +41,10 @@ jSerialComm = "2.11.4"
|
||||
ini4j = "0.5.5-2"
|
||||
restart4j = "0.0.1"
|
||||
eddsa = "0.3.0"
|
||||
exposed = "1.0.0-rc-2"
|
||||
exposed = "1.0.0-rc-4"
|
||||
h2 = "2.3.232"
|
||||
sqlite = "3.50.3.0"
|
||||
jug = "5.1.1"
|
||||
jug = "5.2.0"
|
||||
semver4j = "6.0.0"
|
||||
jsvg = "2.0.0"
|
||||
dom4j = "2.2.0"
|
||||
|
||||
@@ -8,7 +8,7 @@ project.version = "0.0.4"
|
||||
|
||||
dependencies {
|
||||
testImplementation(kotlin("test"))
|
||||
implementation("com.qcloud:cos_api:5.6.257")
|
||||
implementation("com.qcloud:cos_api:5.6.259")
|
||||
compileOnly(project(":"))
|
||||
}
|
||||
|
||||
|
||||
@@ -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(":"))
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ project.version = "0.0.8"
|
||||
dependencies {
|
||||
testImplementation(kotlin("test"))
|
||||
compileOnly(project(":"))
|
||||
implementation("com.maxmind.geoip2:geoip2:4.4.0")
|
||||
implementation("com.maxmind.geoip2:geoip2:5.0.0")
|
||||
// https://github.com/hstyi/geolite2
|
||||
implementation("com.github.hstyi:geolite2:v1.0-202510270056")
|
||||
}
|
||||
|
||||
@@ -67,6 +67,11 @@ class PullService private constructor() : SyncService(), Disposable, Application
|
||||
private var lastChangeHash = StringUtils.EMPTY
|
||||
|
||||
private fun pullChanges() {
|
||||
|
||||
if (accountManager.isLocally()) {
|
||||
return
|
||||
}
|
||||
|
||||
val hash: String
|
||||
|
||||
try {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,12 +27,14 @@ class KeyboardInteractiveDialog(
|
||||
isModal = true
|
||||
isResizable = true
|
||||
controlsVisible = false
|
||||
title = I18n.getString("termora.new-host.title")
|
||||
|
||||
init()
|
||||
pack()
|
||||
size = Dimension(max(300, size.width), size.height)
|
||||
|
||||
// fix https://github.com/TermoraDev/termora/issues/1311
|
||||
pack()
|
||||
|
||||
setLocationRelativeTo(null)
|
||||
|
||||
}
|
||||
|
||||
@@ -30,6 +30,7 @@ class TerminalUserInteraction(
|
||||
)
|
||||
dialog.setLocationRelativeTo(owner)
|
||||
dialog.title = instruction ?: name ?: "OTP"
|
||||
dialog.title = StringUtils.defaultIfBlank(dialog.title, "OTP")
|
||||
passwords[i] = dialog.getText()
|
||||
if (passwords[i].isBlank()) {
|
||||
break
|
||||
|
||||
@@ -332,6 +332,12 @@ class ControlSequenceIntroducerProcessor(terminal: Terminal, reader: TerminalRea
|
||||
var top = sr.getOrElse(0) { 1 }
|
||||
var bottom = sr.getOrElse(1) { terminalModel.getRows() }
|
||||
|
||||
// ";r" https://vt100.net/docs/vt510-rm/DECSTBM.html
|
||||
if (sr.size == 1 && args.startsWith(';')) {
|
||||
bottom = top
|
||||
top = 1
|
||||
}
|
||||
|
||||
if (bottom <= top) {
|
||||
if (log.isWarnEnabled) {
|
||||
log.warn("Set Scrolling Region Error. top: $top , bottom: $bottom")
|
||||
|
||||
@@ -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())
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user