moparisthebest/Simba
1
0
Fork 0
mirror of https://github.com/moparisthebest/Simba synced 2024-11-15 13:55:08 -05:00
Code Issues Releases Wiki Activity

Compiler Option added:

Browse Source 
-dM_MEMORY_DEBUG
Set Output name to "SAMufasaGUI"




git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@30 3f818213-9676-44b0-a9b4-5e4c4e03d09d
This commit is contained in:
Wizzup? 2009-09-04 19:18:13 +00:00
parent a12df46efc
commit 1ade9de27b
5 changed files with 121 additions and 5300 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
Projects/SAMufasaGUI/project1.lpi
View File

@ -5,13 +5,13 @@
<General> <General>
<MainUnit Value="0"/> <MainUnit Value="0"/>
<TargetFileExt Value=""/> <TargetFileExt Value=""/>
<Title Value="Mufasa Stand Alone"/>
<Icon Value="0"/>
<UseXPManifest Value="True"/> <UseXPManifest Value="True"/>
<ActiveEditorIndexAtStart Value="1"/> <ActiveEditorIndexAtStart Value="1"/>
</General> </General>
<VersionInfo> <VersionInfo>
<ProjectVersion Value=""/> <ProjectVersion Value=""/>
<Language Value=""/>
<CharSet Value=""/>
</VersionInfo> </VersionInfo>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
@ -35,10 +35,10 @@
<Filename Value="project1.lpr"/> <Filename Value="project1.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="project1"/> <UnitName Value="project1"/>
<CursorPos X="41" Y="17"/> <CursorPos X="43" Y="15"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="0"/> <EditorIndex Value="0"/>
<UsageCount Value="59"/> <UsageCount Value="60"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
@ -167,10 +167,10 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="TestUnit"/> <UnitName Value="TestUnit"/>
<CursorPos X="22" Y="124"/> <CursorPos X="1" Y="45"/>
<TopLine Value="111"/> <TopLine Value="41"/>
<EditorIndex Value="1"/> <EditorIndex Value="1"/>
<UsageCount Value="25"/> <UsageCount Value="26"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit18> </Unit18>
<Unit19> <Unit19>
@ -302,7 +302,7 @@
<CursorPos X="91" Y="24"/> <CursorPos X="91" Y="24"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="3"/> <EditorIndex Value="3"/>
<UsageCount Value="24"/> <UsageCount Value="25"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit37> </Unit37>
<Unit38> <Unit38>
@ -312,7 +312,7 @@
<CursorPos X="3" Y="16"/> <CursorPos X="3" Y="16"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="2"/> <EditorIndex Value="2"/>
<UsageCount Value="24"/> <UsageCount Value="25"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit38> </Unit38>
<Unit39> <Unit39>
@ -321,7 +321,7 @@
<CursorPos X="18" Y="8"/> <CursorPos X="18" Y="8"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="7"/> <EditorIndex Value="7"/>
<UsageCount Value="21"/> <UsageCount Value="22"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit39> </Unit39>
<Unit40> <Unit40>
@ -331,17 +331,17 @@
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="6"/> <EditorIndex Value="6"/>
<UsageCount Value="25"/> <UsageCount Value="26"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit40> </Unit40>
<Unit41> <Unit41>
<Filename Value="../../Units/MMLCore/window.pas"/> <Filename Value="../../Units/MMLCore/window.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="Window"/> <UnitName Value="Window"/>
<CursorPos X="10" Y="106"/> <CursorPos X="35" Y="227"/>
<TopLine Value="91"/> <TopLine Value="196"/>
<EditorIndex Value="4"/> <EditorIndex Value="4"/>
<UsageCount Value="24"/> <UsageCount Value="25"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit41> </Unit41>
<Unit42> <Unit42>
@ -357,7 +357,7 @@
<CursorPos X="80" Y="9"/> <CursorPos X="80" Y="9"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="8"/> <EditorIndex Value="8"/>
<UsageCount Value="11"/> <UsageCount Value="12"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit43> </Unit43>
<Unit44> <Unit44>
@ -366,141 +366,141 @@
<CursorPos X="35" Y="109"/> <CursorPos X="35" Y="109"/>
<TopLine Value="80"/> <TopLine Value="80"/>
<EditorIndex Value="5"/> <EditorIndex Value="5"/>
<UsageCount Value="10"/> <UsageCount Value="11"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit44> </Unit44>
</Units> </Units>
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="29" HistoryIndex="28">
<Position1> <Position1>
<Filename Value="../../Units/MMLCore/files.pas"/> <Filename Value="../../Units/MMLCore/files.pas"/>
<Caret Line="36" Column="27" TopLine="31"/> <Caret Line="41" Column="46" TopLine="31"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="../../Units/MMLCore/files.pas"/> <Filename Value="../../Units/MMLCore/files.pas"/>
<Caret Line="41" Column="46" TopLine="31"/> <Caret Line="463" Column="34" TopLine="448"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="../../Units/MMLCore/files.pas"/> <Filename Value="../../Units/MMLCore/files.pas"/>
<Caret Line="463" Column="34" TopLine="448"/> <Caret Line="34" Column="12" TopLine="30"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="../../Units/MMLCore/files.pas"/> <Filename Value="../../Units/MMLCore/files.pas"/>
<Caret Line="34" Column="12" TopLine="30"/> <Caret Line="46" Column="19" TopLine="31"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="../../Units/MMLCore/files.pas"/> <Filename Value="../../Units/MMLCore/files.pas"/>
<Caret Line="46" Column="19" TopLine="31"/> <Caret Line="72" Column="19" TopLine="50"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="../../Units/MMLCore/files.pas"/> <Filename Value="../../Units/MMLCore/files.pas"/>
<Caret Line="72" Column="19" TopLine="50"/> <Caret Line="37" Column="11" TopLine="21"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="../../Units/MMLCore/files.pas"/> <Filename Value="../../Units/MMLCore/files.pas"/>
<Caret Line="37" Column="11" TopLine="21"/> <Caret Line="38" Column="96" TopLine="28"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="../../Units/MMLCore/files.pas"/> <Filename Value="../../Units/MMLCore/files.pas"/>
<Caret Line="38" Column="96" TopLine="28"/> <Caret Line="417" Column="42" TopLine="402"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="../../Units/MMLCore/files.pas"/> <Filename Value="../../Units/MMLCore/files.pas"/>
<Caret Line="417" Column="42" TopLine="402"/> <Caret Line="449" Column="1" TopLine="431"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="../../Units/MMLCore/files.pas"/>
<Caret Line="449" Column="1" TopLine="431"/>
</Position10>
<Position11>
<Filename Value="../../Units/MMLCore/client.pas"/> <Filename Value="../../Units/MMLCore/client.pas"/>
<Caret Line="37" Column="18" TopLine="12"/> <Caret Line="37" Column="18" TopLine="12"/>
</Position11> </Position10>
<Position12> <Position11>
<Filename Value="../../Units/MMLCore/files.pas"/> <Filename Value="../../Units/MMLCore/files.pas"/>
<Caret Line="20" Column="29" TopLine="11"/> <Caret Line="20" Column="29" TopLine="11"/>
</Position11>
<Position12>
<Filename Value="testunit.pas"/>
<Caret Line="211" Column="1" TopLine="182"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="testunit.pas"/> <Filename Value="testunit.pas"/>
<Caret Line="211" Column="1" TopLine="182"/> <Caret Line="154" Column="49" TopLine="140"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="testunit.pas"/> <Filename Value="testunit.pas"/>
<Caret Line="154" Column="49" TopLine="140"/> <Caret Line="155" Column="8" TopLine="140"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="testunit.pas"/> <Filename Value="testunit.pas"/>
<Caret Line="155" Column="8" TopLine="140"/> <Caret Line="160" Column="23" TopLine="145"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="testunit.pas"/>
<Caret Line="160" Column="23" TopLine="145"/>
</Position16>
<Position17>
<Filename Value="../../../cogat/Units/CogatUnits/compfiles.pas"/> <Filename Value="../../../cogat/Units/CogatUnits/compfiles.pas"/>
<Caret Line="8" Column="18" TopLine="1"/> <Caret Line="8" Column="18" TopLine="1"/>
</Position16>
<Position17>
<Filename Value="testunit.pas"/>
<Caret Line="29" Column="14" TopLine="11"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="testunit.pas"/> <Filename Value="testunit.pas"/>
<Caret Line="29" Column="14" TopLine="11"/> <Caret Line="161" Column="39" TopLine="146"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="testunit.pas"/> <Filename Value="testunit.pas"/>
<Caret Line="161" Column="39" TopLine="146"/> <Caret Line="29" Column="20" TopLine="16"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="testunit.pas"/> <Filename Value="testunit.pas"/>
<Caret Line="29" Column="20" TopLine="16"/> <Caret Line="51" Column="14" TopLine="46"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="testunit.pas"/> <Filename Value="testunit.pas"/>
<Caret Line="51" Column="14" TopLine="46"/> <Caret Line="54" Column="17" TopLine="48"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="testunit.pas"/>
<Caret Line="54" Column="17" TopLine="48"/>
</Position22>
<Position23>
<Filename Value="../../Units/MMLCore/client.pas"/> <Filename Value="../../Units/MMLCore/client.pas"/>
<Caret Line="31" Column="71" TopLine="14"/> <Caret Line="31" Column="71" TopLine="14"/>
</Position23> </Position22>
<Position24> <Position23>
<Filename Value="testunit.pas"/> <Filename Value="testunit.pas"/>
<Caret Line="137" Column="62" TopLine="121"/> <Caret Line="137" Column="62" TopLine="121"/>
</Position23>
<Position24>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="157" Column="52" TopLine="141"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="../../Units/MMLCore/window.pas"/> <Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="157" Column="52" TopLine="141"/> <Caret Line="232" Column="59" TopLine="217"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="../../Units/MMLCore/window.pas"/> <Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="232" Column="59" TopLine="217"/> <Caret Line="236" Column="29" TopLine="217"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="236" Column="29" TopLine="217"/>
</Position27>
<Position28>
<Filename Value="../../Units/MMLCore/client.pas"/> <Filename Value="../../Units/MMLCore/client.pas"/>
<Caret Line="1" Column="1" TopLine="1"/> <Caret Line="1" Column="1" TopLine="1"/>
</Position28> </Position27>
<Position29> <Position28>
<Filename Value="../../Units/MMLCore/window.pas"/> <Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="106" Column="10" TopLine="91"/> <Caret Line="106" Column="10" TopLine="91"/>
</Position29> </Position28>
<Position30> <Position29>
<Filename Value="../../Units/MMLCore/windowutil.pas"/> <Filename Value="../../Units/MMLCore/windowutil.pas"/>
<Caret Line="21" Column="37" TopLine="1"/> <Caret Line="21" Column="37" TopLine="1"/>
</Position30> </Position29>
</JumpHistory> </JumpHistory>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="8"/> <Version Value="8"/>
<Target>
<Filename Value="SAMufasaGUI"/>
</Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)/"/> <IncludeFiles Value="$(ProjOutDir)/"/>
<OtherUnitFiles Value="$(ProjPath)../../Units/MMLCore/"/> <OtherUnitFiles Value="$(ProjPath)../../Units/MMLCore/"/>
</SearchPaths> </SearchPaths>
<Other> <Other>
<CustomOptions Value="-dUseCThreads"/> <CustomOptions Value="-dUseCThreads
-dM_MEMORY_DEBUG"/>
<CompilerPath Value="$(CompPath)"/> <CompilerPath Value="$(CompPath)"/>
</Other> </Other>
</CompilerOptions> </CompilerOptions>

1
Projects/SAMufasaGUI/project1.lpr
View File

@ -12,6 +12,7 @@ uses
{$IFDEF WINDOWS}{$R project1.rc}{$ENDIF} {$IFDEF WINDOWS}{$R project1.rc}{$ENDIF}
begin begin
Application.Title:='Mufasa Stand Alone';
{$I project1.lrs} {$I project1.lrs}
Application.Initialize; Application.Initialize;
Application.CreateForm(TForm1, Form1); Application.CreateForm(TForm1, Form1);

5272
Projects/SAMufasaGUI/project1.lrs
View File

File diff suppressed because it is too large Load Diff

13
Projects/SAMufasaGUI/testunit.pas
View File

@ -42,18 +42,25 @@ type
end; end;
procedure TMyThread.Execute; procedure TMyThread.Execute;
Const
TestPath = 'c:/test';
Const
fsFromBeginning = 0; // offset must be pos or 0 fsFromBeginning = 0; // offset must be pos or 0
fsFromCurrent = 1; // offset pos or neg fsFromCurrent = 1; // offset pos or neg
fsFromEnd = 2; // offset only neg or 0 fsFromEnd = 2; // offset only neg or 0
// put somewhese else // put somewhese else
{$IFDEF MSWINDOWS}
TestPath = 'c:/test';
DirectorySeperator = '\'; DirectorySeperator = '\';
DS = '\'; DS = '\';
ExeExt = '.exe'; ExeExt = '.exe';
{$ENDIF}
{$IFDEF LINUX}
TestPath = '/tmp/test';
DirectorySeperator = '/';
DS = '/';
ExeExt = '';
{$ENDIF}
Var Var
Client: TClient; Client: TClient;
w,h, x, y, xx, yy, i:integer; w,h, x, y, xx, yy, i:integer;

9
Units/MMLCore/window.pas
View File

@ -126,6 +126,7 @@ begin
{$ENDIF} {$ENDIF}
{$IFDEF LINUX} {$IFDEF LINUX}
Self.XImageFreed:=True;
Self.TargetMode := w_XWindow; Self.TargetMode := w_XWindow;
Self.XDisplay := XOpenDisplay(nil); Self.XDisplay := XOpenDisplay(nil);
@ -197,6 +198,7 @@ begin
WriteLn(IntToStr(Self.XWindowImage^.width) + ', ' + IntToStr(Self.XWindowImage^.height)); WriteLn(IntToStr(Self.XWindowImage^.width) + ', ' + IntToStr(Self.XWindowImage^.height));
Result.Ptr := PRGB32(Self.XWindowImage^.data); Result.Ptr := PRGB32(Self.XWindowImage^.data);
Result.IncPtrWith := 0; Result.IncPtrWith := 0;
Self.XImageFreed:=False;
XSetErrorHandler(Old_Handler); XSetErrorHandler(Old_Handler);
{$ELSE} {$ELSE}
@ -222,10 +224,14 @@ begin
exit; exit;
end; end;
{$IFDEF LINUX} {$IFDEF LINUX}
if not Self.XImageFreed then
begin
Self.XImageFreed:=True;
if(QWord(Self.XWindowImage) <> 0) then // 0, nil? if(QWord(Self.XWindowImage) <> 0) then // 0, nil?
begin begin
XDestroyImage(Self.XWindowImage); XDestroyImage(Self.XWindowImage);
end; end;
end;
{$ENDIF} {$ENDIF}
end; end;
@ -426,6 +432,9 @@ end;
} }
function TMWindow.SetTarget(ArrPtr: PRGB32; Size: TPoint): integer; overload; function TMWindow.SetTarget(ArrPtr: PRGB32; Size: TPoint): integer; overload;
begin begin
If Self.TargetMode = w_XWindow then
Self.FreeReturnData;
Self.ArrayPtr := ArrPtr; Self.ArrayPtr := ArrPtr;
Self.ArraySize := Size; Self.ArraySize := Size;
Self.TargetMode:= w_ArrayPtr; Self.TargetMode:= w_ArrayPtr;