xm/ShellCrash
1
0
Fork 0
mirror of https://github.com/juewuy/ShellCrash.git synced 2026-03-10 23:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1172 from sofia-riese/patch-1

Browse Source 
fix(tui_layout.sh): apply font color
This commit is contained in:
juewuy
2026-01-23 18:13:00 +08:00
committed by GitHub
parent 3fe8f93500 fed0bfeb90
commit 601c419154
1 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
scripts/menus/tui_layout.sh
View File

@@ -29,15 +29,14 @@ content_line() {
currentLine = "" currentLine = ""
wordBuffer = "" wordBuffer = ""
lastColor = "" lastColor = ""
savedColor = ""
ESC = sprintf("%c", 27) ESC = sprintf("%c", 27)
} }
{ {
n = split($0, chars, "") n = split($0, chars, "")
for (i = 1; i <= n; i++) { for (i = 1; i <= n; i++) {
r = chars[i] r = chars[i]
if (r == ESC && i+1 <= n && chars[i+1] == "[") { if (r == ESC && i+1 <= n && chars[i+1] == "[") {
ansiSeq = "" ansiSeq = ""
for (j = i; j <= n; j++) { for (j = i; j <= n; j++) {
@@ -53,10 +52,7 @@ content_line() {
} }
charWidth = 1 charWidth = 1
if (r <= "\177") { charWidth = 1 }
if (r <= "\177") {
charWidth = 1
}
else if (r >= "\340" && r <= "\357" && i+2 <= n) { else if (r >= "\340" && r <= "\357" && i+2 <= n) {
r = chars[i] chars[i+1] chars[i+2] r = chars[i] chars[i+1] chars[i+2]
i += 2 i += 2
@@ -67,56 +63,54 @@ content_line() {
i += 1 i += 1
charWidth = 1 charWidth = 1
} }
else {
charWidth = 1
}
if (r == " " || charWidth == 2) { if (r == " " || charWidth == 2) {
if (currentDisplayWidth + wordWidth + charWidth > textWidth) { if (currentDisplayWidth + wordWidth + charWidth > textWidth) {
printf " %s\033[0m\033[%dG||\n", currentLine, table_width printf " %s\033[0m\033[%dG||\n", currentLine, table_width
currentLine = lastColor wordBuffer currentLine = savedColor wordBuffer
currentDisplayWidth = wordWidth currentDisplayWidth = wordWidth
wordBuffer = r wordBuffer = r
wordWidth = charWidth wordWidth = charWidth
savedColor = lastColor
} else { } else {
currentLine = currentLine wordBuffer r currentLine = currentLine wordBuffer r
currentDisplayWidth += wordWidth + charWidth currentDisplayWidth += wordWidth + charWidth
wordBuffer = "" wordBuffer = ""
wordWidth = 0 wordWidth = 0
savedColor = lastColor
} }
} else { } else {
wordBuffer = wordBuffer r wordBuffer = wordBuffer r
wordWidth += charWidth wordWidth += charWidth
if (wordWidth > textWidth) { if (wordWidth > textWidth) {
printf " %s%s\033[0m\033[%dG||\n", currentLine, wordBuffer, table_width printf " %s%s\033[0m\033[%dG||\n", currentLine, wordBuffer, table_width
currentLine = lastColor currentLine = savedColor
currentDisplayWidth = 0 currentDisplayWidth = 0
wordBuffer = "" wordBuffer = ""
wordWidth = 0 wordWidth = 0
} savedColor = lastColor
} }
} }
} }
END {
if (wordWidth > 0) { if (wordWidth > 0) {
if (currentDisplayWidth + wordWidth > textWidth) { if (currentDisplayWidth + wordWidth > textWidth) {
printf " %s\033[0m\033[%dG||\n", currentLine, table_width printf " %s\033[0m\033[%dG||\n", currentLine, table_width
currentLine = lastColor wordBuffer currentLine = savedColor wordBuffer
} else { } else {
currentLine = currentLine wordBuffer currentLine = currentLine wordBuffer
} }
} }
cleanText = currentLine
gsub(/\033\[[0-9;]*m/, "", cleanText)
gsub(/^[ \t]+|[ \t]+$/, "", cleanText)
if (cleanText != "") {
printf " %s\033[0m\033[%dG||\n", currentLine, table_width printf " %s\033[0m\033[%dG||\n", currentLine, table_width
currentLine = lastColor
currentDisplayWidth = 0
wordBuffer = ""
wordWidth = 0
savedColor = lastColor
} }
} END {}
' '
} }