diff --git a/main.go b/main.go index 2120fb1..b77fca6 100644 --- a/main.go +++ b/main.go @@ -244,7 +244,7 @@ func main() { } url := fmt.Sprintf("%s://%s/#%s\n", scheme, domain, secret) readyMsg := "ready: " + url - qrCode, _ := GenerateQRCode(url, terminalSupportsColor(os.Stderr.Fd())) + qrCode, _ := GenerateQRCode(url, TerminalSupportsColor(os.Stderr.Fd())) readyMsg += qrCode if !tls { readyMsg += ("" + diff --git a/qr.go b/qr.go index 80f380c..b30eff4 100644 --- a/qr.go +++ b/qr.go @@ -33,7 +33,7 @@ func qrCodeToString(bits [][]bool, colorize bool) string { s := "" for y := -1; y < len(bits); y += 2 { if colorize { - s += terminalForegroundWhite + terminalBackgroundBlack + s += TerminalForegroundWhite + TerminalBackgroundBlack } for x := range bits[0] { upper := false @@ -55,7 +55,7 @@ func qrCodeToString(bits [][]bool, colorize bool) string { } } if colorize { - s += terminalForegroundReset + terminalBackgroundReset + s += TerminalForegroundReset + TerminalBackgroundReset } s += "\n" } diff --git a/terminal_color.go b/terminal_color.go index af92fbb..c7ffc61 100644 --- a/terminal_color.go +++ b/terminal_color.go @@ -20,8 +20,8 @@ package main const ( - terminalForegroundWhite string = "\033[37m" - terminalForegroundReset string = "\033[39m" - terminalBackgroundBlack string = "\033[40m" - terminalBackgroundReset string = "\033[49m" + TerminalForegroundWhite string = "\033[37m" + TerminalForegroundReset string = "\033[39m" + TerminalBackgroundBlack string = "\033[40m" + TerminalBackgroundReset string = "\033[49m" ) diff --git a/terminal_color_posix.go b/terminal_color_posix.go index ea0e5d4..0d2f1bf 100644 --- a/terminal_color_posix.go +++ b/terminal_color_posix.go @@ -24,6 +24,6 @@ package main // #include import "C" -func terminalSupportsColor(fd uintptr) bool { +func TerminalSupportsColor(fd uintptr) bool { return C.isatty(C.int(fd)) != 0 } diff --git a/terminal_color_windows.go b/terminal_color_windows.go index 4fdf76a..381e2d2 100644 --- a/terminal_color_windows.go +++ b/terminal_color_windows.go @@ -32,7 +32,7 @@ var ( setConsoleModeProc = kernel32DLL.NewProc("SetConsoleMode") ) -func terminalSupportsColor(fd uintptr) bool { +func TerminalSupportsColor(fd uintptr) bool { r, _, _ := setConsoleModeProc.Call(fd, uintptr(enableProcessedOuput| enableWrapAtEolOutput|enableVirtualTerminalProcessing)) return r != 0