Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
168d91e6
Commit
168d91e6
authored
Feb 16, 2020
by
jiahua.liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Console Terminal Chinese Supported
parent
13460b93
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
58 additions
and
13 deletions
+58
-13
mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt
.../kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt
+58
-13
No files found.
mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt
View file @
168d91e6
...
@@ -15,7 +15,6 @@ import com.googlecode.lanterna.terminal.swing.SwingTerminalFrame
...
@@ -15,7 +15,6 @@ import com.googlecode.lanterna.terminal.swing.SwingTerminalFrame
import
kotlinx.coroutines.*
import
kotlinx.coroutines.*
import
kotlinx.coroutines.io.close
import
kotlinx.coroutines.io.close
import
kotlinx.io.core.IoBuffer
import
kotlinx.io.core.IoBuffer
import
kotlinx.io.core.use
import
net.mamoe.mirai.Bot
import
net.mamoe.mirai.Bot
import
net.mamoe.mirai.console.MiraiConsoleTerminalUI.LoggerDrawer.cleanPage
import
net.mamoe.mirai.console.MiraiConsoleTerminalUI.LoggerDrawer.cleanPage
import
net.mamoe.mirai.console.MiraiConsoleTerminalUI.LoggerDrawer.drawLog
import
net.mamoe.mirai.console.MiraiConsoleTerminalUI.LoggerDrawer.drawLog
...
@@ -44,6 +43,47 @@ import kotlin.system.exitProcess
...
@@ -44,6 +43,47 @@ import kotlin.system.exitProcess
*
*
*/
*/
fun
String
.
actualLength
():
Int
{
var
x
=
0
this
.
forEach
{
if
(
it
.
isChineseChar
())
{
x
+=
2
}
else
{
x
+=
1
}
}
return
x
}
fun
String
.
getSubStringIndexByActualLength
(
widthMax
:
Int
):
Int
{
var
index
=
0
var
currentLength
=
0
this
.
forEach
{
if
(
it
.
isChineseChar
())
{
currentLength
+=
2
}
else
{
currentLength
+=
1
}
if
(
currentLength
>
widthMax
)
{
return
@
forEach
}
++
index
}
if
(
index
<
2
)
{
index
=
2
}
return
index
}
fun
Char
.
isChineseChar
():
Boolean
{
return
this
.
toString
().
isChineseChar
()
}
fun
String
.
isChineseChar
():
Boolean
{
return
this
.
matches
(
Regex
(
"[\u4e00-\u9fa5]"
))
}
object
MiraiConsoleTerminalUI
:
MiraiConsoleUI
{
object
MiraiConsoleTerminalUI
:
MiraiConsoleUI
{
val
cacheLogSize
=
50
val
cacheLogSize
=
50
var
mainTitle
=
"Mirai Console v0.01 Core v0.15"
var
mainTitle
=
"Mirai Console v0.01 Core v0.15"
...
@@ -365,7 +405,7 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
...
@@ -365,7 +405,7 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
textGraphics
.
foregroundColor
=
TextColor
.
ANSI
.
WHITE
textGraphics
.
foregroundColor
=
TextColor
.
ANSI
.
WHITE
textGraphics
.
backgroundColor
=
TextColor
.
ANSI
.
GREEN
textGraphics
.
backgroundColor
=
TextColor
.
ANSI
.
GREEN
textGraphics
.
putString
((
width
-
mainTitle
.
length
)
/
2
,
1
,
mainTitle
,
SGR
.
BOLD
)
textGraphics
.
putString
((
width
-
mainTitle
.
actualLength
()
)
/
2
,
1
,
mainTitle
,
SGR
.
BOLD
)
textGraphics
.
foregroundColor
=
TextColor
.
ANSI
.
DEFAULT
textGraphics
.
foregroundColor
=
TextColor
.
ANSI
.
DEFAULT
textGraphics
.
backgroundColor
=
TextColor
.
ANSI
.
DEFAULT
textGraphics
.
backgroundColor
=
TextColor
.
ANSI
.
DEFAULT
textGraphics
.
putString
(
2
,
3
,
"-"
.
repeat
(
width
-
4
))
textGraphics
.
putString
(
2
,
3
,
"-"
.
repeat
(
width
-
4
))
...
@@ -380,15 +420,15 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
...
@@ -380,15 +420,15 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
val
leftName
=
val
leftName
=
getScreenName
(
getLeftScreenId
())
getScreenName
(
getLeftScreenId
())
// clearRows(2)
// clearRows(2)
textGraphics
.
putString
((
width
-
title
.
length
)
/
2
-
"$leftName << "
.
length
,
2
,
"$leftName << "
)
textGraphics
.
putString
((
width
-
title
.
actualLength
()
)
/
2
-
"$leftName << "
.
length
,
2
,
"$leftName << "
)
textGraphics
.
foregroundColor
=
TextColor
.
ANSI
.
WHITE
textGraphics
.
foregroundColor
=
TextColor
.
ANSI
.
WHITE
textGraphics
.
backgroundColor
=
TextColor
.
ANSI
.
YELLOW
textGraphics
.
backgroundColor
=
TextColor
.
ANSI
.
YELLOW
textGraphics
.
putString
((
width
-
title
.
length
)
/
2
,
2
,
title
,
SGR
.
BOLD
)
textGraphics
.
putString
((
width
-
title
.
actualLength
()
)
/
2
,
2
,
title
,
SGR
.
BOLD
)
textGraphics
.
foregroundColor
=
TextColor
.
ANSI
.
DEFAULT
textGraphics
.
foregroundColor
=
TextColor
.
ANSI
.
DEFAULT
textGraphics
.
backgroundColor
=
TextColor
.
ANSI
.
DEFAULT
textGraphics
.
backgroundColor
=
TextColor
.
ANSI
.
DEFAULT
val
rightName
=
val
rightName
=
getScreenName
(
getRightScreenId
())
getScreenName
(
getRightScreenId
())
textGraphics
.
putString
((
width
+
title
.
length
)
/
2
+
1
,
2
,
">> $rightName"
)
textGraphics
.
putString
((
width
+
title
.
actualLength
()
)
/
2
+
1
,
2
,
">> $rightName"
)
}
}
fun
drawMainFrame
(
fun
drawMainFrame
(
...
@@ -401,7 +441,7 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
...
@@ -401,7 +441,7 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
clearRows
(
4
)
clearRows
(
4
)
textGraphics
.
putString
(
2
,
4
,
"|Online Bots: $onlineBotCount"
)
textGraphics
.
putString
(
2
,
4
,
"|Online Bots: $onlineBotCount"
)
textGraphics
.
putString
(
textGraphics
.
putString
(
width
-
2
-
"Powered By Mamoe Technologies|"
.
length
,
width
-
2
-
"Powered By Mamoe Technologies|"
.
actualLength
()
,
4
,
4
,
"Powered By Mamoe Technologies|"
"Powered By Mamoe Technologies|"
)
)
...
@@ -417,7 +457,7 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
...
@@ -417,7 +457,7 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
textGraphics
.
backgroundColor
=
TextColor
.
ANSI
.
DEFAULT
textGraphics
.
backgroundColor
=
TextColor
.
ANSI
.
DEFAULT
clearRows
(
4
)
clearRows
(
4
)
textGraphics
.
putString
(
2
,
4
,
"|Admins: $adminCount"
)
textGraphics
.
putString
(
2
,
4
,
"|Admins: $adminCount"
)
textGraphics
.
putString
(
width
-
2
-
"Add admins via commands|"
.
length
,
4
,
"Add admins via commands|"
)
textGraphics
.
putString
(
width
-
2
-
"Add admins via commands|"
.
actualLength
()
,
4
,
"Add admins via commands|"
)
}
}
...
@@ -426,20 +466,25 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
...
@@ -426,20 +466,25 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
fun
drawLog
(
string
:
String
,
flush
:
Boolean
=
true
)
{
fun
drawLog
(
string
:
String
,
flush
:
Boolean
=
true
)
{
val
maxHeight
=
terminal
.
terminalSize
.
rows
-
4
val
maxHeight
=
terminal
.
terminalSize
.
rows
-
4
val
heightNeed
=
(
string
.
length
/
(
terminal
.
terminalSize
.
columns
-
6
))
+
1
val
heightNeed
=
(
string
.
actualLength
()
/
(
terminal
.
terminalSize
.
columns
-
6
))
+
1
if
(
heightNeed
-
1
>
maxHeight
)
{
if
(
heightNeed
-
1
>
maxHeight
)
{
return
//拒绝打印
return
//拒绝打印
}
}
if
(
currentHeight
+
heightNeed
>
maxHeight
)
{
if
(
currentHeight
+
heightNeed
>
maxHeight
)
{
cleanPage
()
cleanPage
()
}
}
val
width
=
terminal
.
terminalSize
.
columns
-
7
val
width
=
terminal
.
terminalSize
.
columns
-
6
var
x
=
string
var
x
=
string
while
(
true
)
{
while
(
true
)
{
if
(
x
==
""
)
break
if
(
x
==
""
)
break
val
toWrite
=
if
(
x
.
length
>
width
)
{
val
toWrite
=
if
(
x
.
actualLength
()
>
width
)
{
x
.
substring
(
0
,
width
).
also
{
val
index
=
x
.
getSubStringIndexByActualLength
(
width
)
x
=
x
.
substring
(
width
)
x
.
substring
(
0
,
index
).
also
{
x
=
if
(
index
<
x
.
length
)
{
x
.
substring
(
index
)
}
else
{
""
}
}
}
}
else
{
}
else
{
x
.
also
{
x
.
also
{
...
@@ -479,7 +524,7 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
...
@@ -479,7 +524,7 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
var
vara
=
0
var
vara
=
0
val
toPrint
=
mutableListOf
<
String
>()
val
toPrint
=
mutableListOf
<
String
>()
toDraw
.
forEach
{
toDraw
.
forEach
{
val
heightNeed
=
(
it
.
length
/
(
terminal
.
terminalSize
.
columns
-
6
))
+
1
val
heightNeed
=
(
it
.
actualLength
()
/
(
terminal
.
terminalSize
.
columns
-
6
))
+
1
vara
+=
heightNeed
vara
+=
heightNeed
if
(
currentHeight
+
vara
<
terminal
.
terminalSize
.
rows
-
4
)
{
if
(
currentHeight
+
vara
<
terminal
.
terminalSize
.
rows
-
4
)
{
logsToDraw
++
logsToDraw
++
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment