forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix up the clear to eend of line function

This commit is contained in:
Adam D. Ruppe 2023-01-25 20:26:45 -05:00
parent c36abe1c15
commit 7b80a600cd
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
terminal.d
View File

@ -2330,8 +2330,13 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
_cursorY = 0; _cursorY = 0;
} }
///Clears the current line from the cursor onwards /++
void clearLine() { Clears the current line from the cursor onwards.
History:
Added January 25, 2023 (dub v11.0)
+/
void clearToEndOfLine() {
if(UseVtSequences) { if(UseVtSequences) {
writeStringRaw("\033[0K"); writeStringRaw("\033[0K");
} }
@ -2343,7 +2348,7 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
CONSOLE_SCREEN_BUFFER_INFO csbi; CONSOLE_SCREEN_BUFFER_INFO csbi;
DWORD conSize = width-x; DWORD conSize = width-x;
GetConsoleScreenBufferInfo(hConsole, &csbi); GetConsoleScreenBufferInfo(hConsole, &csbi);
auto coordScreen = COORD(x,y); auto coordScreen = COORD(cast(short) x, cast(short) y);
FillConsoleOutputCharacterA(hConsole, ' ', conSize, coordScreen, &c); FillConsoleOutputCharacterA(hConsole, ' ', conSize, coordScreen, &c);
FillConsoleOutputAttribute(hConsole, csbi.wAttributes, conSize, coordScreen, &c); FillConsoleOutputAttribute(hConsole, csbi.wAttributes, conSize, coordScreen, &c);
moveTo(x, y, ForceOption.alwaysSend); moveTo(x, y, ForceOption.alwaysSend);
@ -2416,7 +2421,7 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
} }
/// ditto /// ditto
string getline(string prompt = null, string prefilledData = null, dchar echoChar = dchar.init) { string getline(string prompt, string prefilledData, dchar echoChar = dchar.init) {
return getline(prompt, echoChar, prefilledData); return getline(prompt, echoChar, prefilledData);
} }
@ -6154,6 +6159,8 @@ class LineGetter {
return; return;
if(!multiLineMode) { if(!multiLineMode) {
terminal.clearToEndOfLine();
/*
if(UseVtSequences && !_drawWidthMax) { if(UseVtSequences && !_drawWidthMax) {
terminal.writeStringRaw("\033[K"); terminal.writeStringRaw("\033[K");
} else { } else {
@ -6163,6 +6170,7 @@ class LineGetter {
terminal.write(" "); terminal.write(" ");
lastDrawLength = cdi.written; lastDrawLength = cdi.written;
} }
*/
// if echoChar is null then we don't want to reflect the position at all // if echoChar is null then we don't want to reflect the position at all
terminal.moveTo(startOfLineX + ((echoChar == 0) ? 0 : cdi.cursorPositionToDrawX) + promptLength, startOfLineY + cdi.cursorPositionToDrawY); terminal.moveTo(startOfLineX + ((echoChar == 0) ? 0 : cdi.cursorPositionToDrawX) + promptLength, startOfLineY + cdi.cursorPositionToDrawY);
} else { } else {