MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gh:dfhack/dfhack into develop

develop
lethosor 2017-12-23 20:20:58 -05:00
parent 2b534bef5f fd9f198239
commit 9ae4051d33
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/Console-windows.cpp
Unescape Escape View File

@ -62,7 +62,7 @@ using namespace DFHack;
using namespace tthread; using namespace tthread;
// FIXME: maybe make configurable with an ini option? // FIXME: maybe make configurable with an ini option?
#define MAX_CONSOLE_LINES 999; #define MAX_CONSOLE_LINES 999
namespace DFHack namespace DFHack
{ {
@ -165,7 +165,7 @@ namespace DFHack
// Blank to EOL // Blank to EOL
char* tmp = (char*)malloc(inf.dwSize.X); char* tmp = (char*)malloc(inf.dwSize.X);
memset(tmp, ' ', inf.dwSize.X); memset(tmp, ' ', inf.dwSize.X);
output(tmp, inf.dwSize.X, 0, inf.dwCursorPosition.Y); blankout(tmp, inf.dwSize.X, 0, inf.dwCursorPosition.Y);
free(tmp); free(tmp);
COORD coord = {0, inf.dwCursorPosition.Y}; // Windows uses 0-based coordinates COORD coord = {0, inf.dwCursorPosition.Y}; // Windows uses 0-based coordinates
SetConsoleCursorPosition(GetStdHandle(STD_OUTPUT_HANDLE), coord); SetConsoleCursorPosition(GetStdHandle(STD_OUTPUT_HANDLE), coord);
@ -210,13 +210,23 @@ namespace DFHack
} }
} }
void output(const char* str, size_t len, int x, int y) void blankout(const char* str, size_t len, int x, int y)
{ {
COORD pos = { (SHORT)x, (SHORT)y }; COORD pos = { (SHORT)x, (SHORT)y };
DWORD count = 0; DWORD count = 0;
WriteConsoleOutputCharacterA(console_out, str, len, pos, &count); WriteConsoleOutputCharacterA(console_out, str, len, pos, &count);
} }
void output(const char* str, size_t len, int x, int y)
{
COORD pos = { (SHORT)x, (SHORT)y };
DWORD count = 0;
CONSOLE_SCREEN_BUFFER_INFO inf = { 0 };
GetConsoleScreenBufferInfo(console_out, &inf);
SetConsoleCursorPosition(console_out, pos);
WriteConsoleA(console_out, str, len, &count, NULL);
}
void prompt_refresh() void prompt_refresh()
{ {
size_t cols = get_columns(); size_t cols = get_columns();
@ -245,7 +255,7 @@ namespace DFHack
// Blank to EOL // Blank to EOL
char* tmp = (char*)malloc(inf.dwSize.X - (plen + len)); char* tmp = (char*)malloc(inf.dwSize.X - (plen + len));
memset(tmp, ' ', inf.dwSize.X - (plen + len)); memset(tmp, ' ', inf.dwSize.X - (plen + len));
output(tmp, inf.dwSize.X - (plen + len), len + plen, inf.dwCursorPosition.Y); blankout(tmp, inf.dwSize.X - (plen + len), len + plen, inf.dwCursorPosition.Y);
free(tmp); free(tmp);
} }
inf.dwCursorPosition.X = (SHORT)(cooked_cursor + plen); inf.dwCursorPosition.X = (SHORT)(cooked_cursor + plen);