zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-15 00:42:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

- handle double wide characters in the console buffer.

Browse source
This commit is contained in:
Christoph Oelckers 2019-03-10 17:43:38 +01:00
parent eb4eb1ac00
commit ec476877ac
1 changed files with 49 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/c_console.cpp
View file

@ -236,26 +236,65 @@ public:
}
}
unsigned CalcCellSize(unsigned length)
{
unsigned cellcount = 0;
for (unsigned i = 0; i < length; i++)
{
int w;
NewConsoleFont->GetChar(Text[i], CR_UNTRANSLATED, &w);
cellcount += w / 9;
}
return cellcount;
}
unsigned CharsForCells(unsigned cells)
{
unsigned chars = 0;
while (cells > 0)
{
int w;
NewConsoleFont->GetChar(Text[chars++], CR_UNTRANSLATED, &w);
cells -= w / 9;
}
return cells == 0? chars : -chars;
}
void MakeStartPosGood()
{
int n = StartPos;
// Make sure both values point to something valid.
if (CursorPos > Text.length()) CursorPos = Text.length();
if (StartPos > Text.length()) StartPos = Text.length();
CursorPosCells = CalcCellSize(CursorPos);
StartPosCells = CalcCellSize(StartPos);
unsigned LengthCells = CalcCellSize(Text.length());
int n = StartPosCells;
unsigned cols = ConCols / active_con_scale();
if (StartPos >= Text.length())
if (StartPosCells >= LengthCells)
{ // Start of visible line is beyond end of line
n = CursorPos - cols + 2;
n = CursorPosCells - cols + 2;
}
if ((CursorPos - StartPos) >= cols - 2)
if ((CursorPosCells - StartPosCells) >= cols - 2)
{ // The cursor is beyond the visible part of the line
n = CursorPos - cols + 2;
n = CursorPosCells - cols + 2;
}
if (StartPos > CursorPos)
if (StartPosCells > CursorPosCells)
{ // The cursor is in front of the visible part of the line
n = CursorPos;
n = CursorPosCells;
}
StartPosCells = MAX(0, n);
StartPos = CharsForCells(StartPosCells);
if (StartPos < 0)
{
// We ended up in the middle of a double cell character, so set the start to the following character.
StartPos = -StartPos + 1;
StartPosCells++;
}
StartPos = MAX(0, n);
CursorPosCells = CursorPos;
StartPosCells = StartPos;
}
void CursorStart()