hedgewars: comparison hedgewars/uChat.pas

equal deleted inserted replaced

-:8ac09cd322b7
+:0b415bc2e0eb
 procedure freeModule;
 procedure ReloadLines;
 procedure CleanupInput;
 procedure AddChatString(s: shortstring);
 procedure DrawChat;
-procedure KeyPressChat(Key, Sym: Longword);
+procedure KeyPressChat(Key, Sym: Longword; Modifier: Word);
 procedure SendHogSpeech(s: shortstring);
 implementation
 uses SDLh, uInputHandler, uTypes, uVariables, uCommands, uUtils, uTextures, uRender, uIO, uScript, uRenderUtils;
 showAll: boolean;
 liveLua: boolean;
 ChatHidden: boolean;
 InputLinePrefix: shortstring;
 // cursor
-cursorPos, cursorX: LongInt;
+cursorPos, cursorX, selectedPos, selectionDx: LongInt;
 LastKeyPressTick: LongWord;
 const
 InputStrLNoPred: byte = 255;
 const Padding  = 2;
 ClHeight = 2 * Padding + 16; // font height
+procedure ResetSelection();
+begin
+selectedPos:= -1;
+end;
 procedure UpdateCursorCoords();
 var font: THWFont;
 str : shortstring;
-coff: LongInt;
+coff, soff: LongInt;
 begin
+if cursorPos = selectedPos then
+ResetSelection();
 // calculate cursor offset
 str:= InputLinePrefix + InputStr.s;
 font:= CheckCJKFont(ansistring(str), fnt16);
 // get only substring before cursor to determine length
 SetLength(str, Length(InputLinePrefix) + cursorPos);
 // get render size of text
 TTF_SizeUTF8(Fontz[font].Handle, Str2PChar(str), @coff, nil);
 cursorX:= 7 - cScreenWidth div 2 + coff;
-end;
+// calculate selection width on screen
+if selectedPos >= 0 then
+begin
+if selectedPos > cursorPos then
+str:= InputLinePrefix + InputStr.s;
+SetLength(str, Length(InputLinePrefix) + selectedPos);
+TTF_SizeUTF8(Fontz[font].Handle, Str2PChar(str), @soff, nil);
+selectionDx:= soff - coff;
+end
+else
+selectionDx:= 0;
+end;
 procedure ResetCursor();
 begin
+ResetSelection();
 cursorPos:= 0;
 UpdateCursorCoords();
 end;
 procedure RenderChatLineTex(var cl: TChatLine; var str: shortstring);
 inc(visibleCount)
 end;
 procedure DrawChat;
 var i, t, left, top, cnt: LongInt;
+selRect: TSDL_Rect;
 begin
 ChatReady:= true; // maybe move to somewhere else?
 if ChatHidden and (not showAll) then
 visibleCount:= 0;
 // draw chat input line first and under all other lines
 if (GameState = gsChat) and (InputStr.Tex <> nil) then
 begin
 DrawTexture(left, top, InputStr.Tex);
-// draw cursor
+if selectedPos < 0 then
-if ((RealTicks - LastKeyPressTick) and 512) < 256 then
+begin
-DrawLineOnScreen(cursorX, top + 2, cursorX, top + ClHeight - 2, 2.0, $00, $FF, $FF, $FF);
+// draw cursor
+if ((RealTicks - LastKeyPressTick) and 512) < 256 then
+DrawLineOnScreen(cursorX, top + 2, cursorX, top + ClHeight - 2, 2.0, $00, $FF, $FF, $FF);
+end
+else // draw selection
+begin
+selRect.y:= top + 2;
+selRect.h:= clHeight - 4;
+if selectionDx < 0 then
+begin
+selRect.x:= cursorX + selectionDx;
+selRect.w:= -selectionDx;
+end
+else
+begin
+selRect.x:= cursorX;
+selRect.w:= selectionDx;
+end;
+DrawRect(selRect, $FF, $FF, $FF, $40, true);
+end;
 end;
 // draw chat lines
 if ((not ChatHidden) or showAll) and (UIDisplay <> uiNone) then
 {$ENDIF}
 GameState:= gsGame;
 ResetKbd;
 end;
-procedure DelBytesFromInputStr(endIdx: integer; count: byte);
+procedure DelBytesFromInputStrBack(endIdx: integer; count: byte);
 var i, startIdx: integer;
 begin
 // nothing to do if count is 0
 if count = 0 then
 exit;
 btw:= byte(idx) - InputStrL[idx];
 DelCharFromInputStr:= btw;
-DelBytesFromInputStr(idx, btw);
+DelBytesFromInputStrBack(idx, btw);
 end;
+// unchecked
 procedure DoCursorStepForward();
 begin
-if cursorPos < Length(InputStr.s) then
+// go to end of next utf8-char
-begin
+repeat
-// go to end of next utf8-char
+inc(cursorPos);
-repeat
+until InputStrL[cursorPos] <> InputStrLNoPred;
-inc(cursorPos);
+end;
-until InputStrL[cursorPos] <> InputStrLNoPred;
-end;
+procedure DeleteSelected();
-end;
+begin
+if (selectedPos >= 0) and (cursorPos <> selectedPos) then
-procedure KeyPressChat(Key, Sym: Longword);
+begin
+DelBytesFromInputStrBack(max(cursorPos, selectedPos), abs(selectedPos-cursorPos));
+cursorPos:= min(cursorPos, selectedPos);
+ResetSelection();
+end;
+end;
+procedure HandleSelection(enabled: boolean);
+begin
+if enabled then
+begin
+if selectedPos < 0 then
+selectedPos:= cursorPos;
+end
+else
+ResetSelection();
+end;
+procedure KeyPressChat(Key, Sym: Longword; Modifier: Word);
 const firstByteMark: array[0..3] of byte = (0, $C0, $E0, $F0);
 var i, btw, index: integer;
 utf8: shortstring;
-action: boolean;
+action, selMode, ctrl: boolean;
 begin
 LastKeyPressTick:= RealTicks;
 action:= true;
+selMode:= (modifier and (KMOD_LSHIFT or KMOD_RSHIFT)) <> 0;
+ctrl:= (modifier and (KMOD_LCTRL or KMOD_RCTRL)) <> 0;
 case Sym of
 SDLK_BACKSPACE:
 begin
-// remove char before cursor (note: cursorPos is 0-based, char idx isn't)
+if selectedPos < 0 then
-dec(cursorPos, DelCharFromInputStr(cursorPos));
+begin
+// remove char before cursor (note: cursorPos is 0-based, char idx isn't)
+dec(cursorPos, DelCharFromInputStr(cursorPos));
+end
+else
+DeleteSelected();
 UpdateCursorCoords();
 end;
 SDLK_DELETE:
 begin
-// remove char after cursor
+if selectedPos < 0 then
-if cursorPos < Length(InputStr.s) then
+begin
-begin
+// remove char after cursor
-DoCursorStepForward();
+if cursorPos < Length(InputStr.s) then
-dec(cursorPos, DelCharFromInputStr(cursorPos));
+begin
-UpdateCursorCoords();
+DoCursorStepForward();
-end;
+dec(cursorPos, DelCharFromInputStr(cursorPos));
+end;
+end
+else
+DeleteSelected();
+UpdateCursorCoords();
 end;
 SDLK_ESCAPE:
 begin
 if Length(InputStr.s) > 0 then
 begin
 else
 begin
 SetLine(InputStr, LocalStrs[index], true);
 InputStrL:= LocalStrsL[index];
 end;
-// TODO rebuild/restore InputStrL!!
 cursorPos:= Length(InputStr.s);
+ResetSelection();
 UpdateCursorCoords();
 end;
 SDLK_HOME:
 begin
 if cursorPos > 0 then
 begin
+HandleSelection(selMode);
 cursorPos:= 0;
 UpdateCursorCoords();
 end;
 end;
 SDLK_END:
 begin
 i:= Length(InputStr.s);
 if cursorPos < i then
 begin
-// TODO uft-8
+HandleSelection(selMode);
 cursorPos:= i;
 UpdateCursorCoords();
 end;
 end;
 SDLK_LEFT:
 begin
 if cursorPos > 0 then
 begin
-// go to end of previous utf8-char
+if selMode or (selectedPos < 0) then
-cursorPos:= InputStrL[cursorPos];
+begin
+HandleSelection(selMode);
+// go to end of previous utf8-char
+cursorPos:= InputStrL[cursorPos];
+end
+else // if we're leaving selection mode, jump to its left end
+begin
+cursorPos:= min(cursorPos, selectedPos);
+ResetSelection();
+end;
 UpdateCursorCoords();
 end;
 end;
 SDLK_RIGHT:
 begin
-DoCursorStepForward();
+if cursorPos < Length(InputStr.s) then
-UpdateCursorCoords();
+begin
+if selMode or (selectedPos < 0) then
+begin
+HandleSelection(selMode);
+DoCursorStepForward();
+end
+else // if we're leaving selection mode, jump to its right end
+begin
+cursorPos:= max(cursorPos, selectedPos);
+ResetSelection();
+end;
+UpdateCursorCoords();
+end;
 end;
 SDLK_PAGEUP, SDLK_PAGEDOWN:
 begin
 // ignore me!!!
+end;
+SDLK_a:
+begin
+// select all
+if ctrl then
+begin
+ResetSelection();
+cursorPos:= Length(InputStr.s);
+HandleSelection(true);
+cursorPos:= 0;
+UpdateCursorCoords();
+end
+else
+action:= false;
 end;
 else
 action:= false;
 end;
 if not action and (Key <> 0) then
 begin
+DeleteSelected();
 if (Key < $80) then
 btw:= 1
 else if (Key < $800) then
 btw:= 2
 else if (Key < $10000) then

changeset 10836	0b415bc2e0eb
parent 10835	8ac09cd322b7
child 10837	1b7a4d3111ea