zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fixed crash when inserting CJK text.

This commit is contained in:
Christoph Oelckers 2019-03-11 00:06:44 +01:00
parent b605ae5213
commit 4532c2c489
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/c_console.cpp
View File

@ -249,28 +249,30 @@ public:
} }
unsigned CharsForCells(unsigned cells) unsigned CharsForCells(unsigned cellin, bool *overflow)
{ {
unsigned chars = 0; unsigned chars = 0;
int cells = cellin;
while (cells > 0) while (cells > 0)
{ {
int w; int w;
NewConsoleFont->GetChar(Text[chars++], CR_UNTRANSLATED, &w); NewConsoleFont->GetChar(Text[chars++], CR_UNTRANSLATED, &w);
cells -= w / 9; cells -= w / 9;
} }
return cells == 0? chars : -chars; *overflow = (cells < 0);
return cells;
} }
void MakeStartPosGood() void MakeStartPosGood()
{ {
// Make sure both values point to something valid. // Make sure both values point to something valid.
if (CursorPos > Text.length()) CursorPos = Text.length(); if (CursorPos > Text.length()) CursorPos = (unsigned)Text.length();
if (StartPos > Text.length()) StartPos = Text.length(); if (StartPos > Text.length()) StartPos = (unsigned)Text.length();
CursorPosCells = CalcCellSize(CursorPos); CursorPosCells = CalcCellSize(CursorPos);
StartPosCells = CalcCellSize(StartPos); StartPosCells = CalcCellSize(StartPos);
unsigned LengthCells = CalcCellSize(Text.length()); unsigned LengthCells = CalcCellSize((unsigned)Text.length());
int n = StartPosCells; int n = StartPosCells;
unsigned cols = ConCols / active_con_scale(); unsigned cols = ConCols / active_con_scale();
@ -288,11 +290,12 @@ public:
n = CursorPosCells; n = CursorPosCells;
} }
StartPosCells = MAX(0, n); StartPosCells = MAX(0, n);
StartPos = CharsForCells(StartPosCells); bool overflow;
if (StartPos < 0) StartPos = CharsForCells(StartPosCells, &overflow);
if (overflow)
{ {
// We ended up in the middle of a double cell character, so set the start to the following character. // We ended up in the middle of a double cell character, so set the start to the following character.
StartPos = -StartPos + 1; StartPos++;
StartPosCells++; StartPosCells++;
} }
} }