Few changes, and added a Makefile.

git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@91 3f818213-9676-44b0-a9b4-5e4c4e03d09d
This commit is contained in:
Wizzup? 2009-09-24 07:40:13 +00:00
parent 02dc6d6cef
commit 47bd23951b
5 changed files with 870 additions and 834 deletions

View File

@ -0,0 +1,33 @@
#$ fpc -MObjFPC -Scgi -O2 -OoREGVAR -gl -vewnhi -l -Fu../../Units/MMLCore/ -Fu../../Units/MMLAddon/ -Fu../../Units/PascalScript/ -Fu../../Units/Misc/ -Fu../../../lazarus/components/synedit/units/x86_64-linux/ -Fu../../../lazarus/ideintf/units/x86_64-linux/ -Fu../../../lazarus/lcl/units/x86_64-linux/ -Fu../../../lazarus/lcl/units/x86_64-linux/gtk2/ -Fu../../../lazarus/packager/units/x86_64-linux/ -Fu. -oSAMufasaGUI -dUseCThreads -dM_MEMORY_DEBUG -dLCL -dLCLgtk2 project1.lpr
.PHONY: default clean
#Set these ----------
platform := x86_64-linux
widgetset := gtk2
lazaruspath := /home/merlijn/Programs/lazarus
#-dUseCThreads on linux, none on windows. :)
platformdefines := -dUseCThreads
#End set there -------
CC := fpc
build := $(CC)
binary := SAMufasaGUI
flags := -MObjFPC -Scgi -O2 -OoREGVAR -gl -vewnhi -l -Fu.
defines := $(platformdefines) -dM_MEMORY_DEBUG -dLCL -dLCL$(widgetset)
units := -Fu../../Units/MMLCore/ -Fu../../Units/MMLAddon/ -Fu../../Units/PascalScript/ -Fu../../Units/Misc/
lclplatpath := $(lazaruspath)/lcl/units/$(platform)/
lazarusunits := -Fu$(lazaruspath)/components/synedit/units/x86_64-linux/ -Fu$(lazaruspath)ideintf/units/$(platform)/ -Fu$(lclplatpath) -Fu$(lclplatpath)$(widgetset)/ -Fu$(lazaruspath)/packager/units/$(platform)/
default: $(binary)
clean:
rm -f *.o *.ppu $(binary)
$(binary):
$(CC) $(flags) $(units) $(lazarusunits) -o$(binary) $(defines) project1.lpr

View File

@ -7,7 +7,7 @@
<TargetFileExt Value=""/>
<Title Value="Mufasa Stand Alone"/>
<UseXPManifest Value="True"/>
<ActiveEditorIndexAtStart Value="13"/>
<ActiveEditorIndexAtStart Value="6"/>
</General>
<VersionInfo>
<ProjectVersion Value=""/>
@ -33,7 +33,7 @@
<PackageName Value="LCL"/>
</Item2>
</RequiredPackages>
<Units Count="121">
<Units Count="122">
<Unit0>
<Filename Value="project1.lpr"/>
<IsPartOfProject Value="True"/>
@ -41,7 +41,7 @@
<CursorPos X="17" Y="12"/>
<TopLine Value="1"/>
<EditorIndex Value="0"/>
<UsageCount Value="136"/>
<UsageCount Value="139"/>
<Loaded Value="True"/>
</Unit0>
<Unit1>
@ -170,10 +170,10 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="TestUnit"/>
<CursorPos X="53" Y="131"/>
<CursorPos X="30" Y="13"/>
<TopLine Value="1"/>
<EditorIndex Value="6"/>
<UsageCount Value="102"/>
<UsageCount Value="105"/>
<Loaded Value="True"/>
</Unit18>
<Unit19>
@ -305,7 +305,7 @@
<CursorPos X="25" Y="17"/>
<TopLine Value="1"/>
<EditorIndex Value="4"/>
<UsageCount Value="101"/>
<UsageCount Value="104"/>
<Loaded Value="True"/>
</Unit37>
<Unit38>
@ -315,7 +315,7 @@
<CursorPos X="69" Y="25"/>
<TopLine Value="1"/>
<EditorIndex Value="3"/>
<UsageCount Value="101"/>
<UsageCount Value="104"/>
<Loaded Value="True"/>
</Unit38>
<Unit39>
@ -331,16 +331,16 @@
<UnitName Value="files"/>
<CursorPos X="37" Y="42"/>
<TopLine Value="271"/>
<UsageCount Value="102"/>
<UsageCount Value="105"/>
</Unit40>
<Unit41>
<Filename Value="../../Units/MMLCore/window.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="Window"/>
<CursorPos X="46" Y="79"/>
<TopLine Value="79"/>
<EditorIndex Value="9"/>
<UsageCount Value="101"/>
<CursorPos X="24" Y="84"/>
<TopLine Value="75"/>
<EditorIndex Value="10"/>
<UsageCount Value="104"/>
<Loaded Value="True"/>
</Unit41>
<Unit42>
@ -355,8 +355,8 @@
<UnitName Value="CompTypes"/>
<CursorPos X="59" Y="545"/>
<TopLine Value="524"/>
<EditorIndex Value="14"/>
<UsageCount Value="15"/>
<EditorIndex Value="15"/>
<UsageCount Value="16"/>
<Loaded Value="True"/>
</Unit43>
<Unit44>
@ -364,17 +364,17 @@
<UnitName Value="windowutil"/>
<CursorPos X="86" Y="19"/>
<TopLine Value="1"/>
<EditorIndex Value="10"/>
<UsageCount Value="33"/>
<EditorIndex Value="11"/>
<UsageCount Value="34"/>
<Loaded Value="True"/>
</Unit44>
<Unit45>
<Filename Value="../../Units/MMLCore/input.pas"/>
<UnitName Value="Input"/>
<CursorPos X="32" Y="251"/>
<TopLine Value="224"/>
<TopLine Value="220"/>
<EditorIndex Value="5"/>
<UsageCount Value="13"/>
<UsageCount Value="14"/>
<Loaded Value="True"/>
</Unit45>
<Unit46>
@ -384,7 +384,7 @@
<CursorPos X="57" Y="15"/>
<TopLine Value="2"/>
<EditorIndex Value="1"/>
<UsageCount Value="94"/>
<UsageCount Value="97"/>
<Loaded Value="True"/>
</Unit46>
<Unit47>
@ -400,7 +400,7 @@
<UnitName Value="MMLThread"/>
<CursorPos X="132" Y="5"/>
<TopLine Value="1"/>
<UsageCount Value="92"/>
<UsageCount Value="95"/>
</Unit48>
<Unit49>
<Filename Value="../../../Documents/fpc/rtl/objpas/classes/classesh.inc"/>
@ -414,8 +414,8 @@
<UnitName Value="mmlpsthread"/>
<CursorPos X="66" Y="1"/>
<TopLine Value="1"/>
<EditorIndex Value="8"/>
<UsageCount Value="90"/>
<EditorIndex Value="9"/>
<UsageCount Value="93"/>
<Loaded Value="True"/>
</Unit50>
<Unit51>
@ -545,7 +545,7 @@
<UnitName Value="bitmaps"/>
<CursorPos X="63" Y="428"/>
<TopLine Value="387"/>
<UsageCount Value="80"/>
<UsageCount Value="83"/>
</Unit69>
<Unit70>
<Filename Value="../../../FPC/FPCCheckout/packages/fcl-image/src/fpcanvas.pp"/>
@ -565,7 +565,7 @@
<IsPartOfProject Value="True"/>
<CursorPos X="30" Y="34"/>
<TopLine Value="22"/>
<UsageCount Value="79"/>
<UsageCount Value="82"/>
</Unit72>
<Unit73>
<Filename Value="../../../FPC/FPCCheckout/packages/fcl-image/src/fpcanvas.inc"/>
@ -698,7 +698,7 @@
<CursorPos X="53" Y="27"/>
<TopLine Value="9"/>
<EditorIndex Value="2"/>
<UsageCount Value="62"/>
<UsageCount Value="65"/>
<Loaded Value="True"/>
</Unit92>
<Unit93>
@ -758,7 +758,7 @@
<UnitName Value="plugins"/>
<CursorPos X="86" Y="128"/>
<TopLine Value="128"/>
<UsageCount Value="56"/>
<UsageCount Value="59"/>
</Unit101>
<Unit102>
<Filename Value="../../../Compilertje/Units/CogatUnits/compfiles.pas"/>
@ -850,7 +850,7 @@
<UnitName Value="dtm"/>
<CursorPos X="52" Y="15"/>
<TopLine Value="1"/>
<UsageCount Value="37"/>
<UsageCount Value="40"/>
</Unit115>
<Unit116>
<Filename Value="../../../cogat/Units/CogatUnits/comppicker.pas"/>
@ -863,19 +863,19 @@
<Filename Value="../../Units/MMLAddon/colourpicker.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="colourpicker"/>
<CursorPos X="1" Y="141"/>
<TopLine Value="141"/>
<CursorPos X="27" Y="34"/>
<TopLine Value="13"/>
<EditorIndex Value="7"/>
<UsageCount Value="33"/>
<UsageCount Value="36"/>
<Loaded Value="True"/>
</Unit117>
<Unit118>
<Filename Value="../../../cogat/Units/CogatUnits/compdragger.pas"/>
<UnitName Value="CompDragger"/>
<CursorPos X="62" Y="22"/>
<TopLine Value="1"/>
<EditorIndex Value="11"/>
<UsageCount Value="14"/>
<CursorPos X="101" Y="26"/>
<TopLine Value="26"/>
<EditorIndex Value="12"/>
<UsageCount Value="15"/>
<Loaded Value="True"/>
</Unit118>
<Unit119>
@ -886,142 +886,146 @@
<UnitName Value="MainForm"/>
<CursorPos X="40" Y="610"/>
<TopLine Value="589"/>
<EditorIndex Value="12"/>
<UsageCount Value="14"/>
<EditorIndex Value="13"/>
<UsageCount Value="15"/>
<Loaded Value="True"/>
</Unit119>
<Unit120>
<Filename Value="../../Units/MMLAddon/windowselector.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="windowselector"/>
<CursorPos X="1" Y="86"/>
<CursorPos X="76" Y="83"/>
<TopLine Value="65"/>
<EditorIndex Value="13"/>
<UsageCount Value="23"/>
<EditorIndex Value="14"/>
<UsageCount Value="26"/>
<Loaded Value="True"/>
</Unit120>
<Unit121>
<Filename Value="../../../../../../usr/lib64/fpc/2.2.4/source/rtl/objpas/classes/classesh.inc"/>
<CursorPos X="3" Y="319"/>
<TopLine Value="319"/>
<EditorIndex Value="8"/>
<UsageCount Value="11"/>
<Loaded Value="True"/>
</Unit121>
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<JumpHistory Count="29" HistoryIndex="28">
<Position1>
<Filename Value="../../Units/MMLAddon/colourpicker.pas"/>
<Caret Line="46" Column="3" TopLine="13"/>
<Filename Value="testunit.pas"/>
<Caret Line="49" Column="48" TopLine="49"/>
</Position1>
<Position2>
<Filename Value="../../Units/MMLAddon/colourpicker.pas"/>
<Caret Line="37" Column="7" TopLine="1"/>
<Filename Value="testunit.pas"/>
<Caret Line="118" Column="42" TopLine="88"/>
</Position2>
<Position3>
<Filename Value="../../Units/MMLAddon/colourpicker.pas"/>
<Caret Line="169" Column="8" TopLine="136"/>
<Caret Line="67" Column="6" TopLine="55"/>
</Position3>
<Position4>
<Filename Value="testunit.pas"/>
<Caret Line="101" Column="10" TopLine="73"/>
</Position4>
<Position5>
<Filename Value="testunit.pas"/>
<Caret Line="49" Column="48" TopLine="49"/>
</Position5>
<Position6>
<Filename Value="testunit.pas"/>
<Caret Line="118" Column="42" TopLine="88"/>
</Position6>
<Position7>
<Filename Value="../../Units/MMLAddon/colourpicker.pas"/>
<Caret Line="67" Column="6" TopLine="55"/>
</Position7>
<Position8>
<Filename Value="../../Units/MMLAddon/colourpicker.pas"/>
<Caret Line="27" Column="24" TopLine="8"/>
</Position4>
<Position5>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="193" Column="17" TopLine="174"/>
</Position5>
<Position6>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="205" Column="16" TopLine="174"/>
</Position6>
<Position7>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="270" Column="16" TopLine="251"/>
</Position7>
<Position8>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="271" Column="16" TopLine="251"/>
</Position8>
<Position9>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="193" Column="17" TopLine="174"/>
<Caret Line="279" Column="16" TopLine="251"/>
</Position9>
<Position10>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="205" Column="16" TopLine="174"/>
<Caret Line="125" Column="11" TopLine="109"/>
</Position10>
<Position11>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="270" Column="16" TopLine="251"/>
<Filename Value="../../../cogat/Units/CogatUnits/comptypes.pas"/>
<Caret Line="32" Column="75" TopLine="9"/>
</Position11>
<Position12>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="271" Column="16" TopLine="251"/>
<Filename Value="../../../cogat/mainform.pas"/>
<Caret Line="15" Column="66" TopLine="1"/>
</Position12>
<Position13>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="279" Column="16" TopLine="251"/>
<Caret Line="5" Column="100" TopLine="1"/>
</Position13>
<Position14>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="125" Column="11" TopLine="109"/>
<Caret Line="39" Column="32" TopLine="20"/>
</Position14>
<Position15>
<Filename Value="../../../cogat/Units/CogatUnits/comptypes.pas"/>
<Caret Line="32" Column="75" TopLine="9"/>
<Filename Value="../../Units/MMLAddon/windowselector.pas"/>
<Caret Line="54" Column="26" TopLine="16"/>
</Position15>
<Position16>
<Filename Value="../../../cogat/mainform.pas"/>
<Caret Line="15" Column="66" TopLine="1"/>
<Filename Value="../../Units/MMLCore/windowutil.pas"/>
<Caret Line="119" Column="75" TopLine="92"/>
</Position16>
<Position17>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="5" Column="100" TopLine="1"/>
<Filename Value="../../Units/MMLAddon/windowselector.pas"/>
<Caret Line="40" Column="26" TopLine="25"/>
</Position17>
<Position18>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="39" Column="32" TopLine="20"/>
<Filename Value="testunit.pas"/>
<Caret Line="96" Column="43" TopLine="85"/>
</Position18>
<Position19>
<Filename Value="../../Units/MMLAddon/windowselector.pas"/>
<Caret Line="54" Column="26" TopLine="16"/>
<Caret Line="77" Column="14" TopLine="49"/>
</Position19>
<Position20>
<Filename Value="../../Units/MMLCore/windowutil.pas"/>
<Caret Line="119" Column="75" TopLine="92"/>
<Filename Value="../../Units/MMLAddon/windowselector.pas"/>
<Caret Line="11" Column="29" TopLine="1"/>
</Position20>
<Position21>
<Filename Value="../../Units/MMLAddon/windowselector.pas"/>
<Caret Line="40" Column="26" TopLine="25"/>
<Caret Line="9" Column="10" TopLine="1"/>
</Position21>
<Position22>
<Filename Value="testunit.pas"/>
<Caret Line="96" Column="43" TopLine="85"/>
<Caret Line="52" Column="43" TopLine="52"/>
</Position22>
<Position23>
<Filename Value="../../Units/MMLAddon/windowselector.pas"/>
<Caret Line="77" Column="14" TopLine="49"/>
<Filename Value="testunit.pas"/>
<Caret Line="54" Column="45" TopLine="54"/>
</Position23>
<Position24>
<Filename Value="../../Units/MMLAddon/windowselector.pas"/>
<Caret Line="11" Column="29" TopLine="1"/>
<Caret Line="72" Column="74" TopLine="59"/>
</Position24>
<Position25>
<Filename Value="../../Units/MMLAddon/windowselector.pas"/>
<Caret Line="9" Column="10" TopLine="1"/>
</Position25>
<Position26>
<Filename Value="testunit.pas"/>
<Caret Line="52" Column="43" TopLine="52"/>
</Position26>
<Position27>
<Filename Value="testunit.pas"/>
<Caret Line="54" Column="45" TopLine="54"/>
</Position27>
<Position28>
<Filename Value="../../Units/MMLAddon/windowselector.pas"/>
<Caret Line="72" Column="74" TopLine="59"/>
</Position28>
<Position29>
<Filename Value="../../Units/MMLCore/client.pas"/>
<Caret Line="17" Column="25" TopLine="1"/>
</Position29>
<Position30>
</Position25>
<Position26>
<Filename Value="../../Units/MMLAddon/windowselector.pas"/>
<Caret Line="79" Column="32" TopLine="65"/>
</Position30>
</Position26>
<Position27>
<Filename Value="../../Units/MMLAddon/colourpicker.pas"/>
<Caret Line="56" Column="47" TopLine="37"/>
</Position27>
<Position28>
<Filename Value="../../Units/MMLAddon/colourpicker.pas"/>
<Caret Line="74" Column="19" TopLine="49"/>
</Position28>
<Position29>
<Filename Value="../../Units/MMLAddon/colourpicker.pas"/>
<Caret Line="34" Column="27" TopLine="13"/>
</Position29>
</JumpHistory>
</ProjectOptions>
<CompilerOptions>
@ -1043,6 +1047,7 @@
<CustomOptions Value="-dUseCThreads
-dM_MEMORY_DEBUG"/>
<CompilerPath Value="$(CompPath)"/>
<CreateMakefileOnBuild Value="True"/>
</Other>
</CompilerOptions>
<Debugging>

View File

@ -1,11 +1,11 @@
object Form1: TForm1
Left = 400
Left = 796
Height = 541
Top = 129
Top = 165
Width = 763
ActiveControl = SynEdit1
Caption = 'Mufasa v2'
ClientHeight = 521
ClientHeight = 516
ClientWidth = 763
Menu = MainMenu1
OnCreate = FormCreate
@ -25,7 +25,6 @@ object Form1: TForm1
ParentColor = False
ParentFont = False
TabOrder = 0
BookMarkOptions.OnChange = nil
Gutter.Width = 57
Gutter.MouseActions = <
item

File diff suppressed because it is too large Load Diff

View File

@ -23,7 +23,7 @@ type
constructor Create(aWindow: TMWindow);
destructor Destroy; override;
procedure Pick(Var C, X, Y: Integer);
procedure Pick(Out C, X, Y: Integer);
procedure ImageMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer );
procedure TimorTimer(Sender: TObject);
@ -64,7 +64,7 @@ begin
end;
procedure TMColorPicker.Pick(Var C, X, Y: Integer);
procedure TMColorPicker.Pick(Out C, X, Y: Integer);
var
w, h: integer;
bmp: TBitmap;