readLine: Unicode support for Windows console (#14782)
* readLine: Unicode support for Windows console When input is read from the Windows console, input encoding is UTF16. This is translated internally to UTF8. * readLine: Remove recursive imports * readLine: Fix issues with --gc:arc **--gc:arc** defines **nimv2**. This changes the definition of **WideCStringObj**. Also an empty string should be returned in case of EOF.
This commit is contained in:
commit
70acba7f0d
1 changed files with 62 additions and 0 deletions
|
|
@ -357,6 +357,68 @@ proc readLine*(f: File, line: var TaintedString): bool {.tags: [ReadIOEffect],
|
||||||
proc c_memchr(s: pointer, c: cint, n: csize_t): pointer {.
|
proc c_memchr(s: pointer, c: cint, n: csize_t): pointer {.
|
||||||
importc: "memchr", header: "<string.h>".}
|
importc: "memchr", header: "<string.h>".}
|
||||||
|
|
||||||
|
when defined(windows) and not defined(useWinAnsi):
|
||||||
|
proc readConsole(hConsoleInput: FileHandle, lpBuffer: pointer,
|
||||||
|
nNumberOfCharsToRead: int32,
|
||||||
|
lpNumberOfCharsRead: ptr int32,
|
||||||
|
pInputControl: pointer): int32 {.
|
||||||
|
importc: "ReadConsoleW", stdcall, dynlib: "kernel32".}
|
||||||
|
|
||||||
|
proc getLastError(): int32 {.
|
||||||
|
importc: "GetLastError", stdcall, dynlib: "kernel32", sideEffect.}
|
||||||
|
|
||||||
|
proc formatMessageW(dwFlags: int32, lpSource: pointer,
|
||||||
|
dwMessageId, dwLanguageId: int32,
|
||||||
|
lpBuffer: pointer, nSize: int32,
|
||||||
|
arguments: pointer): int32 {.
|
||||||
|
importc: "FormatMessageW", stdcall, dynlib: "kernel32".}
|
||||||
|
|
||||||
|
proc localFree(p: pointer) {.
|
||||||
|
importc: "LocalFree", stdcall, dynlib: "kernel32".}
|
||||||
|
|
||||||
|
proc isatty(f: File): bool =
|
||||||
|
when defined(posix):
|
||||||
|
proc isatty(fildes: FileHandle): cint {.
|
||||||
|
importc: "isatty", header: "<unistd.h>".}
|
||||||
|
else:
|
||||||
|
proc isatty(fildes: FileHandle): cint {.
|
||||||
|
importc: "_isatty", header: "<io.h>".}
|
||||||
|
result = isatty(getFileHandle(f)) != 0'i32
|
||||||
|
|
||||||
|
# this implies the file is open
|
||||||
|
if f.isatty:
|
||||||
|
const numberOfCharsToRead = 2048
|
||||||
|
var numberOfCharsRead = 0'i32
|
||||||
|
var buffer = newWideCString("", numberOfCharsToRead)
|
||||||
|
if readConsole(getOsFileHandle(f), addr(buffer[0]),
|
||||||
|
numberOfCharsToRead, addr(numberOfCharsRead), nil) == 0:
|
||||||
|
var error = getLastError()
|
||||||
|
var errorMsg: string
|
||||||
|
var msgbuf: WideCString
|
||||||
|
if formatMessageW(0x00000100 or 0x00001000 or 0x00000200,
|
||||||
|
nil, error, 0, addr(msgbuf), 0, nil) != 0'i32:
|
||||||
|
errorMsg = $msgbuf
|
||||||
|
if msgbuf != nil:
|
||||||
|
localFree(cast[pointer](msgbuf))
|
||||||
|
raiseEIO("error: " & $error & " `" & errorMsg & "`")
|
||||||
|
# input always ends with "\r\n"
|
||||||
|
numberOfCharsRead -= 2
|
||||||
|
# handle Ctrl+Z as EOF
|
||||||
|
for i in 0..<numberOfCharsRead:
|
||||||
|
if buffer[i].uint16 == 26: #Ctrl+Z
|
||||||
|
close(f) #has the same effect as setting EOF
|
||||||
|
if i == 0:
|
||||||
|
line = TaintedString("")
|
||||||
|
return false
|
||||||
|
numberOfCharsRead = i
|
||||||
|
break
|
||||||
|
buffer[numberOfCharsRead] = 0.Utf16Char
|
||||||
|
when defined(nimv2):
|
||||||
|
line = TaintedString($toWideCString(buffer))
|
||||||
|
else:
|
||||||
|
line = TaintedString($buffer)
|
||||||
|
return(true)
|
||||||
|
|
||||||
var pos = 0
|
var pos = 0
|
||||||
|
|
||||||
# Use the currently reserved space for a first try
|
# Use the currently reserved space for a first try
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue