From c06fc69752f9d4d67dc641461c3121cab8c16ac3 Mon Sep 17 00:00:00 2001
From: "jiahua.liu" <n@mamoe.net>
Date: Sun, 16 Feb 2020 00:38:27 +0800
Subject: [PATCH 1/3] bigger swing frame
---
.../kotlin/net/mamoe/mirai/MiraiConsoleUI.kt | 25 +++++++++++++------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt b/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt
index fee1660d7..c8f61b743 100644
--- a/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt
+++ b/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt
@@ -10,18 +10,21 @@ import com.googlecode.lanterna.terminal.DefaultTerminalFactory
import com.googlecode.lanterna.terminal.Terminal
import com.googlecode.lanterna.terminal.TerminalResizeListener
import com.googlecode.lanterna.terminal.swing.SwingTerminal
+import com.googlecode.lanterna.terminal.swing.SwingTerminalFontConfiguration
import com.googlecode.lanterna.terminal.swing.SwingTerminalFrame
-import kotlinx.coroutines.*
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
import net.mamoe.mirai.MiraiConsoleUI.LoggerDrawer.cleanPage
import net.mamoe.mirai.MiraiConsoleUI.LoggerDrawer.drawLog
import net.mamoe.mirai.MiraiConsoleUI.LoggerDrawer.redrawLogs
-import net.mamoe.mirai.utils.currentTimeSeconds
+import java.awt.Font
import java.io.OutputStream
import java.io.PrintStream
import java.nio.charset.Charset
import java.util.*
import kotlin.concurrent.thread
-import kotlin.math.ceil
/**
* 此文件不推荐任何人看
@@ -70,11 +73,19 @@ object MiraiConsoleUI {
hasStart = true
val defaultTerminalFactory = DefaultTerminalFactory(internalPrinter, System.`in`, Charset.defaultCharset())
- defaultTerminalFactory.setInitialTerminalSize(
- TerminalSize(
- 90, 120
+
+ val fontSize = 12
+ defaultTerminalFactory
+ .setInitialTerminalSize(
+ TerminalSize(
+ 101, 60
+ )
+ )
+ .setTerminalEmulatorFontConfiguration(
+ SwingTerminalFontConfiguration.newInstance(
+ Font("Monospaced", Font.PLAIN, fontSize)
+ )
)
- )
try {
terminal = defaultTerminalFactory.createTerminal()
terminal.enterPrivateMode()
From 32a14e4e28c53f0f21455113c6bbfbbf48ea318b Mon Sep 17 00:00:00 2001
From: "jiahua.liu" <n@mamoe.net>
Date: Sun, 16 Feb 2020 00:40:10 +0800
Subject: [PATCH 2/3] bigger swing frame
---
.../src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt b/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt
index c8f61b743..cceb89c87 100644
--- a/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt
+++ b/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt
@@ -382,11 +382,13 @@ object MiraiConsoleUI {
textGraphics.foregroundColor = TextColor.ANSI.DEFAULT
textGraphics.putString(2, height - 3, "|>>>")
textGraphics.putString(width - 3, height - 3, "|")
- textGraphics.foregroundColor = TextColor.ANSI.BLUE
+ textGraphics.foregroundColor = TextColor.ANSI.WHITE
+ textGraphics.backgroundColor = TextColor.ANSI.BLACK
textGraphics.putString(7, height - 3, commandBuilder.toString())
if (terminal is SwingTerminalFrame) {
terminal.flush()
}
+ textGraphics.backgroundColor = TextColor.ANSI.DEFAULT
}
private fun addCommandChar(
From 9c74e27d43495261e9a056976d27ba98b3e7df74 Mon Sep 17 00:00:00 2001
From: "jiahua.liu" <n@mamoe.net>
Date: Sun, 16 Feb 2020 00:50:46 +0800
Subject: [PATCH 3/3] bigger swing frame
---
mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsole.kt | 1 +
mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt | 1 +
2 files changed, 2 insertions(+)
diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsole.kt b/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsole.kt
index a708e464a..ed9ceb855 100644
--- a/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsole.kt
+++ b/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsole.kt
@@ -288,6 +288,7 @@ class MiraiConsoleLoader {
fun main(args: Array<String>) {
Security.removeProvider("BC")
Security.addProvider(BouncyCastleProvider())
+ Security.addProvider(org.bouncycastle.jce.provider.BouncyCastleProvider())
//Security.addProvider(BouncyCastle)
MiraiConsoleUI.start()
MiraiConsole.start()
diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt b/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt
index cceb89c87..ab398e73a 100644
--- a/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt
+++ b/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt
@@ -43,6 +43,7 @@ object MiraiConsoleUI {
val log = mutableMapOf<Long, LimitLinkedQueue<String>>().also {
it[0L] = LimitLinkedQueue(cacheLogSize)
+ it[2821869985L] = LimitLinkedQueue(cacheLogSize)
}
val botAdminCount = mutableMapOf<Long, Long>()