hedgewars-draft: comparison hedgewars/uChat.pas

equal deleted inserted replaced

-:8aed2bfc43c5
+:11a28d22985f
 s: shortstring;
 Color: TSDL_Color;
 end;
 TChatCmd = (ccQuit, ccPause, ccFinish, ccShowHistory, ccFullScreen);
-type TInputStrL = array[0..260] of byte;
 var Strs: array[0 .. MaxStrIndex] of TChatLine;
 MStrs: array[0 .. MaxStrIndex] of shortstring;
 LocalStrs: array[0 .. MaxStrIndex] of shortstring;
 missedCount: LongWord;
 lastStr: LongWord;
 localLastStr: LongInt;
 history: LongInt;
 visibleCount: LongWord;
 InputStr: TChatLine;
-InputStrL: TInputStrL; // for full str + 4-byte utf-8 char
 ChatReady: boolean;
 showAll: boolean;
 liveLua: boolean;
 ChatHidden: boolean;
 firstDraw: boolean;
 const Padding  = 2;
 ClHeight = 2 * Padding + 16; // font height
+// relevant for UTF-8 handling
+function IsFirstCharByte(b: byte): boolean; inline;
+begin
+// based on https://en.wikipedia.org/wiki/UTF-8#Description
+IsFirstCharByte:= (b and $C0) <> $80;
+end;
 function charIsForHogSpeech(c: char): boolean;
 begin
 exit((c = '"') or (c = '''') or (c = '-'));
 end;
 GameState:= gsGame;
 ResetKbd;
 end;
 procedure DelBytesFromInputStrBack(endIdx: integer; count: byte);
-var i, startIdx: integer;
+var startIdx: integer;
 begin
 // nothing to do if count is 0
 if count = 0 then
 exit;
 startIdx:= endIdx - (count - 1);
 // delete bytes from string
 Delete(InputStr.s, startIdx, count);
-// wipe utf8 info for deleted char
-InputStrL[endIdx]:= InputStrLNoPred;
-// shift utf8 char info to reflect new string
-for i:= endIdx + 1 to Length(InputStr.s) + count do
-begin
-if InputStrL[i] <> InputStrLNoPred then
-begin
-InputStrL[i-count]:= InputStrL[i] - count;
-InputStrL[i]:= InputStrLNoPred;
-end;
-end;
 SetLine(InputStr, InputStr.s, true);
 end;
-// returns count of removed bytes
+procedure MoveCursorToPreviousChar();
-function DelCharFromInputStr(idx: integer): integer;
+begin
-var btw: byte;
+if cursorPos > 0 then
 begin
-// note: idx is always at last byte of utf8 chars. cuz relevant for InputStrL
+while (not IsFirstCharByte(byte(InputStr.s[cursorPos]))) do
+begin
-if (Length(InputStr.s) < 1) or (idx < 1) or (idx > Length(InputStr.s)) then
+dec(cursorPos);
-exit(0);
+end;
+dec(cursorPos);
-btw:= byte(idx) - InputStrL[idx];
+end;
+end;
-DelCharFromInputStr:= btw;
+procedure MoveCursorToNextChar();
-DelBytesFromInputStrBack(idx, btw);
+begin
-end;
+if cursorPos <  Length(InputStr.s) then
+begin
-// unchecked
+inc(cursorPos, 2);
-procedure DoCursorStepForward();
+while (cursorPos <  Length(InputStr.s)) and (not IsFirstCharByte(byte(InputStr.s[cursorPos]))) do
 begin
-// go to end of next utf8-char
+inc(cursorPos);
-repeat
+end;
-inc(cursorPos);
+dec(cursorPos);
-until InputStrL[cursorPos] <> InputStrLNoPred;
+end;
 end;
 procedure DeleteSelected();
 begin
 if (selectedPos >= 0) and (cursorPos <> selectedPos) then
 begin
 DelBytesFromInputStrBack(max(cursorPos, selectedPos), abs(selectedPos-cursorPos));
 cursorPos:= min(cursorPos, selectedPos);
-ResetSelection();
+end;
-end;
+ResetSelection();
 UpdateCursorCoords();
 end;
 procedure HandleSelection(enabled: boolean);
 begin
 type TCharSkip = ( none, wspace, numalpha, special );
 function GetInputCharSkipClass(index: LongInt): TCharSkip;
 var  c: char;
 begin
-// multi-byte chars counts as letter
-if (index > 1) and (InputStrL[index] <> index - 1) then
-exit(numalpha);
 c:= InputStr.s[index];
 // non-ascii counts as letter
 if c > #127 then
 exit(numalpha);
 // skip trailing whitespace, similar to Qt
 while (skip = wspace) and (cursorPos > 0) do
 begin
 skip:= GetInputCharSkipClass(cursorPos);
 if skip = wspace then
-cursorPos:= InputStrL[cursorPos];
+MoveCursorToPreviousChar();
 end;
 // skip same-type chars
 while (cursorPos > 0) and (GetInputCharSkipClass(cursorPos) = skip) do
-cursorPos:= InputStrL[cursorPos];
+MoveCursorToPreviousChar();
 end
 else
 begin
 // skip same-type chars
 while cursorPos < Length(InputStr.s) do
 begin
-DoCursorStepForward();
+MoveCursorToNextChar();
 if (GetInputCharSkipClass(cursorPos) <> skip) then
 begin
-// go back 1 char
+MoveCursorToPreviousChar();
-cursorPos:= InputStrL[cursorPos];
 break;
 end;
 end;
 // skip trailing whitespace, similar to Qt
 while cursorPos < Length(InputStr.s) do
 begin
-DoCursorStepForward();
+MoveCursorToNextChar();
 if (GetInputCharSkipClass(cursorPos) <> wspace) then
 begin
-// go back 1 char
+MoveCursorToPreviousChar();
-cursorPos:= InputStrL[cursorPos];
 break;
 end;
 end;
 end;
 end;
 selection:= copy(InputStr.s, min(CursorPos, selectedPos) + 1, abs(CursorPos - selectedPos));
 CopyToClipboard(selection);
 end;
 end;
-// regenerate UTF-8 info for current input string
-procedure RegenInputStrL();
-var i, n, lastL: integer;
-b: byte;
-begin
-lastL:= InputStrLNoPred;
-i:= 0;
-n:= Length(InputStr.s);
-while i <= n do
-begin
-// also save lastL if we reached the end
-if i = n then
-b:= 0
-else
-b:= byte(InputStr.s[i+1]);
-// start of char, based on https://en.wikipedia.org/wiki/UTF-8#Description
-if (b and $C0) <> $80 then
-begin
-InputStrL[i]:= lastL;
-lastL:= i;
-end
-else
-InputStrL[i]:= InputStrLNoPred;
-inc(i);
-end;
-end;
 procedure InsertIntoInputStr(s: shortstring);
-var i, l, il, lastc: integer;
+var l, lastc: integer;
 begin
 // safe length for string
 l:= min(MaxInputStrLen-cursorPos, Length(s));
-s:= copy(s,1,l);
+// SetLength(s, l);
+s[0]:= char(l);
 // insert string truncated to safe length
+Insert(s, InputStr.s, cursorPos + 1);
 // TODO: honor utf8, don't break utf8 chars when shifting chars beyond limit
-Insert(s, InputStr.s, cursorPos + 1);
 if Length(InputStr.s) > MaxInputStrLen then
 InputStr.s[0]:= char(MaxInputStrLen);
 SetLine(InputStr, InputStr.s, true);
-// update InputStrL to also reflect whatever was inserted
-RegenInputStrL();
 // move cursor to end of inserted string
 lastc:= MaxInputStrLen;
 cursorPos:= min(lastc, cursorPos + l);
 UpdateCursorCoords();
 case Sym of
 SDLK_BACKSPACE:
 begin
 if selectedPos < 0 then
 begin
+HandleSelection(true);
+// delete more if ctrl is held
 if ctrl then
-skip:= GetInputCharSkipClass(cursorPos);
+SkipInputChars(GetInputCharSkipClass(cursorPos), true)
+else
-// remove char before cursor
+MoveCursorToPreviousChar();
-dec(cursorPos, DelCharFromInputStr(cursorPos));
+end;
+DeleteSelected();
+UpdateCursorCoords();
+end;
+SDLK_DELETE:
+begin
+if selectedPos < 0 then
+begin
+HandleSelection(true);
 // delete more if ctrl is held
-if ctrl and (selectedPos < 0) then
+if ctrl then
-begin
+SkipInputChars(GetInputCharSkipClass(cursorPos), false)
-HandleSelection(true);
-SkipInputChars(skip, true);
-DeleteSelected();
-end
 else
-UpdateCursorCoords();
+MoveCursorToNextChar();
-end
+end;
-else
 DeleteSelected();
-end;
+UpdateCursorCoords();
-SDLK_DELETE:
-begin
-if selectedPos < 0 then
-begin
-// remove char after cursor
-if cursorPos < Length(InputStr.s) then
-begin
-DoCursorStepForward();
-if ctrl then
-skip:= GetInputCharSkipClass(cursorPos);
-// delete char
-dec(cursorPos, DelCharFromInputStr(cursorPos));
-// delete more if ctrl is held
-if ctrl and (cursorPos < Length(InputStr.s)) then
-begin
-HandleSelection(true);
-SkipInputChars(skip, false);
-DeleteSelected();
-end;
-end
-else
-UpdateCursorCoords();
-end
-else
-DeleteSelected();
 end;
 SDLK_ESCAPE:
 begin
 if Length(InputStr.s) > 0 then
 begin
 SetLine(InputStr, '', true);
-FillChar(InputStrL, sizeof(InputStrL), InputStrLNoPred);
 ResetCursor();
 end
 else CleanupInput
 end;
 SDLK_RETURN, SDLK_KP_ENTER:
 begin
 if Length(InputStr.s) > 0 then
 begin
 AcceptChatString(InputStr.s);
 SetLine(InputStr, '', false);
-FillChar(InputStrL, sizeof(InputStrL), InputStrLNoPred);
 ResetCursor();
 end;
 CleanupInput
 end;
 SDLK_UP, SDLK_DOWN:
 if (Sym = SDLK_DOWN) and (history > 0) then dec(history);
 index:= localLastStr - history + 1;
 if (index > localLastStr) then
 begin
 SetLine(InputStr, '', true);
-FillChar(InputStrL, sizeof(InputStrL), InputStrLNoPred);
 end
 else
 begin
 SetLine(InputStr, LocalStrs[index], true);
-RegenInputStrL();
 end;
 cursorPos:= Length(InputStr.s);
 ResetSelection();
 UpdateCursorCoords();
 end;
 if selMode or (selectedPos < 0) then
 begin
 HandleSelection(selMode);
 // go to end of previous utf8-char
-cursorPos:= InputStrL[cursorPos];
+MoveCursorToPreviousChar();
 end
 else // if we're leaving selection mode, jump to its left end
 begin
 cursorPos:= min(cursorPos, selectedPos);
 ResetSelection();
 begin
 if selMode or (selectedPos < 0) then
 begin
 HandleSelection(selMode);
-DoCursorStepForward();
+MoveCursorToNextChar();
 end
 else // if we're leaving selection mode, jump to its right end
 begin
 cursorPos:= max(cursorPos, selectedPos);
 ResetSelection();
 if length(s) = 0 then
 SetLine(InputStr, '', true)
 else
 begin
 SetLine(InputStr, '/team ', true);
-// update InputStrL and cursor accordingly
-// this allows cursor-jumping over '/team ' as if it was a single char
-InputStrL[6]:= 0;
 cursorPos:= 6;
 UpdateCursorCoords();
 end;
 end;
 inputStr.s:= '';
 inputStr.Tex := nil;
 for i:= 0 to MaxStrIndex do
 Strs[i].Tex := nil;
-FillChar(InputStrL, sizeof(InputStrL), InputStrLNoPred);
 LastKeyPressTick:= 0;
 ResetCursor();
 end;
 procedure freeModule;

changeset 10920	11a28d22985f
parent 10919	8aed2bfc43c5
child 10921	05e6f3b02612