author | Wuzzy <almikes@aol.com> |
Thu, 04 May 2017 16:49:34 +0200 | |
changeset 12412 | 8cc070640fd1 |
parent 12107 | 51596d30a724 |
child 12415 | 8b971d8944d6 |
permissions | -rw-r--r-- |
942 | 1 |
(* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
11046 | 3 |
* Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com> |
942 | 4 |
* |
5 |
* This program is free software; you can redistribute it and/or modify |
|
6 |
* it under the terms of the GNU General Public License as published by |
|
7 |
* the Free Software Foundation; version 2 of the License |
|
8 |
* |
|
9 |
* This program is distributed in the hope that it will be useful, |
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
12 |
* GNU General Public License for more details. |
|
13 |
* |
|
14 |
* You should have received a copy of the GNU General Public License |
|
15 |
* along with this program; if not, write to the Free Software |
|
10108
c68cf030eded
update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents:
10104
diff
changeset
|
16 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
942 | 17 |
*) |
18 |
||
2630 | 19 |
{$INCLUDE "options.inc"} |
20 |
||
942 | 21 |
unit uChat; |
22 |
||
23 |
interface |
|
9699
fab319c85a39
Accept SDL_TEXTINPUT events for chat (why first and only first chat invocation receives event for 't' key?)
unc0rr
parents:
9697
diff
changeset
|
24 |
uses SDLh; |
942 | 25 |
|
3038 | 26 |
procedure initModule; |
27 |
procedure freeModule; |
|
6379 | 28 |
procedure ReloadLines; |
8738 | 29 |
procedure CleanupInput; |
942 | 30 |
procedure AddChatString(s: shortstring); |
31 |
procedure DrawChat; |
|
11356 | 32 |
procedure KeyPressChat(keysym: TSDL_Keysym); |
9669 | 33 |
procedure SendHogSpeech(s: shortstring); |
10849
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
34 |
procedure CopyToClipboard(var newContent: shortstring); |
9699
fab319c85a39
Accept SDL_TEXTINPUT events for chat (why first and only first chat invocation receives event for 't' key?)
unc0rr
parents:
9697
diff
changeset
|
35 |
procedure TextInput(var event: TSDL_TextInputEvent); |
fab319c85a39
Accept SDL_TEXTINPUT events for chat (why first and only first chat invocation receives event for 't' key?)
unc0rr
parents:
9697
diff
changeset
|
36 |
|
942 | 37 |
implementation |
11342 | 38 |
uses uInputHandler, uTypes, uVariables, uCommands, uUtils, uTextures, uRender, uIO, uScript, uRenderUtils; |
942 | 39 |
|
990
dfa6a6fe1542
Implement history for chat (27 entries), no key binding yet
unc0rr
parents:
988
diff
changeset
|
40 |
const MaxStrIndex = 27; |
10921 | 41 |
MaxInputStrLen = 200; |
942 | 42 |
|
946 | 43 |
type TChatLine = record |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
44 |
Tex: PTexture; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
45 |
Time: Longword; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
46 |
Width: LongInt; |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
47 |
s: shortstring; |
10303 | 48 |
Color: TSDL_Color; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
49 |
end; |
9954 | 50 |
TChatCmd = (ccQuit, ccPause, ccFinish, ccShowHistory, ccFullScreen); |
942 | 51 |
|
946 | 52 |
var Strs: array[0 .. MaxStrIndex] of TChatLine; |
3539 | 53 |
MStrs: array[0 .. MaxStrIndex] of shortstring; |
8740
3eb1891f81ef
use a local storage for chat history which prevents mix ups in netgame and simplifies code
koda
parents:
8739
diff
changeset
|
54 |
LocalStrs: array[0 .. MaxStrIndex] of shortstring; |
3539 | 55 |
missedCount: LongWord; |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2699
diff
changeset
|
56 |
lastStr: LongWord; |
9145 | 57 |
localLastStr: LongInt; |
58 |
history: LongInt; |
|
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2699
diff
changeset
|
59 |
visibleCount: LongWord; |
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2699
diff
changeset
|
60 |
InputStr: TChatLine; |
4814
e19791f08443
smaller rearrangement of (non stereo related) variables
koda
parents:
4467
diff
changeset
|
61 |
ChatReady: boolean; |
e19791f08443
smaller rearrangement of (non stereo related) variables
koda
parents:
4467
diff
changeset
|
62 |
showAll: boolean; |
10312 | 63 |
liveLua: boolean; |
10514
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
64 |
ChatHidden: boolean; |
10842
a039464cbb4a
since fonts can be loaded in late, update cursor position before first chat display
sheepluva
parents:
10841
diff
changeset
|
65 |
firstDraw: boolean; |
10852
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
66 |
InputLinePrefix: TChatLine; |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
67 |
// cursor |
10836 | 68 |
cursorPos, cursorX, selectedPos, selectionDx: LongInt; |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
69 |
LastKeyPressTick: LongWord; |
942 | 70 |
|
71 |
||
8152 | 72 |
const |
11840 | 73 |
colors: array[#0..#9] of TSDL_Color = ( |
11022 | 74 |
(r:$FF; g:$FF; b:$FF; a:$FF), // #0 unused, feel free to take it for anything |
75 |
(r:$FF; g:$FF; b:$FF; a:$FF), // #1 chat message [White] |
|
76 |
(r:$FF; g:$00; b:$FF; a:$FF), // #2 action message [Purple] |
|
77 |
(r:$90; g:$FF; b:$90; a:$FF), // #3 join/leave message [Lime] |
|
78 |
(r:$FF; g:$FF; b:$A0; a:$FF), // #4 team message [Light Yellow] |
|
79 |
(r:$FF; g:$00; b:$00; a:$FF), // #5 error messages [Red] |
|
80 |
(r:$00; g:$FF; b:$FF; a:$FF), // #6 input line [Light Blue] |
|
81 |
(r:$FF; g:$80; b:$80; a:$FF), // #7 team gone [Light Red] |
|
82 |
(r:$FF; g:$D0; b:$80; a:$FF), // #8 team back [Light Orange] |
|
11840 | 83 |
(r:$DF; g:$DF; b:$DF; a:$FF) // #9 hog speech [Light Gray] |
8152 | 84 |
); |
85 |
ChatCommandz: array [TChatCmd] of record |
|
86 |
ChatCmd: string[31]; |
|
87 |
ProcedureCallChatCmd: string[31]; |
|
88 |
end = ( |
|
89 |
(ChatCmd: '/quit'; ProcedureCallChatCmd: 'halt'), |
|
90 |
(ChatCmd: '/pause'; ProcedureCallChatCmd: 'pause'), |
|
91 |
(ChatCmd: '/finish'; ProcedureCallChatCmd: 'finish'), |
|
9569 | 92 |
(ChatCmd: '/history'; ProcedureCallChatCmd: 'history'), |
8152 | 93 |
(ChatCmd: '/fullscreen'; ProcedureCallChatCmd: 'fullscr') |
94 |
); |
|
2396 | 95 |
|
10303 | 96 |
|
97 |
const Padding = 2; |
|
98 |
ClHeight = 2 * Padding + 16; // font height |
|
99 |
||
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
100 |
// relevant for UTF-8 handling |
10921 | 101 |
function IsFirstCharByte(c: char): boolean; inline; |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
102 |
begin |
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
103 |
// based on https://en.wikipedia.org/wiki/UTF-8#Description |
10921 | 104 |
IsFirstCharByte:= (byte(c) and $C0) <> $80; |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
105 |
end; |
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
106 |
|
10866 | 107 |
function charIsForHogSpeech(c: char): boolean; |
108 |
begin |
|
109 |
exit((c = '"') or (c = '''') or (c = '-')); |
|
110 |
end; |
|
111 |
||
10836 | 112 |
procedure ResetSelection(); |
942 | 113 |
begin |
10836 | 114 |
selectedPos:= -1; |
115 |
end; |
|
116 |
||
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
117 |
procedure UpdateCursorCoords(); |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
118 |
var font: THWFont; |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
119 |
str : shortstring; |
10836 | 120 |
coff, soff: LongInt; |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
121 |
begin |
10836 | 122 |
if cursorPos = selectedPos then |
123 |
ResetSelection(); |
|
2396 | 124 |
|
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
125 |
// calculate cursor offset |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
126 |
|
10852
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
127 |
str:= InputStr.s; |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
128 |
font:= CheckCJKFont(ansistring(str), fnt16); |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
129 |
|
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
130 |
// get only substring before cursor to determine length |
10852
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
131 |
// SetLength(str, cursorPos); // makes pas2c unhappy |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
132 |
str[0]:= char(cursorPos); |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
133 |
// get render size of text |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
134 |
TTF_SizeUTF8(Fontz[font].Handle, Str2PChar(str), @coff, nil); |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
135 |
|
10842
a039464cbb4a
since fonts can be loaded in late, update cursor position before first chat display
sheepluva
parents:
10841
diff
changeset
|
136 |
cursorX:= 2 + coff; |
990
dfa6a6fe1542
Implement history for chat (27 entries), no key binding yet
unc0rr
parents:
988
diff
changeset
|
137 |
|
10836 | 138 |
// calculate selection width on screen |
139 |
if selectedPos >= 0 then |
|
140 |
begin |
|
141 |
if selectedPos > cursorPos then |
|
10852
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
142 |
str:= InputStr.s; |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
143 |
// SetLength(str, selectedPos); // makes pas2c unhappy |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
144 |
str[0]:= char(selectedPos); |
10836 | 145 |
TTF_SizeUTF8(Fontz[font].Handle, Str2PChar(str), @soff, nil); |
146 |
selectionDx:= soff - coff; |
|
147 |
end |
|
148 |
else |
|
149 |
selectionDx:= 0; |
|
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
150 |
end; |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
151 |
|
10836 | 152 |
|
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
153 |
procedure ResetCursor(); |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
154 |
begin |
10836 | 155 |
ResetSelection(); |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
156 |
cursorPos:= 0; |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
157 |
UpdateCursorCoords(); |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
158 |
end; |
2396 | 159 |
|
10985
c5348fe9077c
fix chat lines losing color information on texture reload
sheepluva
parents:
10926
diff
changeset
|
160 |
(* This procedure [re]renders a texture showing str for the chat line cl. |
c5348fe9077c
fix chat lines losing color information on texture reload
sheepluva
parents:
10926
diff
changeset
|
161 |
* It will use the color stored in cl and update width |
c5348fe9077c
fix chat lines losing color information on texture reload
sheepluva
parents:
10926
diff
changeset
|
162 |
*) |
10303 | 163 |
procedure RenderChatLineTex(var cl: TChatLine; var str: shortstring); |
12107
51596d30a724
fix chat SDL surfaces being in wrong color format (didn't play well with copyToXY's new quick pixel copies)
sheepluva
parents:
11840
diff
changeset
|
164 |
var strSurface, tmpSurface, |
10303 | 165 |
resSurface: PSDL_Surface; |
166 |
dstrect : TSDL_Rect; // destination rectangle for blitting |
|
167 |
font : THWFont; |
|
168 |
const |
|
169 |
shadowint = $80 shl AShift; |
|
170 |
begin |
|
171 |
||
10985
c5348fe9077c
fix chat lines losing color information on texture reload
sheepluva
parents:
10926
diff
changeset
|
172 |
FreeAndNilTexture(cl.Tex); |
c5348fe9077c
fix chat lines losing color information on texture reload
sheepluva
parents:
10926
diff
changeset
|
173 |
|
10303 | 174 |
font:= CheckCJKFont(ansistring(str), fnt16); |
175 |
||
176 |
// get render size of text |
|
177 |
TTF_SizeUTF8(Fontz[font].Handle, Str2PChar(str), @cl.Width, nil); |
|
945
4ead9cde4e14
- Start chat implementation: chat strings are on the screen
unc0rr
parents:
942
diff
changeset
|
178 |
|
10303 | 179 |
// calculate and save size |
180 |
cl.Width := cl.Width + 2 * Padding; |
|
181 |
||
182 |
// create surface to draw on |
|
183 |
resSurface:= SDL_CreateRGBSurface( |
|
184 |
0, toPowerOf2(cl.Width), toPowerOf2(ClHeight), |
|
185 |
32, RMask, GMask, BMask, AMask); |
|
945
4ead9cde4e14
- Start chat implementation: chat strings are on the screen
unc0rr
parents:
942
diff
changeset
|
186 |
|
10303 | 187 |
// define area we want to draw in |
188 |
dstrect.x:= 0; |
|
189 |
dstrect.y:= 0; |
|
190 |
dstrect.w:= cl.Width; |
|
191 |
dstrect.h:= ClHeight; |
|
192 |
||
193 |
// draw background |
|
194 |
SDL_FillRect(resSurface, @dstrect, shadowint); |
|
195 |
||
196 |
// create and blit text |
|
12107
51596d30a724
fix chat SDL surfaces being in wrong color format (didn't play well with copyToXY's new quick pixel copies)
sheepluva
parents:
11840
diff
changeset
|
197 |
tmpSurface:= nil; |
10370 | 198 |
strSurface:= TTF_RenderUTF8_Blended(Fontz[font].Handle, Str2PChar(str), cl.color); |
12107
51596d30a724
fix chat SDL surfaces being in wrong color format (didn't play well with copyToXY's new quick pixel copies)
sheepluva
parents:
11840
diff
changeset
|
199 |
// fix format |
51596d30a724
fix chat SDL surfaces being in wrong color format (didn't play well with copyToXY's new quick pixel copies)
sheepluva
parents:
11840
diff
changeset
|
200 |
if strSurface <> nil then tmpSurface:= SDL_ConvertSurface(strSurface, resSurface^.format, 0); |
51596d30a724
fix chat SDL surfaces being in wrong color format (didn't play well with copyToXY's new quick pixel copies)
sheepluva
parents:
11840
diff
changeset
|
201 |
SDL_FreeSurface(strSurface); |
10737 | 202 |
//SDL_UpperBlit(strSurface, nil, resSurface, @dstrect); |
12107
51596d30a724
fix chat SDL surfaces being in wrong color format (didn't play well with copyToXY's new quick pixel copies)
sheepluva
parents:
11840
diff
changeset
|
203 |
if tmpSurface <> nil then copyToXY(tmpSurface, resSurface, Padding, Padding); |
51596d30a724
fix chat SDL surfaces being in wrong color format (didn't play well with copyToXY's new quick pixel copies)
sheepluva
parents:
11840
diff
changeset
|
204 |
SDL_FreeSurface(tmpSurface); |
1118 | 205 |
|
2290
bf87ca44782e
Selectively enable clamping - seeing if this helps avoid weird flake problems while still fixing vertical lines in waves and sky
nemo
parents:
2161
diff
changeset
|
206 |
cl.Tex:= Surface2Tex(resSurface, false); |
1431 | 207 |
|
1118 | 208 |
SDL_FreeSurface(resSurface) |
946 | 209 |
end; |
210 |
||
10303 | 211 |
const ClDisplayDuration = 12500; |
2396 | 212 |
|
990
dfa6a6fe1542
Implement history for chat (27 entries), no key binding yet
unc0rr
parents:
988
diff
changeset
|
213 |
procedure SetLine(var cl: TChatLine; str: shortstring; isInput: boolean); |
10303 | 214 |
var color : TSDL_Color; |
942 | 215 |
begin |
2396 | 216 |
if isInput then |
6379 | 217 |
begin |
10303 | 218 |
cl.s:= str; |
5392 | 219 |
color:= colors[#6]; |
10852
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
220 |
str:= str + ' '; |
6379 | 221 |
end |
2664
949c189ba568
powerpc and gameserver compilation disabled temporarily
koda
parents:
2630
diff
changeset
|
222 |
else |
6379 | 223 |
begin |
10863
9d3e1123bd43
fallback to first color in colors array if there is no valid color specified
sheepluva
parents:
10853
diff
changeset
|
224 |
if str[1] <= High(colors) then |
9d3e1123bd43
fallback to first color in colors array if there is no valid color specified
sheepluva
parents:
10853
diff
changeset
|
225 |
begin |
9d3e1123bd43
fallback to first color in colors array if there is no valid color specified
sheepluva
parents:
10853
diff
changeset
|
226 |
color:= colors[str[1]]; |
9d3e1123bd43
fallback to first color in colors array if there is no valid color specified
sheepluva
parents:
10853
diff
changeset
|
227 |
delete(str, 1, 1); |
9d3e1123bd43
fallback to first color in colors array if there is no valid color specified
sheepluva
parents:
10853
diff
changeset
|
228 |
end |
9d3e1123bd43
fallback to first color in colors array if there is no valid color specified
sheepluva
parents:
10853
diff
changeset
|
229 |
// fallback if invalid color |
9d3e1123bd43
fallback to first color in colors array if there is no valid color specified
sheepluva
parents:
10853
diff
changeset
|
230 |
else |
9d3e1123bd43
fallback to first color in colors array if there is no valid color specified
sheepluva
parents:
10853
diff
changeset
|
231 |
color:= colors[Low(colors)]; |
9d3e1123bd43
fallback to first color in colors array if there is no valid color specified
sheepluva
parents:
10853
diff
changeset
|
232 |
|
10303 | 233 |
cl.s:= str; |
6379 | 234 |
end; |
2396 | 235 |
|
10303 | 236 |
cl.color:= color; |
945
4ead9cde4e14
- Start chat implementation: chat strings are on the screen
unc0rr
parents:
942
diff
changeset
|
237 |
|
10303 | 238 |
// set texture, note: variables cl.s and str will be different here if isInput |
239 |
RenderChatLineTex(cl, str); |
|
1118 | 240 |
|
11840 | 241 |
cl.Time:= RealTicks + ClDisplayDuration; |
946 | 242 |
end; |
243 |
||
6379 | 244 |
// For uStore texture recreation |
245 |
procedure ReloadLines; |
|
10985
c5348fe9077c
fix chat lines losing color information on texture reload
sheepluva
parents:
10926
diff
changeset
|
246 |
var i: LongWord; |
6379 | 247 |
begin |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
248 |
if InputStr.s <> '' then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
249 |
SetLine(InputStr, InputStr.s, true); |
6381 | 250 |
for i:= 0 to MaxStrIndex do |
251 |
if Strs[i].s <> '' then |
|
252 |
begin |
|
10985
c5348fe9077c
fix chat lines losing color information on texture reload
sheepluva
parents:
10926
diff
changeset
|
253 |
RenderChatLineTex(Strs[i], Strs[i].s); |
6381 | 254 |
end; |
6379 | 255 |
end; |
256 |
||
946 | 257 |
procedure AddChatString(s: shortstring); |
258 |
begin |
|
3539 | 259 |
if not ChatReady then |
260 |
begin |
|
261 |
if MissedCount < MaxStrIndex - 1 then |
|
262 |
MStrs[MissedCount]:= s |
|
263 |
else if MissedCount < MaxStrIndex then |
|
264 |
MStrs[MissedCount]:= #5 + '[...]'; |
|
265 |
inc(MissedCount); |
|
266 |
exit |
|
267 |
end; |
|
268 |
||
946 | 269 |
lastStr:= (lastStr + 1) mod (MaxStrIndex + 1); |
270 |
||
990
dfa6a6fe1542
Implement history for chat (27 entries), no key binding yet
unc0rr
parents:
988
diff
changeset
|
271 |
SetLine(Strs[lastStr], s, false); |
945
4ead9cde4e14
- Start chat implementation: chat strings are on the screen
unc0rr
parents:
942
diff
changeset
|
272 |
|
4ead9cde4e14
- Start chat implementation: chat strings are on the screen
unc0rr
parents:
942
diff
changeset
|
273 |
inc(visibleCount) |
942 | 274 |
end; |
275 |
||
10852
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
276 |
procedure UpdateInputLinePrefix(); |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
277 |
begin |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
278 |
if liveLua then |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
279 |
begin |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
280 |
InputLinePrefix.color:= colors[#1]; |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
281 |
InputLinePrefix.s:= '[Lua] >'; |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
282 |
end |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
283 |
else |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
284 |
begin |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
285 |
InputLinePrefix.color:= colors[#6]; |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
286 |
InputLinePrefix.s:= UserNick + '>'; |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
287 |
end; |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
288 |
|
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
289 |
FreeAndNilTexture(InputLinePrefix.Tex); |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
290 |
end; |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
291 |
|
942 | 292 |
procedure DrawChat; |
10514
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
293 |
var i, t, left, top, cnt: LongInt; |
10836 | 294 |
selRect: TSDL_Rect; |
10866 | 295 |
c: char; |
942 | 296 |
begin |
3539 | 297 |
ChatReady:= true; // maybe move to somewhere else? |
1431 | 298 |
|
10514
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
299 |
if ChatHidden and (not showAll) then |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
300 |
visibleCount:= 0; |
1431 | 301 |
|
10514
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
302 |
// draw chat lines with some distance from screen border |
10303 | 303 |
left:= 4 - cScreenWidth div 2; |
10514
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
304 |
top := 10 + visibleCount * ClHeight; // we start with input line (if any) |
1431 | 305 |
|
10514
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
306 |
// draw chat input line first and under all other lines |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
307 |
if (GameState = gsChat) and (InputStr.Tex <> nil) then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2716
diff
changeset
|
308 |
begin |
10850
c76ea22ea249
copy to/paste from system clipboard (via frontend)
sheepluva
parents:
10849
diff
changeset
|
309 |
|
10852
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
310 |
if InputLinePrefix.Tex = nil then |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
311 |
RenderChatLineTex(InputLinePrefix, InputLinePrefix.s); |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
312 |
|
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
313 |
DrawTexture(left, top, InputLinePrefix.Tex); |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
314 |
inc(left, InputLinePrefix.Width); |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
315 |
DrawTexture(left, top, InputStr.Tex); |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
316 |
|
10842
a039464cbb4a
since fonts can be loaded in late, update cursor position before first chat display
sheepluva
parents:
10841
diff
changeset
|
317 |
if firstDraw then |
a039464cbb4a
since fonts can be loaded in late, update cursor position before first chat display
sheepluva
parents:
10841
diff
changeset
|
318 |
begin |
a039464cbb4a
since fonts can be loaded in late, update cursor position before first chat display
sheepluva
parents:
10841
diff
changeset
|
319 |
UpdateCursorCoords(); |
a039464cbb4a
since fonts can be loaded in late, update cursor position before first chat display
sheepluva
parents:
10841
diff
changeset
|
320 |
firstDraw:= false; |
a039464cbb4a
since fonts can be loaded in late, update cursor position before first chat display
sheepluva
parents:
10841
diff
changeset
|
321 |
end; |
a039464cbb4a
since fonts can be loaded in late, update cursor position before first chat display
sheepluva
parents:
10841
diff
changeset
|
322 |
|
10836 | 323 |
if selectedPos < 0 then |
324 |
begin |
|
325 |
// draw cursor |
|
326 |
if ((RealTicks - LastKeyPressTick) and 512) < 256 then |
|
10839
aa0ceb47da1d
make sure cursor drawing position does not get messed up by screen resize
sheepluva
parents:
10837
diff
changeset
|
327 |
DrawLineOnScreen(left + cursorX, top + 2, left + cursorX, top + ClHeight - 2, 2.0, $00, $FF, $FF, $FF); |
10836 | 328 |
end |
329 |
else // draw selection |
|
330 |
begin |
|
331 |
selRect.y:= top + 2; |
|
332 |
selRect.h:= clHeight - 4; |
|
333 |
if selectionDx < 0 then |
|
334 |
begin |
|
10839
aa0ceb47da1d
make sure cursor drawing position does not get messed up by screen resize
sheepluva
parents:
10837
diff
changeset
|
335 |
selRect.x:= left + cursorX + selectionDx; |
10836 | 336 |
selRect.w:= -selectionDx; |
337 |
end |
|
338 |
else |
|
339 |
begin |
|
10839
aa0ceb47da1d
make sure cursor drawing position does not get messed up by screen resize
sheepluva
parents:
10837
diff
changeset
|
340 |
selRect.x:= left + cursorX; |
10836 | 341 |
selRect.w:= selectionDx; |
342 |
end; |
|
1431 | 343 |
|
10836 | 344 |
DrawRect(selRect, $FF, $FF, $FF, $40, true); |
345 |
end; |
|
10852
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
346 |
|
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
347 |
dec(left, InputLinePrefix.Width); |
10866 | 348 |
|
1431 | 349 |
|
10866 | 350 |
if (Length(InputStr.s) > 0) and ((CursorPos = 1) or (CursorPos = 2)) then |
351 |
begin |
|
352 |
c:= InputStr.s[1]; |
|
353 |
if charIsForHogSpeech(c) then |
|
354 |
begin |
|
10868
acb03a9712c3
show correct default if current team is local team
sheepluva
parents:
10866
diff
changeset
|
355 |
SpeechHogNumber:= 0; |
10866 | 356 |
if Length(InputStr.s) > 1 then |
357 |
begin |
|
358 |
c:= InputStr.s[2]; |
|
359 |
if (c > '0') and (c < '9') then |
|
360 |
SpeechHogNumber:= byte(c) - 48; |
|
361 |
end; |
|
10868
acb03a9712c3
show correct default if current team is local team
sheepluva
parents:
10866
diff
changeset
|
362 |
// default to current hedgehog (if own) or first hedgehog |
acb03a9712c3
show correct default if current team is local team
sheepluva
parents:
10866
diff
changeset
|
363 |
if SpeechHogNumber = 0 then |
acb03a9712c3
show correct default if current team is local team
sheepluva
parents:
10866
diff
changeset
|
364 |
begin |
acb03a9712c3
show correct default if current team is local team
sheepluva
parents:
10866
diff
changeset
|
365 |
if not CurrentTeam^.ExtDriven then |
acb03a9712c3
show correct default if current team is local team
sheepluva
parents:
10866
diff
changeset
|
366 |
SpeechHogNumber:= CurrentTeam^.CurrHedgehog + 1 |
acb03a9712c3
show correct default if current team is local team
sheepluva
parents:
10866
diff
changeset
|
367 |
else |
acb03a9712c3
show correct default if current team is local team
sheepluva
parents:
10866
diff
changeset
|
368 |
SpeechHogNumber:= 1; |
acb03a9712c3
show correct default if current team is local team
sheepluva
parents:
10866
diff
changeset
|
369 |
end; |
10866 | 370 |
end; |
371 |
end |
|
372 |
else |
|
10868
acb03a9712c3
show correct default if current team is local team
sheepluva
parents:
10866
diff
changeset
|
373 |
SpeechHogNumber:= -1; |
10866 | 374 |
end |
375 |
else |
|
10868
acb03a9712c3
show correct default if current team is local team
sheepluva
parents:
10866
diff
changeset
|
376 |
SpeechHogNumber:= -1; |
1431 | 377 |
|
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
378 |
// draw chat lines |
10514
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
379 |
if ((not ChatHidden) or showAll) and (UIDisplay <> uiNone) then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2716
diff
changeset
|
380 |
begin |
10375 | 381 |
if MissedCount <> 0 then // there are chat strings we missed, so print them now |
382 |
begin |
|
383 |
for i:= 0 to MissedCount - 1 do |
|
384 |
AddChatString(MStrs[i]); |
|
385 |
MissedCount:= 0; |
|
386 |
end; |
|
387 |
i:= lastStr; |
|
10303 | 388 |
|
10375 | 389 |
cnt:= 0; // count of lines displayed |
390 |
t := 1; // # of current line processed |
|
2376 | 391 |
|
10375 | 392 |
// draw lines in reverse order |
10514
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
393 |
while (((t < 7) and (Strs[i].Time > RealTicks)) or ((t <= MaxStrIndex + 1) and showAll)) |
10375 | 394 |
and (Strs[i].Tex <> nil) do |
395 |
begin |
|
10514
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
396 |
top:= top - ClHeight; |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
397 |
// draw chatline only if not offscreen |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
398 |
if top > 0 then |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
399 |
DrawTexture(left, top, Strs[i].Tex); |
8745 | 400 |
|
10375 | 401 |
if i = 0 then |
402 |
i:= MaxStrIndex |
|
403 |
else |
|
404 |
dec(i); |
|
405 |
||
406 |
inc(cnt); |
|
407 |
inc(t) |
|
408 |
end; |
|
409 |
||
410 |
visibleCount:= cnt; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2716
diff
changeset
|
411 |
end; |
942 | 412 |
end; |
413 |
||
4467 | 414 |
procedure SendHogSpeech(s: shortstring); |
415 |
begin |
|
416 |
SendIPC('h' + s); |
|
417 |
ParseCommand('/hogsay '+s, true) |
|
418 |
end; |
|
419 |
||
10392 | 420 |
procedure SendConsoleCommand(s: shortstring); |
421 |
begin |
|
422 |
Delete(s, 1, 1); |
|
423 |
SendIPC('~' + s) |
|
424 |
end; |
|
425 |
||
1033 | 426 |
procedure AcceptChatString(s: shortstring); |
1035 | 427 |
var i: TWave; |
8152 | 428 |
j: TChatCmd; |
4465
743673c67d0c
Allow hog speech when not your turn. Currently is set to 40% opacity (could be fainter) and drawn behind the hogs instead of in front. Also allows hog targetting using a number.
nemo
parents:
4404
diff
changeset
|
429 |
c, t: LongInt; |
4467 | 430 |
x: byte; |
1033 | 431 |
begin |
10513
58fa783e0cfd
fixes to chat input history: remember all inputs, don not remember duplicates
sheepluva
parents:
10396
diff
changeset
|
432 |
if s <> LocalStrs[localLastStr] then |
58fa783e0cfd
fixes to chat input history: remember all inputs, don not remember duplicates
sheepluva
parents:
10396
diff
changeset
|
433 |
begin |
58fa783e0cfd
fixes to chat input history: remember all inputs, don not remember duplicates
sheepluva
parents:
10396
diff
changeset
|
434 |
// put in input history |
58fa783e0cfd
fixes to chat input history: remember all inputs, don not remember duplicates
sheepluva
parents:
10396
diff
changeset
|
435 |
localLastStr:= (localLastStr + 1) mod MaxStrIndex; |
58fa783e0cfd
fixes to chat input history: remember all inputs, don not remember duplicates
sheepluva
parents:
10396
diff
changeset
|
436 |
LocalStrs[localLastStr]:= s; |
58fa783e0cfd
fixes to chat input history: remember all inputs, don not remember duplicates
sheepluva
parents:
10396
diff
changeset
|
437 |
end; |
58fa783e0cfd
fixes to chat input history: remember all inputs, don not remember duplicates
sheepluva
parents:
10396
diff
changeset
|
438 |
|
4465
743673c67d0c
Allow hog speech when not your turn. Currently is set to 40% opacity (could be fainter) and drawn behind the hogs instead of in front. Also allows hog targetting using a number.
nemo
parents:
4404
diff
changeset
|
439 |
t:= LocalTeam; |
4467 | 440 |
x:= 0; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
441 |
if (s[1] = '"') and (s[Length(s)] = '"') |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
442 |
then x:= 1 |
8745 | 443 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
444 |
else if (s[1] = '''') and (s[Length(s)] = '''') then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
445 |
x:= 2 |
8745 | 446 |
|
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
447 |
else if (s[1] = '-') and (s[Length(s)] = '-') then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
448 |
x:= 3; |
8745 | 449 |
|
8026
4a4f21070479
merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)
koda
parents:
7722
diff
changeset
|
450 |
if (not CurrentTeam^.ExtDriven) and (x <> 0) then |
4465
743673c67d0c
Allow hog speech when not your turn. Currently is set to 40% opacity (could be fainter) and drawn behind the hogs instead of in front. Also allows hog targetting using a number.
nemo
parents:
4404
diff
changeset
|
451 |
for c:= 0 to Pred(TeamsCount) do |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
452 |
if (TeamsArray[c] = CurrentTeam) then |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
453 |
t:= c; |
4467 | 454 |
|
455 |
if x <> 0 then |
|
2017 | 456 |
begin |
4465
743673c67d0c
Allow hog speech when not your turn. Currently is set to 40% opacity (could be fainter) and drawn behind the hogs instead of in front. Also allows hog targetting using a number.
nemo
parents:
4404
diff
changeset
|
457 |
if t = -1 then |
2111 | 458 |
ParseCommand('/say ' + copy(s, 2, Length(s)-2), true) |
459 |
else |
|
4467 | 460 |
SendHogSpeech(char(x) + char(t) + copy(s, 2, Length(s)-2)); |
2017 | 461 |
exit |
462 |
end; |
|
4467 | 463 |
|
9669 | 464 |
if (s[1] = '/') then |
2017 | 465 |
begin |
9676 | 466 |
// These 3 are same as above, only are to make the hedgehog say it on next attack |
10304
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10303
diff
changeset
|
467 |
if (copy(s, 2, 4) = 'hsa ') then |
9669 | 468 |
begin |
469 |
if CurrentTeam^.ExtDriven then |
|
470 |
ParseCommand('/say ' + copy(s, 6, Length(s)-5), true) |
|
471 |
else |
|
472 |
SendHogSpeech(#4 + copy(s, 6, Length(s)-5)); |
|
473 |
exit |
|
474 |
end; |
|
475 |
||
10304
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10303
diff
changeset
|
476 |
if (copy(s, 2, 4) = 'hta ') then |
9669 | 477 |
begin |
478 |
if CurrentTeam^.ExtDriven then |
|
479 |
ParseCommand('/say ' + copy(s, 6, Length(s)-5), true) |
|
480 |
else |
|
481 |
SendHogSpeech(#5 + copy(s, 6, Length(s)-5)); |
|
482 |
exit |
|
483 |
end; |
|
484 |
||
10304
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10303
diff
changeset
|
485 |
if (copy(s, 2, 4) = 'hya ') then |
9669 | 486 |
begin |
487 |
if CurrentTeam^.ExtDriven then |
|
488 |
ParseCommand('/say ' + copy(s, 6, Length(s)-5), true) |
|
489 |
else |
|
490 |
SendHogSpeech(#6 + copy(s, 6, Length(s)-5)); |
|
491 |
exit |
|
492 |
end; |
|
2111 | 493 |
|
10304
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10303
diff
changeset
|
494 |
if (copy(s, 2, 5) = 'team ') and (length(s) > 6) then |
9669 | 495 |
begin |
496 |
ParseCommand(s, true); |
|
497 |
exit |
|
498 |
end; |
|
499 |
||
10304
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10303
diff
changeset
|
500 |
if (copy(s, 2, 3) = 'me ') then |
9669 | 501 |
begin |
9680 | 502 |
ParseCommand('/say ' + s, true); |
503 |
exit |
|
504 |
end; |
|
2376 | 505 |
|
10514
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
506 |
if (copy(s, 2, 10) = 'togglechat') then |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
507 |
begin |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
508 |
ChatHidden:= (not ChatHidden); |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
509 |
if ChatHidden then |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
510 |
showAll:= false; |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
511 |
exit |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
512 |
end; |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
513 |
|
10304
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10303
diff
changeset
|
514 |
// debugging commands |
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10303
diff
changeset
|
515 |
if (copy(s, 2, 7) = 'debugvl') then |
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10303
diff
changeset
|
516 |
begin |
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10303
diff
changeset
|
517 |
cViewLimitsDebug:= (not cViewLimitsDebug); |
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10303
diff
changeset
|
518 |
UpdateViewLimits(); |
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10303
diff
changeset
|
519 |
exit |
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10303
diff
changeset
|
520 |
end; |
7e40820b7ed6
fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl
sheepluva
parents:
10303
diff
changeset
|
521 |
|
10312 | 522 |
if (copy(s, 2, 3) = 'lua') then |
523 |
begin |
|
524 |
AddFileLog('/lua issued'); |
|
525 |
if gameType <> gmtNet then |
|
526 |
begin |
|
527 |
liveLua:= (not liveLua); |
|
528 |
if liveLua then |
|
529 |
begin |
|
530 |
AddFileLog('[Lua] chat input string parsing enabled'); |
|
531 |
AddChatString(#3 + 'Lua parsing: ON'); |
|
532 |
end |
|
533 |
else |
|
534 |
begin |
|
535 |
AddFileLog('[Lua] chat input string parsing disabled'); |
|
536 |
AddChatString(#3 + 'Lua parsing: OFF'); |
|
537 |
end; |
|
10852
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
538 |
UpdateInputLinePrefix(); |
10312 | 539 |
end; |
540 |
exit |
|
541 |
end; |
|
542 |
||
543 |
// hedghog animations/taunts and engine commands |
|
9680 | 544 |
if (not CurrentTeam^.ExtDriven) and (CurrentTeam^.Hedgehogs[0].BotLevel = 0) then |
545 |
begin |
|
9669 | 546 |
for i:= Low(TWave) to High(TWave) do |
547 |
if (s = Wavez[i].cmd) then |
|
548 |
begin |
|
549 |
ParseCommand('/taunt ' + char(i), true); |
|
550 |
exit |
|
551 |
end; |
|
10588
6189bb1c903d
don't forbid running regular chat commands during turns of other teams. that was probably only meant for emotes to begin with
sheepluva
parents:
10514
diff
changeset
|
552 |
end; |
8152 | 553 |
|
10588
6189bb1c903d
don't forbid running regular chat commands during turns of other teams. that was probably only meant for emotes to begin with
sheepluva
parents:
10514
diff
changeset
|
554 |
for j:= Low(TChatCmd) to High(TChatCmd) do |
6189bb1c903d
don't forbid running regular chat commands during turns of other teams. that was probably only meant for emotes to begin with
sheepluva
parents:
10514
diff
changeset
|
555 |
if (s = ChatCommandz[j].ChatCmd) then |
6189bb1c903d
don't forbid running regular chat commands during turns of other teams. that was probably only meant for emotes to begin with
sheepluva
parents:
10514
diff
changeset
|
556 |
begin |
6189bb1c903d
don't forbid running regular chat commands during turns of other teams. that was probably only meant for emotes to begin with
sheepluva
parents:
10514
diff
changeset
|
557 |
ParseCommand(ChatCommandz[j].ProcedureCallChatCmd, true); |
6189bb1c903d
don't forbid running regular chat commands during turns of other teams. that was probably only meant for emotes to begin with
sheepluva
parents:
10514
diff
changeset
|
558 |
exit |
6189bb1c903d
don't forbid running regular chat commands during turns of other teams. that was probably only meant for emotes to begin with
sheepluva
parents:
10514
diff
changeset
|
559 |
end; |
10392 | 560 |
|
561 |
if (gameType = gmtNet) then |
|
562 |
SendConsoleCommand(s) |
|
2017 | 563 |
end |
10312 | 564 |
else |
565 |
begin |
|
566 |
if liveLua then |
|
567 |
LuaParseString(s) |
|
9676 | 568 |
else |
569 |
ParseCommand('/say ' + s, true); |
|
2017 | 570 |
end; |
1033 | 571 |
end; |
572 |
||
8738 | 573 |
procedure CleanupInput; |
574 |
begin |
|
575 |
FreezeEnterKey; |
|
576 |
history:= 0; |
|
9697 | 577 |
SDL_StopTextInput(); |
11356 | 578 |
//SDL_EnableKeyRepeat(0,0); |
8738 | 579 |
GameState:= gsGame; |
580 |
ResetKbd; |
|
581 |
end; |
|
582 |
||
10836 | 583 |
procedure DelBytesFromInputStrBack(endIdx: integer; count: byte); |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
584 |
var startIdx: integer; |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
585 |
begin |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
586 |
// nothing to do if count is 0 |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
587 |
if count = 0 then |
4121 | 588 |
exit; |
2376 | 589 |
|
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
590 |
// first byte to delete |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
591 |
startIdx:= endIdx - (count - 1); |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
592 |
|
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
593 |
// delete bytes from string |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
594 |
Delete(InputStr.s, startIdx, count); |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
595 |
|
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
596 |
SetLine(InputStr, InputStr.s, true); |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
597 |
end; |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
598 |
|
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
599 |
procedure MoveCursorToPreviousChar(); |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
600 |
begin |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
601 |
if cursorPos > 0 then |
10926
43612076e989
chat: simplify some code and fix bugs I noticed during testing
sheepluva
parents:
10921
diff
changeset
|
602 |
repeat |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
603 |
dec(cursorPos); |
10926
43612076e989
chat: simplify some code and fix bugs I noticed during testing
sheepluva
parents:
10921
diff
changeset
|
604 |
until ((cursorPos = 0) or IsFirstCharByte(InputStr.s[cursorPos + 1])); |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
605 |
end; |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
606 |
|
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
607 |
procedure MoveCursorToNextChar(); |
10926
43612076e989
chat: simplify some code and fix bugs I noticed during testing
sheepluva
parents:
10921
diff
changeset
|
608 |
var len: integer; |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
609 |
begin |
10926
43612076e989
chat: simplify some code and fix bugs I noticed during testing
sheepluva
parents:
10921
diff
changeset
|
610 |
len:= Length(InputStr.s); |
43612076e989
chat: simplify some code and fix bugs I noticed during testing
sheepluva
parents:
10921
diff
changeset
|
611 |
if cursorPos < len then |
43612076e989
chat: simplify some code and fix bugs I noticed during testing
sheepluva
parents:
10921
diff
changeset
|
612 |
repeat |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
613 |
inc(cursorPos); |
10926
43612076e989
chat: simplify some code and fix bugs I noticed during testing
sheepluva
parents:
10921
diff
changeset
|
614 |
until ((cursorPos = len) or IsFirstCharByte(InputStr.s[cursorPos + 1])); |
10836 | 615 |
end; |
616 |
||
10921 | 617 |
procedure DeleteLastUTF8CharFromStr(var s: shortstring); |
618 |
var l: byte; |
|
619 |
begin |
|
620 |
l:= Length(s); |
|
621 |
||
622 |
while (l > 1) and (not IsFirstCharByte(s[l])) do |
|
623 |
begin |
|
624 |
dec(l); |
|
625 |
end; |
|
626 |
||
627 |
if l > 0 then |
|
628 |
dec(l); |
|
629 |
||
630 |
s[0]:= char(l); |
|
631 |
end; |
|
632 |
||
10836 | 633 |
procedure DeleteSelected(); |
634 |
begin |
|
635 |
if (selectedPos >= 0) and (cursorPos <> selectedPos) then |
|
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
636 |
begin |
10836 | 637 |
DelBytesFromInputStrBack(max(cursorPos, selectedPos), abs(selectedPos-cursorPos)); |
638 |
cursorPos:= min(cursorPos, selectedPos); |
|
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
639 |
end; |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
640 |
ResetSelection(); |
10849
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
641 |
UpdateCursorCoords(); |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
642 |
end; |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
643 |
|
10836 | 644 |
procedure HandleSelection(enabled: boolean); |
645 |
begin |
|
646 |
if enabled then |
|
647 |
begin |
|
648 |
if selectedPos < 0 then |
|
649 |
selectedPos:= cursorPos; |
|
2017 | 650 |
end |
10836 | 651 |
else |
652 |
ResetSelection(); |
|
653 |
end; |
|
654 |
||
10844
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
655 |
type TCharSkip = ( none, wspace, numalpha, special ); |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
656 |
|
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
657 |
function GetInputCharSkipClass(index: LongInt): TCharSkip; |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
658 |
var c: char; |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
659 |
begin |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
660 |
c:= InputStr.s[index]; |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
661 |
|
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
662 |
// non-ascii counts as letter |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
663 |
if c > #127 then |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
664 |
exit(numalpha); |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
665 |
|
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
666 |
// low-ascii whitespaces and DEL |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
667 |
if (c < #33) or (c = #127) then |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
668 |
exit(wspace); |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
669 |
|
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
670 |
// low-ascii special chars |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
671 |
if c < #48 then |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
672 |
exit(special); |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
673 |
|
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
674 |
// digits |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
675 |
if c < #58 then |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
676 |
exit(numalpha); |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
677 |
|
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
678 |
// make c upper-case |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
679 |
if c > #96 then |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
680 |
c:= char(byte(c) - 32); |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
681 |
|
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
682 |
// letters |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
683 |
if (c > #64) and (c < #90) then |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
684 |
exit(numalpha); |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
685 |
|
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
686 |
// remaining ascii are special chars |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
687 |
exit(special); |
1033 | 688 |
end; |
689 |
||
10844
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
690 |
// skip from word to word, similar to Qt |
10845
1dbd50690951
quick word deletion while holding ctrl (qt style)
sheepluva
parents:
10844
diff
changeset
|
691 |
procedure SkipInputChars(skip: TCharSkip; backwards: boolean); |
10844
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
692 |
begin |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
693 |
if backwards then |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
694 |
begin |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
695 |
// skip trailing whitespace, similar to Qt |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
696 |
while (skip = wspace) and (cursorPos > 0) do |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
697 |
begin |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
698 |
skip:= GetInputCharSkipClass(cursorPos); |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
699 |
if skip = wspace then |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
700 |
MoveCursorToPreviousChar(); |
10844
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
701 |
end; |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
702 |
// skip same-type chars |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
703 |
while (cursorPos > 0) and (GetInputCharSkipClass(cursorPos) = skip) do |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
704 |
MoveCursorToPreviousChar(); |
10844
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
705 |
end |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
706 |
else |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
707 |
begin |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
708 |
// skip same-type chars |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
709 |
while cursorPos < Length(InputStr.s) do |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
710 |
begin |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
711 |
MoveCursorToNextChar(); |
10844
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
712 |
if (GetInputCharSkipClass(cursorPos) <> skip) then |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
713 |
begin |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
714 |
MoveCursorToPreviousChar(); |
10844
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
715 |
break; |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
716 |
end; |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
717 |
end; |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
718 |
// skip trailing whitespace, similar to Qt |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
719 |
while cursorPos < Length(InputStr.s) do |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
720 |
begin |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
721 |
MoveCursorToNextChar(); |
10844
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
722 |
if (GetInputCharSkipClass(cursorPos) <> wspace) then |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
723 |
begin |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
724 |
MoveCursorToPreviousChar(); |
10844
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
725 |
break; |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
726 |
end; |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
727 |
end; |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
728 |
end; |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
729 |
end; |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
730 |
|
10849
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
731 |
procedure CopyToClipboard(var newContent: shortstring); |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
732 |
begin |
11344 | 733 |
// SDL2 clipboard |
734 |
SDL_SetClipboardText(Str2PChar(newContent)); |
|
10849
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
735 |
end; |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
736 |
|
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
737 |
procedure CopySelectionToClipboard(); |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
738 |
var selection: shortstring; |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
739 |
begin |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
740 |
if selectedPos >= 0 then |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
741 |
begin |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
742 |
selection:= copy(InputStr.s, min(CursorPos, selectedPos) + 1, abs(CursorPos - selectedPos)); |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
743 |
CopyToClipboard(selection); |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
744 |
end; |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
745 |
end; |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
746 |
|
10853 | 747 |
procedure InsertIntoInputStr(s: shortstring); |
10921 | 748 |
var limit: integer; |
946 | 749 |
begin |
10921 | 750 |
// we check limit for trailing stuff before insertion limit for a reason |
751 |
// (possible remaining space after too long UTF8-insertion has been shortened) |
|
752 |
||
753 |
// length limit for stuff to that will trail the insertion |
|
754 |
limit:= max(cursorPos, MaxInputStrLen-Length(s)); |
|
755 |
||
756 |
while Length(InputStr.s) > limit do |
|
757 |
begin |
|
758 |
DeleteLastUTF8CharFromStr(InputStr.s); |
|
759 |
end; |
|
760 |
||
761 |
// length limit for stuff to insert |
|
762 |
limit:= max(0, MaxInputStrLen-cursorPos); |
|
10849
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
763 |
|
10921 | 764 |
if limit = 0 then |
765 |
s:= '' |
|
766 |
else while Length(s) > limit do |
|
767 |
begin |
|
768 |
DeleteLastUTF8CharFromStr(s); |
|
769 |
end; |
|
10851
f25dad9c3136
chat/copypaste: some adjustments and sanity checks
sheepluva
parents:
10850
diff
changeset
|
770 |
|
10921 | 771 |
if Length(s) > 0 then |
772 |
begin |
|
773 |
// insert string truncated to safe length |
|
774 |
Insert(s, InputStr.s, cursorPos + 1); |
|
10849
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
775 |
|
10921 | 776 |
if Length(InputStr.s) > MaxInputStrLen then |
777 |
InputStr.s[0]:= char(MaxInputStrLen); |
|
778 |
||
779 |
SetLine(InputStr, InputStr.s, true); |
|
780 |
||
781 |
// move cursor to end of inserted string |
|
782 |
inc(cursorPos, Length(s)); |
|
783 |
UpdateCursorCoords(); |
|
784 |
end; |
|
10849
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
785 |
end; |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
786 |
|
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
787 |
procedure PasteFromClipboard(); |
11343 | 788 |
var clip: PChar; |
10849
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
789 |
begin |
11343 | 790 |
// use SDL2 clipboard functions |
791 |
if SDL_HasClipboardText() then |
|
10850
c76ea22ea249
copy to/paste from system clipboard (via frontend)
sheepluva
parents:
10849
diff
changeset
|
792 |
begin |
11343 | 793 |
clip:= SDL_GetClipboardText(); |
794 |
// returns NULL if not enough memory for a copy of clipboard content |
|
795 |
if clip <> nil then |
|
796 |
begin |
|
797 |
InsertIntoInputStr(shortstring(clip)); |
|
798 |
SDL_free(Pointer(clip)); |
|
799 |
end; |
|
10850
c76ea22ea249
copy to/paste from system clipboard (via frontend)
sheepluva
parents:
10849
diff
changeset
|
800 |
end; |
9699
fab319c85a39
Accept SDL_TEXTINPUT events for chat (why first and only first chat invocation receives event for 't' key?)
unc0rr
parents:
9697
diff
changeset
|
801 |
end; |
fab319c85a39
Accept SDL_TEXTINPUT events for chat (why first and only first chat invocation receives event for 't' key?)
unc0rr
parents:
9697
diff
changeset
|
802 |
|
11356 | 803 |
procedure KeyPressChat(keysym: TSDL_Keysym); |
11377 | 804 |
const nonStateMask = (not (KMOD_NUM or KMOD_CAPS)); |
805 |
var i, index: integer; |
|
806 |
selMode, ctrl, ctrlonly: boolean; |
|
10844
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
807 |
skip: TCharSkip; |
11356 | 808 |
Scancode: TSDL_Scancode; |
809 |
Modifier: Word; |
|
946 | 810 |
begin |
11356 | 811 |
Scancode:= keysym.scancode; |
812 |
Modifier:= keysym.modifier; |
|
813 |
||
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
814 |
LastKeyPressTick:= RealTicks; |
10836 | 815 |
|
816 |
selMode:= (modifier and (KMOD_LSHIFT or KMOD_RSHIFT)) <> 0; |
|
817 |
ctrl:= (modifier and (KMOD_LCTRL or KMOD_RCTRL)) <> 0; |
|
11004
bd62cdbea391
chat: make sure that CTRL is the /only/ modifier key pressed when detecting ctrl+a etc
sheepluva
parents:
10985
diff
changeset
|
818 |
ctrlonly:= ctrl and ((modifier and nonStateMask and (not (KMOD_LCTRL or KMOD_RCTRL))) = 0); |
10844
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
819 |
skip:= none; |
10836 | 820 |
|
11356 | 821 |
case Scancode of |
822 |
SDL_SCANCODE_BACKSPACE: |
|
8743 | 823 |
begin |
10836 | 824 |
if selectedPos < 0 then |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2716
diff
changeset
|
825 |
begin |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
826 |
HandleSelection(true); |
10845
1dbd50690951
quick word deletion while holding ctrl (qt style)
sheepluva
parents:
10844
diff
changeset
|
827 |
|
1dbd50690951
quick word deletion while holding ctrl (qt style)
sheepluva
parents:
10844
diff
changeset
|
828 |
// delete more if ctrl is held |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
829 |
if ctrl then |
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
830 |
SkipInputChars(GetInputCharSkipClass(cursorPos), true) |
10849
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
831 |
else |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
832 |
MoveCursorToPreviousChar(); |
10849
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
833 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2716
diff
changeset
|
834 |
end; |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
835 |
|
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
836 |
DeleteSelected(); |
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
837 |
UpdateCursorCoords(); |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
838 |
end; |
11356 | 839 |
SDL_SCANCODE_DELETE: |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
840 |
begin |
10836 | 841 |
if selectedPos < 0 then |
5100 | 842 |
begin |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
843 |
HandleSelection(true); |
10845
1dbd50690951
quick word deletion while holding ctrl (qt style)
sheepluva
parents:
10844
diff
changeset
|
844 |
|
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
845 |
// delete more if ctrl is held |
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
846 |
if ctrl then |
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
847 |
SkipInputChars(GetInputCharSkipClass(cursorPos), false) |
10849
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
848 |
else |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
849 |
MoveCursorToNextChar(); |
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
850 |
|
5100 | 851 |
end; |
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
852 |
|
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
853 |
DeleteSelected(); |
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
854 |
UpdateCursorCoords(); |
8743 | 855 |
end; |
11356 | 856 |
SDL_SCANCODE_ESCAPE: |
8743 | 857 |
begin |
8745 | 858 |
if Length(InputStr.s) > 0 then |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
859 |
begin |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
860 |
SetLine(InputStr, '', true); |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
861 |
ResetCursor(); |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
862 |
end |
8743 | 863 |
else CleanupInput |
864 |
end; |
|
11356 | 865 |
SDL_SCANCODE_RETURN, SDL_SCANCODE_KP_ENTER: |
8743 | 866 |
begin |
867 |
if Length(InputStr.s) > 0 then |
|
8742
b7b8bd398c1b
Key returned 0 for arrows under linux. Sym works, clearer anyway.
nemo
parents:
8741
diff
changeset
|
868 |
begin |
8743 | 869 |
AcceptChatString(InputStr.s); |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
870 |
SetLine(InputStr, '', false); |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
871 |
ResetCursor(); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2716
diff
changeset
|
872 |
end; |
8743 | 873 |
CleanupInput |
874 |
end; |
|
11356 | 875 |
SDL_SCANCODE_UP, SDL_SCANCODE_DOWN: |
8743 | 876 |
begin |
11356 | 877 |
if (Scancode = SDL_SCANCODE_UP) and (history < localLastStr) then inc(history); |
878 |
if (Scancode = SDL_SCANCODE_DOWN) and (history > 0) then dec(history); |
|
8743 | 879 |
index:= localLastStr - history + 1; |
880 |
if (index > localLastStr) then |
|
10835
8ac09cd322b7
fix chat input history not restoring utf8-related info
sheepluva
parents:
10834
diff
changeset
|
881 |
begin |
8ac09cd322b7
fix chat input history not restoring utf8-related info
sheepluva
parents:
10834
diff
changeset
|
882 |
SetLine(InputStr, '', true); |
8ac09cd322b7
fix chat input history not restoring utf8-related info
sheepluva
parents:
10834
diff
changeset
|
883 |
end |
8ac09cd322b7
fix chat input history not restoring utf8-related info
sheepluva
parents:
10834
diff
changeset
|
884 |
else |
8ac09cd322b7
fix chat input history not restoring utf8-related info
sheepluva
parents:
10834
diff
changeset
|
885 |
begin |
8ac09cd322b7
fix chat input history not restoring utf8-related info
sheepluva
parents:
10834
diff
changeset
|
886 |
SetLine(InputStr, LocalStrs[index], true); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2716
diff
changeset
|
887 |
end; |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
888 |
cursorPos:= Length(InputStr.s); |
10836 | 889 |
ResetSelection(); |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
890 |
UpdateCursorCoords(); |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
891 |
end; |
11356 | 892 |
SDL_SCANCODE_HOME: |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
893 |
begin |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
894 |
if cursorPos > 0 then |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
895 |
begin |
10836 | 896 |
HandleSelection(selMode); |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
897 |
cursorPos:= 0; |
10846
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
898 |
end |
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
899 |
else if (not selMode) then |
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
900 |
ResetSelection(); |
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
901 |
|
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
902 |
UpdateCursorCoords(); |
8745 | 903 |
end; |
11356 | 904 |
SDL_SCANCODE_END: |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
905 |
begin |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
906 |
i:= Length(InputStr.s); |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
907 |
if cursorPos < i then |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
908 |
begin |
10836 | 909 |
HandleSelection(selMode); |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
910 |
cursorPos:= i; |
10846
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
911 |
end |
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
912 |
else if (not selMode) then |
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
913 |
ResetSelection(); |
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
914 |
|
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
915 |
UpdateCursorCoords(); |
8745 | 916 |
end; |
11356 | 917 |
SDL_SCANCODE_LEFT: |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
918 |
begin |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
919 |
if cursorPos > 0 then |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
920 |
begin |
10844
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
921 |
|
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
922 |
if ctrl then |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
923 |
skip:= GetInputCharSkipClass(cursorPos); |
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
924 |
|
10836 | 925 |
if selMode or (selectedPos < 0) then |
926 |
begin |
|
927 |
HandleSelection(selMode); |
|
928 |
// go to end of previous utf8-char |
|
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
929 |
MoveCursorToPreviousChar(); |
10836 | 930 |
end |
931 |
else // if we're leaving selection mode, jump to its left end |
|
932 |
begin |
|
933 |
cursorPos:= min(cursorPos, selectedPos); |
|
934 |
ResetSelection(); |
|
935 |
end; |
|
10844
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
936 |
|
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
937 |
if ctrl then |
10845
1dbd50690951
quick word deletion while holding ctrl (qt style)
sheepluva
parents:
10844
diff
changeset
|
938 |
SkipInputChars(skip, true); |
10844
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
939 |
|
10846
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
940 |
end |
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
941 |
else if (not selMode) then |
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
942 |
ResetSelection(); |
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
943 |
|
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
944 |
UpdateCursorCoords(); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2716
diff
changeset
|
945 |
end; |
11356 | 946 |
SDL_SCANCODE_RIGHT: |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
947 |
begin |
10836 | 948 |
if cursorPos < Length(InputStr.s) then |
949 |
begin |
|
10844
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
950 |
|
10836 | 951 |
if selMode or (selectedPos < 0) then |
952 |
begin |
|
953 |
HandleSelection(selMode); |
|
10920
11a28d22985f
different implementation for utf-8 char detection/handling
sheepluva
parents:
10919
diff
changeset
|
954 |
MoveCursorToNextChar(); |
10836 | 955 |
end |
956 |
else // if we're leaving selection mode, jump to its right end |
|
957 |
begin |
|
958 |
cursorPos:= max(cursorPos, selectedPos); |
|
959 |
ResetSelection(); |
|
960 |
end; |
|
10844
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
961 |
|
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
962 |
if ctrl then |
10845
1dbd50690951
quick word deletion while holding ctrl (qt style)
sheepluva
parents:
10844
diff
changeset
|
963 |
SkipInputChars(GetInputCharSkipClass(cursorPos), false); |
10844
953d85b7d529
holding ctrl will now make cursor skip words/etc in a fashion similar to Qt
sheepluva
parents:
10843
diff
changeset
|
964 |
|
10846
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
965 |
end |
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
966 |
else if (not selMode) then |
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
967 |
ResetSelection(); |
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
968 |
|
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
969 |
UpdateCursorCoords(); |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
970 |
end; |
11356 | 971 |
SDL_SCANCODE_PAGEUP, SDL_SCANCODE_PAGEDOWN: |
8745 | 972 |
begin |
973 |
// ignore me!!! |
|
974 |
end; |
|
11356 | 975 |
// TODO: figure out how to determine those keys better |
976 |
SDL_SCANCODE_a: |
|
10836 | 977 |
begin |
978 |
// select all |
|
11004
bd62cdbea391
chat: make sure that CTRL is the /only/ modifier key pressed when detecting ctrl+a etc
sheepluva
parents:
10985
diff
changeset
|
979 |
if ctrlonly then |
10836 | 980 |
begin |
981 |
ResetSelection(); |
|
10846
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
982 |
cursorPos:= 0; |
10836 | 983 |
HandleSelection(true); |
10846
c76fd416eff6
attempt to move cursor now removes selection even if cursor cannot actually move in the specified direction
sheepluva
parents:
10845
diff
changeset
|
984 |
cursorPos:= Length(InputStr.s); |
10836 | 985 |
UpdateCursorCoords(); |
986 |
end |
|
987 |
end; |
|
11356 | 988 |
SDL_SCANCODE_c: |
10849
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
989 |
begin |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
990 |
// copy |
11004
bd62cdbea391
chat: make sure that CTRL is the /only/ modifier key pressed when detecting ctrl+a etc
sheepluva
parents:
10985
diff
changeset
|
991 |
if ctrlonly then |
10849
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
992 |
CopySelectionToClipboard() |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
993 |
end; |
11356 | 994 |
SDL_SCANCODE_v: |
10849
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
995 |
begin |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
996 |
// paste |
11004
bd62cdbea391
chat: make sure that CTRL is the /only/ modifier key pressed when detecting ctrl+a etc
sheepluva
parents:
10985
diff
changeset
|
997 |
if ctrlonly then |
10921 | 998 |
begin |
999 |
DeleteSelected(); |
|
1000 |
PasteFromClipboard(); |
|
1001 |
end |
|
10849
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
1002 |
end; |
11356 | 1003 |
SDL_SCANCODE_x: |
10849
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
1004 |
begin |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
1005 |
// cut |
11004
bd62cdbea391
chat: make sure that CTRL is the /only/ modifier key pressed when detecting ctrl+a etc
sheepluva
parents:
10985
diff
changeset
|
1006 |
if ctrlonly then |
10849
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
1007 |
begin |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
1008 |
CopySelectionToClipboard(); |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
1009 |
DeleteSelected(); |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
1010 |
end |
a772d342066a
copy&paste (wip), currently using only a local clipboard
sheepluva
parents:
10846
diff
changeset
|
1011 |
end; |
8742
b7b8bd398c1b
Key returned 0 for arrows under linux. Sym works, clearer anyway.
nemo
parents:
8741
diff
changeset
|
1012 |
end; |
946 | 1013 |
end; |
1014 |
||
11356 | 1015 |
procedure TextInput(var event: TSDL_TextInputEvent); |
1016 |
var s: shortstring; |
|
1017 |
l: byte; |
|
11702
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1018 |
isl: integer; |
11356 | 1019 |
begin |
1020 |
DeleteSelected(); |
|
1021 |
||
1022 |
l:= 0; |
|
11702
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1023 |
// fetch all bytes of character/input |
11356 | 1024 |
while event.text[l] <> #0 do |
1025 |
begin |
|
1026 |
s[l + 1]:= event.text[l]; |
|
1027 |
inc(l) |
|
1028 |
end; |
|
1029 |
||
1030 |
if l > 0 then |
|
1031 |
begin |
|
11702
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1032 |
isl:= Length(InputStr.s); |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1033 |
// check if user is typing a redundant closing hog-speech quotation mark |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1034 |
if (l = 1) and (isl >= 2) and (cursorPos = isl - 1) and charIsForHogSpeech(s[1]) |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1035 |
and (s[1] = InputStr.s[1]) and (s[1] = InputStr.s[isl]) then |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1036 |
begin |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1037 |
MoveCursorToNextChar(); |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1038 |
UpdateCursorCoords(); |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1039 |
end |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1040 |
else |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1041 |
begin |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1042 |
// don't add input that doesn't fit |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1043 |
if isl + l > MaxInputStrLen then exit; |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1044 |
s[0]:= char(l); |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1045 |
InsertIntoInputStr(s); |
11701
fa4bc078e509
restore closing hog speech quotation marks being added automatically (lost in SDL2 transition... I think)
sheepluva
parents:
11481
diff
changeset
|
1046 |
|
11702
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1047 |
// add closing hog speech quotation marks automagically |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1048 |
if (l = 1) and (Length(InputStr.s) = 1) and charIsForHogSpeech(s[1]) then |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1049 |
begin |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1050 |
InsertIntoInputStr(s); |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1051 |
MoveCursorToPreviousChar(); |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1052 |
UpdateCursorCoords(); |
446ce60700dd
some more dark magic regarding hog speech input
sheepluva
parents:
11701
diff
changeset
|
1053 |
end; |
11701
fa4bc078e509
restore closing hog speech quotation marks being added automatically (lost in SDL2 transition... I think)
sheepluva
parents:
11481
diff
changeset
|
1054 |
end; |
fa4bc078e509
restore closing hog speech quotation marks being added automatically (lost in SDL2 transition... I think)
sheepluva
parents:
11481
diff
changeset
|
1055 |
|
11356 | 1056 |
end |
1057 |
end; |
|
1058 |
||
1059 |
||
4404 | 1060 |
procedure chChatMessage(var s: shortstring); |
1061 |
begin |
|
1062 |
AddChatString(s) |
|
1063 |
end; |
|
1064 |
||
4402 | 1065 |
procedure chSay(var s: shortstring); |
1066 |
begin |
|
1067 |
SendIPC('s' + s); |
|
1068 |
||
1069 |
if copy(s, 1, 4) = '/me ' then |
|
6453
11c578d30bd3
Countless imporvements to the parser and countless help to the parser in sources.
unc0rr
parents:
6381
diff
changeset
|
1070 |
s:= #2 + '* ' + UserNick + ' ' + copy(s, 5, Length(s) - 4) |
4402 | 1071 |
else |
1072 |
s:= #1 + UserNick + ': ' + s; |
|
1073 |
||
1074 |
AddChatString(s) |
|
1075 |
end; |
|
1076 |
||
1077 |
procedure chTeamSay(var s: shortstring); |
|
1078 |
begin |
|
1079 |
SendIPC('b' + s); |
|
1080 |
||
1081 |
s:= #4 + '[Team] ' + UserNick + ': ' + s; |
|
1082 |
||
1083 |
AddChatString(s) |
|
1084 |
end; |
|
1085 |
||
1086 |
procedure chHistory(var s: shortstring); |
|
10514
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
1087 |
var i: LongInt; |
4402 | 1088 |
begin |
1089 |
s:= s; // avoid compiler hint |
|
10514
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
1090 |
showAll:= not showAll; |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
1091 |
// immediatly recount |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
1092 |
visibleCount:= 0; |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
1093 |
if showAll or (not ChatHidden) then |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
1094 |
for i:= 0 to MaxStrIndex do |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
1095 |
begin |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
1096 |
if (Strs[i].Tex <> nil) and (showAll or (Strs[i].Time > RealTicks)) then |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
1097 |
inc(visibleCount); |
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
1098 |
end; |
4402 | 1099 |
end; |
1100 |
||
1101 |
procedure chChat(var s: shortstring); |
|
1102 |
begin |
|
1103 |
s:= s; // avoid compiler hint |
|
1104 |
GameState:= gsChat; |
|
11356 | 1105 |
SDL_StopTextInput(); |
9697 | 1106 |
SDL_StartTextInput(); |
11356 | 1107 |
//SDL_EnableKeyRepeat(200,45); |
4402 | 1108 |
if length(s) = 0 then |
5100 | 1109 |
SetLine(InputStr, '', true) |
4402 | 1110 |
else |
1111 |
begin |
|
10843 | 1112 |
SetLine(InputStr, '/team ', true); |
10841 | 1113 |
cursorPos:= 6; |
1114 |
UpdateCursorCoords(); |
|
1115 |
end; |
|
4402 | 1116 |
end; |
1117 |
||
3038 | 1118 |
procedure initModule; |
4925 | 1119 |
var i: ShortInt; |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2699
diff
changeset
|
1120 |
begin |
6898 | 1121 |
RegisterVariable('chatmsg', @chChatMessage, true); |
1122 |
RegisterVariable('say', @chSay, true); |
|
1123 |
RegisterVariable('team', @chTeamSay, true); |
|
1124 |
RegisterVariable('history', @chHistory, true ); |
|
1125 |
RegisterVariable('chat', @chChat, true ); |
|
4402 | 1126 |
|
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2699
diff
changeset
|
1127 |
lastStr:= 0; |
8740
3eb1891f81ef
use a local storage for chat history which prevents mix ups in netgame and simplifies code
koda
parents:
8739
diff
changeset
|
1128 |
localLastStr:= 0; |
8737
0d56265dd60a
implement up and down keys to navigate in the chat history, needs testing over network
koda
parents:
8736
diff
changeset
|
1129 |
history:= 0; |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2699
diff
changeset
|
1130 |
visibleCount:= 0; |
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2699
diff
changeset
|
1131 |
showAll:= false; |
3539 | 1132 |
ChatReady:= false; |
1133 |
missedCount:= 0; |
|
10312 | 1134 |
liveLua:= false; |
10514
a1423588a4e4
chat: fix some glitches, add /togglechat command for changing chat visibility
sheepluva
parents:
10513
diff
changeset
|
1135 |
ChatHidden:= false; |
10842
a039464cbb4a
since fonts can be loaded in late, update cursor position before first chat display
sheepluva
parents:
10841
diff
changeset
|
1136 |
firstDraw:= true; |
4925 | 1137 |
|
10852
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
1138 |
InputLinePrefix.Tex:= nil; |
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
1139 |
UpdateInputLinePrefix(); |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
1140 |
inputStr.s:= ''; |
4925 | 1141 |
inputStr.Tex := nil; |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
1142 |
for i:= 0 to MaxStrIndex do |
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
1143 |
Strs[i].Tex := nil; |
10834
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
1144 |
|
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
1145 |
LastKeyPressTick:= 0; |
2e83f33dfe5b
engine: moveable chat cursor. note: discovered bug that utf8 char info is lost/corrupted when input history is used
sheepluva
parents:
10737
diff
changeset
|
1146 |
ResetCursor(); |
11356 | 1147 |
SDL_StopTextInput(); |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2699
diff
changeset
|
1148 |
end; |
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2699
diff
changeset
|
1149 |
|
3038 | 1150 |
procedure freeModule; |
4901 | 1151 |
var i: ShortInt; |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2699
diff
changeset
|
1152 |
begin |
10852
9e5763cb805e
render input prefix independent of inputstr so that e.g. a username will not lead to weirdnesses
sheepluva
parents:
10851
diff
changeset
|
1153 |
FreeAndNilTexture(InputLinePrefix.Tex); |
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10588
diff
changeset
|
1154 |
FreeAndNilTexture(InputStr.Tex); |
6580
6155187bf599
A partial reformatting of the pascal code to have consistent syntax. Things that are still inconsistent.
lovelacer
parents:
6453
diff
changeset
|
1155 |
for i:= 0 to MaxStrIndex do |
10634
35d059bd0932
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo
parents:
10588
diff
changeset
|
1156 |
FreeAndNilTexture(Strs[i].Tex); |
2716
b9ca1bfca24f
complete the replacement of init/free wrappers for every unit
koda
parents:
2699
diff
changeset
|
1157 |
end; |
946 | 1158 |
|
942 | 1159 |
end. |