github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-28 00:20:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

terminal update

Browse Source
This commit is contained in:
jiahua.liu 2020-02-15 12:15:26 +08:00
parent 3eab26a509
commit 91e9a5b081
2 changed files with 253 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsole.kt
View File

@ -37,8 +37,7 @@ object MiraiConsole {
val pluginManager: PluginManager val pluginManager: PluginManager
get() = PluginManager get() = PluginManager
var logger: MiraiConsoleLogger = var logger = UIPushLogger(0)
UIPushLogger()
var path: String = System.getProperty("user.dir") var path: String = System.getProperty("user.dir")
@ -255,11 +254,11 @@ object MiraiConsole {
} }
} }
class UIPushLogger(override val identity: String?, override var follower: MiraiLogger?) : MiraiLogger { class UIPushLogger(val identity: Long) {
override fun invoke(any: Any?) { operator fun invoke(any: Any? = null) {
MiraiConsoleUI.start() MiraiConsoleUI.start()
if (any != null) { if (any != null) {
MiraiConsoleUI.pushLog(0, "[Mirai$version $build]: $any") MiraiConsoleUI.pushLog(identity, "[Mirai$version $build]: $any")
} }
} }
} }

111
mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt
View File

@ -29,9 +29,9 @@ object MiraiConsoleUI {
log[uin] = LimitLinkedQueue() log[uin] = LimitLinkedQueue()
} }
fun pushLog(uin: Long, str: String) {
log[uin]!!.push(str) lateinit var terminal: Terminal
} lateinit var textGraphics: TextGraphics
var hasStart = false var hasStart = false
fun start() { fun start() {
@ -40,25 +40,64 @@ object MiraiConsoleUI {
} }
hasStart = true hasStart = true
val defaultTerminalFactory = DefaultTerminalFactory() val defaultTerminalFactory = DefaultTerminalFactory()
var terminal: Terminal? = null
try { try {
terminal = defaultTerminalFactory.createTerminal() terminal = defaultTerminalFactory.createTerminal()
terminal.enterPrivateMode() terminal.enterPrivateMode()
terminal.clearScreen() terminal.clearScreen()
terminal.setCursorVisible(false) terminal.setCursorVisible(false)
} catch (e: Exception) { } catch (e: Exception) {
try {
terminal = SwingTerminalFrame("Mirai Console") terminal = SwingTerminalFrame("Mirai Console")
terminal.enterPrivateMode() terminal.enterPrivateMode()
terminal.clearScreen() terminal.clearScreen()
terminal.setCursorVisible(false) terminal.setCursorVisible(false)
} } catch (e: Exception) {
if (terminal == null) {
error("can not create terminal") error("can not create terminal")
} }
}
textGraphics = terminal.newTextGraphics()
val textGraphics: TextGraphics = terminal.newTextGraphics() terminal.addResizeListener(TerminalResizeListener { terminal1: Terminal, newSize: TerminalSize ->
terminal.clearScreen()
inited = false
update()
redrawCommand()
})
update()
val charList = listOf(',', '.', '/', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '=', '+', '!', ' ')
thread {
while (true) {
var keyStroke: KeyStroke = terminal.readInput()
when (keyStroke.keyType) {
KeyType.ArrowLeft -> {
currentScreenId = getLeftScreenId()
update()
}
KeyType.ArrowRight -> {
currentScreenId = getRightScreenId()
update()
}
KeyType.Enter -> {
emptyCommand()
}
else -> {
if (keyStroke.character != null) {
if (keyStroke.character.toInt() == 8) {
deleteCommandChar()
}
if (keyStroke.character.isLetterOrDigit() || charList.contains(keyStroke.character)) {
addCommandChar(keyStroke.character)
}
}
}
}
}
}
}
try {
fun getLeftScreenId(): Int { fun getLeftScreenId(): Int {
var newId = currentScreenId - 1 var newId = currentScreenId - 1
if (newId < 0) { if (newId < 0) {
@ -188,9 +227,15 @@ object MiraiConsoleUI {
} }
} }
if (terminal is SwingTerminalFrame) { textGraphics.putString(3, 9, "AAAAAAAAAAAAAAAAAAAAAAa", SGR.ITALIC)
terminal.flush() terminal.flush()
} }
fun pushLog(uin: Long, str: String) {
log[uin]!!.push(str)
if (uin == screens[currentScreenId]) {
drawLogs(log[screens[currentScreenId]]!!)
}
} }
@ -257,58 +302,12 @@ object MiraiConsoleUI {
} }
} }
terminal.flush() terminal.flush()
}
terminal.addResizeListener(TerminalResizeListener { terminal1: Terminal, newSize: TerminalSize ->
terminal.clearScreen()
inited = false
update()
redrawCommand()
})
update()
val charList = listOf(',', '.', '/', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '=', '+', '!', ' ')
thread {
while (true) {
var keyStroke: KeyStroke = terminal.readInput()
when (keyStroke.keyType) {
KeyType.ArrowLeft -> {
currentScreenId = getLeftScreenId()
update()
}
KeyType.ArrowRight -> {
currentScreenId = getRightScreenId()
update()
}
KeyType.Enter -> {
emptyCommand()
}
else -> {
if (keyStroke.character != null) {
if (keyStroke.character.toInt() == 8) {
deleteCommandChar()
}
if (keyStroke.character.isLetterOrDigit() || charList.contains(keyStroke.character)) {
addCommandChar(keyStroke.character)
}
}
}
}
}
}
} catch (e: Exception) {
e.printStackTrace()
}
} }
} }
class LimitLinkedQueue<T>( class LimitLinkedQueue<T>(
val limit: Int = 50 val limit: Int = 50
) : LinkedList<T>() { ) : LinkedList<T>(), List<T> {
override fun push(e: T) { override fun push(e: T) {
if (size >= limit) { if (size >= limit) {
pollLast() pollLast()