hedgewars-draft: comparison hedgewars/uConsole.pas

equal deleted inserted replaced

-:b203147d91b5
+:ac538f1a629e
 procedure doPut(putX, putY: LongInt; fromAI: boolean);
 implementation
 {$J+}
 uses uMisc, uStore, Types, uConsts, uGears, uTeams, uIO, uKeys, uWorld, uLand,
-uRandom, uAmmos, uTriggers;
+uRandom, uAmmos, uTriggers, GL;
 const cLineWidth: LongInt = 0;
 cLinesCount = 256;
 type  PVariable = ^TVariable;
 TVariable = record
 Name: string[15];
 VType: TVariableType;
 Handler: pointer;
 Trusted: boolean;
 end;
+TTextLine = record
-var   ConsoleLines: array[byte] of ShortString;
+s: shortstring;
+tex: PTexture;
+updatetex: boolean;
+end;
+var   ConsoleLines: array[byte] of TTextLine;
 CurrLine: LongInt = 0;
-InputStr: shortstring;
+InputStr: TTextLine;
 Variables: PVariable = nil;
+procedure SetLine(var tl: TTextLine; str: shortstring);
+begin
+with tl do
+begin
+s:= str;
+if tex <> nil then FreeTexture(tex);
+updatetex:= true
+end
+end;
 function RegisterVariable(Name: string; VType: TVariableType; p: pointer; Trusted: boolean): PVariable;
 var Result: PVariable;
 begin
 New(Result);
 end else b:= '';
 end;
 procedure DrawConsole(Surface: PSDL_Surface);
 var x, y: LongInt;
-r: TSDL_Rect;
-begin
+procedure DrawLine(var tl: TTextLine; X, Y: LongInt);
-with r do
+begin
-begin
+with tl do
-x:= 0;
+begin
-y:= cConsoleHeight;
+if updatetex then
-w:= cScreenWidth;
+begin
-h:= 4;
+if s[0] <> #0 then tex:= RenderStringTex(s, $FFFFFF, fnt16)
-end;
+else tex:= nil;
-//SDL_FillRect(Surface, @r, cConsoleSplitterColor);
+updatetex:= false
+end;
+if tex <> nil then
+DrawTexture(X, Y, tex);
+end
+end;
+begin
+glEnable(GL_TEXTURE_2D);
 for y:= 0 to cConsoleHeight div 256 + 1 do
 for x:= 0 to cScreenWidth div 256 + 1 do
 DrawSprite(sprConsoleBG, x * 256, cConsoleHeight - 256 - y * 256, 0, Surface);
 for y:= 0 to cConsoleHeight div Fontz[fnt16].Height do
-//DXOutText(4, cConsoleHeight - (y + 2) * (Fontz[fnt16].Height + 2), fnt16, ConsoleLines[(CurrLine - 1 - y + cLinesCount) mod cLinesCount], Surface);
+DrawLine(ConsoleLines[(CurrLine - 1 - y + cLinesCount) mod cLinesCount], 4, cConsoleHeight - (y + 2) * (Fontz[fnt16].Height + 2));
-//DXOutText(4, cConsoleHeight - Fontz[fnt16].Height - 2, fnt16, '> '+InputStr, Surface);
+DrawLine(InputStr, 4, cConsoleHeight - Fontz[fnt16].Height - 2);
+glDisable(GL_TEXTURE_2D);
 end;
 procedure WriteToConsole(s: shortstring);
 var Len: LongInt;
 begin
 {$IFDEF DEBUGFILE}AddFileLog('Console write: ' + s);{$ENDIF}
 Write(s);
 repeat
-Len:= cLineWidth - Length(ConsoleLines[CurrLine]);
+Len:= cLineWidth - Length(ConsoleLines[CurrLine].s);
-ConsoleLines[CurrLine]:= ConsoleLines[CurrLine] + copy(s, 1, Len);
+SetLine(ConsoleLines[CurrLine], ConsoleLines[CurrLine].s + copy(s, 1, Len));
 Delete(s, 1, Len);
-if byte(ConsoleLines[CurrLine][0])=cLineWidth then
+if byte(ConsoleLines[CurrLine].s[0]) = cLineWidth then
 begin
 inc(CurrLine);
 if CurrLine = cLinesCount then CurrLine:= 0;
-PLongWord(@ConsoleLines[CurrLine])^:= 0
+PByte(@ConsoleLines[CurrLine].s)^:= 0
 end;
 until Length(s) = 0
 end;
 procedure WriteLnToConsole(s: shortstring);
 begin
 WriteToConsole(s);
 WriteLn;
 inc(CurrLine);
 if CurrLine = cLinesCount then CurrLine:= 0;
-PLongWord(@ConsoleLines[CurrLine])^:= 0
+PByte(@ConsoleLines[CurrLine].s)^:= 0
 end;
 procedure InitConsole;
 var i: LongInt;
 begin
 cLineWidth:= cScreenWidth div 10;
 if cLineWidth > 255 then cLineWidth:= 255;
-for i:= 0 to Pred(cLinesCount) do PLongWord(@ConsoleLines[i])^:= 0
+for i:= 0 to Pred(cLinesCount) do PByte(@ConsoleLines[i])^:= 0
 end;
 procedure ParseCommand(CmdStr: shortstring; TrustedSource: boolean);
 type PhwFloat = ^hwFloat;
 var ii: LongInt;
 procedure AutoComplete;
 var t: PVariable;
 c: char;
 begin
-if InputStr[0] = #0 then exit;
+if InputStr.s[0] = #0 then exit;
-c:= InputStr[1];
+c:= InputStr.s[1];
-if c in ['/', '$'] then Delete(InputStr, 1, 1)
+if c in ['/', '$'] then Delete(InputStr.s, 1, 1)
 else c:= #0;
-if InputStr[byte(InputStr[0])] = #32 then dec(InputStr[0]);
+if InputStr.s[byte(InputStr.s[0])] = #32 then dec(InputStr.s[0]);
 t:= Variables;
 while t <> nil do
 begin
 if (c=#0) or ((t^.VType =  vtCommand) and (c='/'))or
 ((t^.VType <> vtCommand) and (c='$'))then
-if copy(t^.Name, 1, Length(InputStr)) = InputStr then
+if copy(t^.Name, 1, Length(InputStr.s)) = InputStr.s then
 begin
-if t^.VType = vtCommand then InputStr:= '/' + t^.Name + ' '
+if t^.VType = vtCommand then InputStr.s:= '/' + t^.Name + ' '
-else InputStr:= '$' + t^.Name + ' ';
+else InputStr.s:= '$' + t^.Name + ' ';
 exit
 end;
 t:= t^.Next
 end
 end;
 var i, btw: integer;
 utf8: shortstring;
 begin
 if Key <> 0 then
 case Key of
-8: if Length(InputStr)>0 then dec(InputStr[0]);
+8: if Length(InputStr.s)>0 then dec(InputStr.s[0]);
 9: AutoComplete;
 13,271: begin
-if InputStr[1] in ['/', '$'] then
+if InputStr.s[1] in ['/', '$'] then
-ParseCommand(InputStr, false)
+ParseCommand(InputStr.s, false)
 else
-ParseCommand('/say ' + InputStr, false);
+ParseCommand('/say ' + InputStr.s, false);
-InputStr:= ''
+InputStr.s:= ''
 end
 else
 if (Key < $80) then btw:= 1
 else if (Key < $800) then btw:= 2
 else if (Key < $10000) then btw:= 3
 begin
 utf8:= char((Key or $80) and $BF) + utf8;
 Key:= Key shr 6
 end;
 utf8:= char(Key or firstByteMark[btw]) + utf8;
-InputStr:= InputStr + utf8
+SetLine(InputStr, InputStr.s + utf8)
 end
 end;
 function GetLastConsoleLine: shortstring;
 begin
-if CurrLine = 0 then GetLastConsoleLine:= ConsoleLines[Pred(cLinesCount)]
+if CurrLine = 0 then GetLastConsoleLine:= ConsoleLines[Pred(cLinesCount)].s
-else GetLastConsoleLine:= ConsoleLines[Pred(CurrLine)]
+else GetLastConsoleLine:= ConsoleLines[Pred(CurrLine)].s
 end;
 {$INCLUDE CCHandlers.inc}
 initialization

changeset 785	ac538f1a629e
parent 783	4f59db6f147d
child 786	346c886bca7b