hedgewars: comparison hedgewars/uChat.pas

equal deleted inserted replaced

-:437a60995fe1
+:d3b603323b2b
 {$INCLUDE "options.inc"}
 unit uChat;
 interface
+uses SDLh;
 procedure initModule;
 procedure freeModule;
 procedure ReloadLines;
 procedure CleanupInput;
 procedure AddChatString(s: shortstring);
 procedure DrawChat;
-procedure KeyPressChat(Key, Sym: Longword; Modifier: Word);
+procedure KeyPressChat(keysym: TSDL_Keysym);
 procedure SendHogSpeech(s: shortstring);
 procedure CopyToClipboard(var newContent: shortstring);
+procedure TextInput(var event: TSDL_TextInputEvent);
 implementation
-uses SDLh, uInputHandler, uTypes, uVariables, uCommands, uUtils, uTextures, uRender, uIO, uScript, uRenderUtils;
+uses uInputHandler, uTypes, uVariables, uCommands, uUtils, uTextures, uRender, uIO, uScript, uRenderUtils;
 const MaxStrIndex = 27;
 MaxInputStrLen = 200;
 type TChatLine = record
 SetLine(Strs[lastStr], s, false);
 inc(visibleCount)
 end;
-procedure CheckPasteBuffer(); forward;
 procedure UpdateInputLinePrefix();
 begin
 if liveLua then
 begin
 InputLinePrefix.color:= colors[#1];
 top := 10 + visibleCount * ClHeight; // we start with input line (if any)
 // draw chat input line first and under all other lines
 if (GameState = gsChat) and (InputStr.Tex <> nil) then
 begin
-CheckPasteBuffer();
 if InputLinePrefix.Tex = nil then
 RenderChatLineTex(InputLinePrefix, InputLinePrefix.s);
 DrawTexture(left, top, InputLinePrefix.Tex);
 procedure CleanupInput;
 begin
 FreezeEnterKey;
 history:= 0;
-{$IFNDEF SDL2}
+SDL_StopTextInput();
-SDL_EnableKeyRepeat(0,0);
+//SDL_EnableKeyRepeat(0,0);
-{$ENDIF}
 GameState:= gsGame;
 ResetKbd;
 end;
 procedure DelBytesFromInputStrBack(endIdx: integer; count: byte);
 end;
 end;
 procedure CopyToClipboard(var newContent: shortstring);
 begin
-SendIPC(_S'y' + copy(newContent, 1, 253) + #0);
+// SDL2 clipboard
+SDL_SetClipboardText(Str2PChar(newContent));
 end;
 procedure CopySelectionToClipboard();
 var selection: shortstring;
 begin
 UpdateCursorCoords();
 end;
 end;
 procedure PasteFromClipboard();
-begin
+var clip: PChar;
-SendIPC(_S'Y');
+begin
-end;
+// use SDL2 clipboard functions
+if SDL_HasClipboardText() then
-procedure CheckPasteBuffer();
+begin
-begin
+clip:= SDL_GetClipboardText();
-if Length(ChatPasteBuffer) > 0 then
+// returns NULL if not enough memory for a copy of clipboard content
-begin
+if clip <> nil then
-InsertIntoInputStr(ChatPasteBuffer);
+begin
-ChatPasteBuffer:= '';
+InsertIntoInputStr(shortstring(clip));
-end;
+SDL_free(Pointer(clip));
 end;
+end;
-procedure KeyPressChat(Key, Sym: Longword; Modifier: Word);
+end;
-const firstByteMark: array[0..3] of byte = (0, $C0, $E0, $F0);
-nonStateMask = (not (KMOD_NUM or KMOD_CAPS));
+procedure KeyPressChat(keysym: TSDL_Keysym);
-var i, btw, index: integer;
+const nonStateMask = (not (KMOD_NUM or KMOD_CAPS));
-utf8: shortstring;
+var i, index: integer;
-action, selMode, ctrl, ctrlonly: boolean;
+selMode, ctrl, ctrlonly: boolean;
 skip: TCharSkip;
-begin
+Scancode: TSDL_Scancode;
+Modifier: Word;
+begin
+Scancode:= keysym.scancode;
+Modifier:= keysym.modifier;
 LastKeyPressTick:= RealTicks;
-action:= true;
-CheckPasteBuffer();
 selMode:= (modifier and (KMOD_LSHIFT or KMOD_RSHIFT)) <> 0;
 ctrl:= (modifier and (KMOD_LCTRL or KMOD_RCTRL)) <> 0;
 ctrlonly:= ctrl and ((modifier and nonStateMask and (not (KMOD_LCTRL or KMOD_RCTRL))) = 0);
 skip:= none;
-case Sym of
+case Scancode of
-SDLK_BACKSPACE:
+SDL_SCANCODE_BACKSPACE:
 begin
 if selectedPos < 0 then
 begin
 HandleSelection(true);
 end;
 DeleteSelected();
 UpdateCursorCoords();
 end;
-SDLK_DELETE:
+SDL_SCANCODE_DELETE:
 begin
 if selectedPos < 0 then
 begin
 HandleSelection(true);
 end;
 DeleteSelected();
 UpdateCursorCoords();
 end;
-SDLK_ESCAPE:
+SDL_SCANCODE_ESCAPE:
 begin
 if Length(InputStr.s) > 0 then
 begin
 SetLine(InputStr, '', true);
 ResetCursor();
 end
 else CleanupInput
 end;
-SDLK_RETURN, SDLK_KP_ENTER:
+SDL_SCANCODE_RETURN, SDL_SCANCODE_KP_ENTER:
 begin
 if Length(InputStr.s) > 0 then
 begin
 AcceptChatString(InputStr.s);
 SetLine(InputStr, '', false);
 ResetCursor();
 end;
 CleanupInput
 end;
-SDLK_UP, SDLK_DOWN:
+SDL_SCANCODE_UP, SDL_SCANCODE_DOWN:
 begin
-if (Sym = SDLK_UP) and (history < localLastStr) then inc(history);
+if (Scancode = SDL_SCANCODE_UP) and (history < localLastStr) then inc(history);
-if (Sym = SDLK_DOWN) and (history > 0) then dec(history);
+if (Scancode = SDL_SCANCODE_DOWN) and (history > 0) then dec(history);
 index:= localLastStr - history + 1;
 if (index > localLastStr) then
 begin
 SetLine(InputStr, '', true);
 end
 end;
 cursorPos:= Length(InputStr.s);
 ResetSelection();
 UpdateCursorCoords();
 end;
-SDLK_HOME:
+SDL_SCANCODE_HOME:
 begin
 if cursorPos > 0 then
 begin
 HandleSelection(selMode);
 cursorPos:= 0;
 else if (not selMode) then
 ResetSelection();
 UpdateCursorCoords();
 end;
-SDLK_END:
+SDL_SCANCODE_END:
 begin
 i:= Length(InputStr.s);
 if cursorPos < i then
 begin
 HandleSelection(selMode);
 else if (not selMode) then
 ResetSelection();
 UpdateCursorCoords();
 end;
-SDLK_LEFT:
+SDL_SCANCODE_LEFT:
 begin
 if cursorPos > 0 then
 begin
 if ctrl then
 else if (not selMode) then
 ResetSelection();
 UpdateCursorCoords();
 end;
-SDLK_RIGHT:
+SDL_SCANCODE_RIGHT:
 begin
 if cursorPos < Length(InputStr.s) then
 begin
 if selMode or (selectedPos < 0) then
 else if (not selMode) then
 ResetSelection();
 UpdateCursorCoords();
 end;
-SDLK_PAGEUP, SDLK_PAGEDOWN:
+SDL_SCANCODE_PAGEUP, SDL_SCANCODE_PAGEDOWN:
 begin
 // ignore me!!!
 end;
-SDLK_a:
+// TODO: figure out how to determine those keys better
+SDL_SCANCODE_a:
 begin
 // select all
 if ctrlonly then
 begin
 ResetSelection();
 cursorPos:= 0;
 HandleSelection(true);
 cursorPos:= Length(InputStr.s);
 UpdateCursorCoords();
 end
-else
+end;
-action:= false;
+SDL_SCANCODE_c:
-end;
-SDLK_c:
 begin
 // copy
 if ctrlonly then
 CopySelectionToClipboard()
-else
+end;
-action:= false;
+SDL_SCANCODE_v:
-end;
-SDLK_v:
 begin
 // paste
 if ctrlonly then
 begin
 DeleteSelected();
 PasteFromClipboard();
 end
-else
+end;
-action:= false;
+SDL_SCANCODE_x:
-end;
-SDLK_x:
 begin
 // cut
 if ctrlonly then
 begin
 CopySelectionToClipboard();
 DeleteSelected();
 end
-else
+end;
-action:= false;
+end;
 end;
-else
-action:= false;
+procedure TextInput(var event: TSDL_TextInputEvent);
-end;
+var s: shortstring;
-if not action and (Key <> 0) then
+l: byte;
 begin
 DeleteSelected();
-if (Key < $80) then
+l:= 0;
-btw:= 1
+while event.text[l] <> #0 do
-else if (Key < $800) then
+begin
-btw:= 2
+s[l + 1]:= event.text[l];
-else if (Key < $10000) then
+inc(l)
-btw:= 3
+end;
-else
-btw:= 4;
+if l > 0 then
+begin
-utf8:= '';
+if byte(InputStr.s[0]) + l > 240 then exit;
+s[0]:= char(l);
-for i:= btw downto 2 do
+InsertIntoInputStr(s);
-begin
-utf8:= char((Key or $80) and $BF) + utf8;
-Key:= Key shr 6
-end;
-utf8:= char(Key or firstByteMark[Pred(btw)]) + utf8;
-if Length(InputStr.s) + btw > MaxInputStrLen then
-exit;
-// if speech bubble quotes are used as first input, add the closing quote and place cursor inbetween
-if (Length(InputStr.s) = 0) and (Length(utf8) = 1) and (charIsForHogSpeech(utf8[1])) then
-begin
-InsertIntoInputStr(utf8);
-InsertIntoInputStr(utf8);
-cursorPos:= 1;
-UpdateCursorCoords();
-end
-else
-InsertIntoInputStr(utf8);
 end
 end;
 procedure chChatMessage(var s: shortstring);
 begin
 AddChatString(s)
 end;
 procedure chChat(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
 GameState:= gsChat;
-{$IFNDEF SDL2}
+SDL_StopTextInput();
-SDL_EnableKeyRepeat(200,45);
+SDL_StartTextInput();
-{$ENDIF}
+//SDL_EnableKeyRepeat(200,45);
 if length(s) = 0 then
 SetLine(InputStr, '', true)
 else
 begin
 SetLine(InputStr, '/team ', true);
 for i:= 0 to MaxStrIndex do
 Strs[i].Tex := nil;
 LastKeyPressTick:= 0;
 ResetCursor();
+SDL_StopTextInput();
 end;
 procedure freeModule;
 var i: ShortInt;
 begin

changeset 11383	d3b603323b2b
parent 11372	208bc571f949
child 11476	c4e1d39acc56