Skip to content

Fix cmd background on Windows #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benpye wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix cmd background on Windows #161

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 25 additions & 10 deletions ansi_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,28 @@ func (a *ANSIWriter) Close() error {
}

type ANSIWriterCtx struct {
isEsc bool
isEscSeq bool
arg []string
target *bufio.Writer
wantFlush bool
isEsc bool
isEscSeq bool
arg []string
target *bufio.Writer
wantFlush bool
defaultAttributes word
}

func getTextAttributes() word {
sbi, err := GetConsoleScreenBufferInfo()
if err != nil {
// Hopefully sane default
return ColorTableFg[7] | ColorTableBg[0]
}

return sbi.wAttributes
}

func NewANSIWriterCtx(target io.Writer) *ANSIWriterCtx {
return &ANSIWriterCtx{
target: bufio.NewWriter(target),
target: bufio.NewWriter(target),
defaultAttributes: getTextAttributes(),
}
}

Expand Down Expand Up @@ -148,21 +160,24 @@ func (a *ANSIWriterCtx) ioloopEscSeq(w *bufio.Writer, r rune, argptr *[]string)
case 'K':
eraseLine()
case 'm':
color := word(0)
color := getTextAttributes()
for _, item := range arg {
var c int
c, err = strconv.Atoi(item)
if err != nil {
w.WriteString("[" + strings.Join(arg, ";") + "m")
break
}
if c >= 30 && c < 40 {
if c >= 30 && c < 38 {
color &= ^word(COLOR_FRED | COLOR_FGREEN | COLOR_FBLUE | COLOR_FINTENSITY)
color ^= COLOR_FINTENSITY
color |= ColorTableFg[c-30]
} else if c >= 40 && c < 50 {
} else if c >= 40 && c < 48 {
color &= ^word(COLOR_BRED | COLOR_BGREEN | COLOR_BBLUE | COLOR_BINTENSITY)
color ^= COLOR_BINTENSITY
color |= ColorTableBg[c-40]
} else if c == 4 {
color &= ^word(COLOR_FRED | COLOR_FGREEN | COLOR_FBLUE | COLOR_FINTENSITY)
color |= COMMON_LVB_UNDERSCORE | ColorTableFg[7]
} else if c == 1 {
color |= COMMON_LVB_BOLD | COLOR_FINTENSITY
Expand Down Expand Up @@ -220,7 +235,7 @@ func killLines() error {
size += sbi.dwCursorPosition.x

var written int
kernel.FillConsoleOutputAttribute(stdout, uintptr(ColorTableFg[7]),
kernel.FillConsoleOutputAttribute(stdout, uintptr(sbi.wAttributes),
uintptr(size),
sbi.dwCursorPosition.ptr(),
uintptr(unsafe.Pointer(&written)),
Expand Down