mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

os: add term colors for Windows +minor fixes

Browse Source
This commit is contained in:
joe-conigliaro 2019-07-05 01:39:35 +10:00 committed by Alexander Medvednikov
parent b745234a52
commit 4e1afc148a
3 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
vlib/os/const.v
View File

@ -73,3 +73,35 @@ const (
O_SYNC = 64 // open for synchronous I/O. O_SYNC = 64 // open for synchronous I/O.
O_TRUNC = 128 // truncate regular writable file when opened. O_TRUNC = 128 // truncate regular writable file when opened.
) )
// Windows
const(
INVALID_HANDLE_VALUE = -1
)
const(
STD_INPUT_HANDLE = -10
STD_OUTPUT_HANDLE = -11
STD_ERROR_HANDLE = -12
)
// https://docs.microsoft.com/en-us/windows/console/setconsolemode
const (
// Input Buffer
ENABLE_ECHO_INPUT = 0x0004
ENABLE_EXTENDED_FLAGS = 0x0080
ENABLE_INSERT_MODE = 0x0020
ENABLE_LINE_INPUT = 0x0002
ENABLE_MOUSE_INPUT = 0x0010
ENABLE_PROCESSED_INPUT = 0x0001
ENABLE_QUICK_EDIT_MODE = 0x0040
ENABLE_WINDOW_INPUT = 0x0008
ENABLE_VIRTUAL_TERMINAL_INPUT = 0x0200
// Output Screen Buffer
ENABLE_PROCESSED_OUTPUT = 0x0001
ENABLE_WRAP_AT_EOL_OUTPUT = 0x0002
ENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x0004
DISABLE_NEWLINE_AUTO_RETURN = 0x0008
ENABLE_LVB_GRID_WORLDWIDE = 0x0010
)
// End Windows

16
vlib/os/os.v
View File

@ -408,17 +408,15 @@ pub fn get_line() string {
return str return str
} }
const(
STD_INPUT_HANDLE = -10
)
// get_raw_line returns a one-line string from stdin along with '\n' if there is any // get_raw_line returns a one-line string from stdin along with '\n' if there is any
pub fn get_raw_line() string { pub fn get_raw_line() string {
$if windows { $if windows {
max := 256 max := 256
buf := malloc(max) buf := malloc(max)
// TODO: Use HANDLE instead of voidptr h_input := C.GetStdHandle(STD_INPUT_HANDLE)
h_input := voidptr(C.GetStdHandle(STD_INPUT_HANDLE)) if h_input == INVALID_HANDLE_VALUE {
panic('get_raw_line() error getting input handle.')
}
nr_chars := 0 nr_chars := 0
// NOTE: Once we have UTF8 encode function to // NOTE: Once we have UTF8 encode function to
// convert utf16 to utf8, change to ReadConsoleW // convert utf16 to utf8, change to ReadConsoleW
@ -555,12 +553,6 @@ pub fn getwd() string {
return string(buf) return string(buf)
} }
// windows
const(
INVALID_HANDLE_VALUE = -1
)
// win: FILETIME // win: FILETIME
// https://docs.microsoft.com/en-us/windows/win32/api/minwinbase/ns-minwinbase-filetime // https://docs.microsoft.com/en-us/windows/win32/api/minwinbase/ns-minwinbase-filetime
struct filetime { struct filetime {

18
vlib/term/colors.v
View File

@ -4,6 +4,24 @@
module term module term
import os
// Calling this functions enables color terminal output on windows
// Maybe implement a way to auto run an init function when a module
// is imported on a certain os. for example to run this?
pub fn enable_term_color_win() {
$if windows {
h_output := C.GetStdHandle(os.STD_OUTPUT_HANDLE)
if h_output == os.INVALID_HANDLE_VALUE
|| !C.SetConsoleMode(h_output, os.ENABLE_PROCESSED_OUTPUT|os.ENABLE_VIRTUAL_TERMINAL_PROCESSING) {
println('enable_term_color_win() Sorry, there was an error enabling terminal color.')
}
}
$else {
println('enable_term_color_win() should only be called on windows.')
}
}
pub fn format(msg, open, close string) string { pub fn format(msg, open, close string) string {
return '\x1b[' + open + 'm' + msg + '\x1b[' + close + 'm' return '\x1b[' + open + 'm' + msg + '\x1b[' + close + 'm'
} }