moparisthebest/Simba
1
0
Fork 0
mirror of https://github.com/moparisthebest/Simba synced 2025-03-03 02:41:54 -05:00
Code Issues Releases Wiki Activity

Mouse is now non-silent by default on Linux. This ensures all events are send. Silent wasn't 100% accurate when the client wasn't "activated".

Browse Source 
git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@198 3f818213-9676-44b0-a9b4-5e4c4e03d09d
This commit is contained in:
Wizzup? 2009-11-07 01:57:38 +00:00
parent 2e8c2da42e
commit 00755e9fdd
5 changed files with 308 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
Projects/MufasaTests/project1.lpi
View File

@ -11,7 +11,7 @@
<TargetFileExt Value=""/> <TargetFileExt Value=""/>
<Icon Value="0"/> <Icon Value="0"/>
<UseXPManifest Value="True"/> <UseXPManifest Value="True"/>
<ActiveEditorIndexAtStart Value="0"/> <ActiveEditorIndexAtStart Value="1"/>
</General> </General>
<VersionInfo> <VersionInfo>
<ProjectVersion Value=""/> <ProjectVersion Value=""/>
@ -35,8 +35,8 @@
<Filename Value="project1.lpr"/> <Filename Value="project1.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="project1"/> <UnitName Value="project1"/>
<CursorPos X="63" Y="83"/> <CursorPos X="1" Y="95"/>
<TopLine Value="71"/> <TopLine Value="73"/>
<EditorIndex Value="0"/> <EditorIndex Value="0"/>
<UsageCount Value="38"/> <UsageCount Value="38"/>
<Loaded Value="True"/> <Loaded Value="True"/>
@ -53,7 +53,7 @@
<UnitName Value="Client"/> <UnitName Value="Client"/>
<CursorPos X="40" Y="5"/> <CursorPos X="40" Y="5"/>
<TopLine Value="5"/> <TopLine Value="5"/>
<EditorIndex Value="1"/> <EditorIndex Value="2"/>
<UsageCount Value="14"/> <UsageCount Value="14"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit2> </Unit2>
@ -69,7 +69,7 @@
<UnitName Value="Window"/> <UnitName Value="Window"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="5"/> <EditorIndex Value="6"/>
<UsageCount Value="13"/> <UsageCount Value="13"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit4> </Unit4>
@ -90,16 +90,18 @@
<Unit7> <Unit7>
<Filename Value="../../Units/MMLCore/input.pas"/> <Filename Value="../../Units/MMLCore/input.pas"/>
<UnitName Value="Input"/> <UnitName Value="Input"/>
<CursorPos X="20" Y="35"/> <CursorPos X="78" Y="314"/>
<TopLine Value="22"/> <TopLine Value="296"/>
<EditorIndex Value="1"/>
<UsageCount Value="13"/> <UsageCount Value="13"/>
<Loaded Value="True"/>
</Unit7> </Unit7>
<Unit8> <Unit8>
<Filename Value="../../Units/MMLCore/mufasatypes.pas"/> <Filename Value="../../Units/MMLCore/mufasatypes.pas"/>
<UnitName Value="MufasaTypes"/> <UnitName Value="MufasaTypes"/>
<CursorPos X="50" Y="55"/> <CursorPos X="27" Y="50"/>
<TopLine Value="31"/> <TopLine Value="36"/>
<EditorIndex Value="6"/> <EditorIndex Value="7"/>
<UsageCount Value="15"/> <UsageCount Value="15"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit8> </Unit8>
@ -107,8 +109,8 @@
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<UnitName Value="ocr"/> <UnitName Value="ocr"/>
<CursorPos X="11" Y="361"/> <CursorPos X="11" Y="361"/>
<TopLine Value="355"/> <TopLine Value="37"/>
<EditorIndex Value="2"/> <EditorIndex Value="3"/>
<UsageCount Value="14"/> <UsageCount Value="14"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit9> </Unit9>
@ -135,9 +137,9 @@
<Unit13> <Unit13>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/> <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<UnitName Value="bitmaps"/> <UnitName Value="bitmaps"/>
<CursorPos X="25" Y="490"/> <CursorPos X="11" Y="736"/>
<TopLine Value="469"/> <TopLine Value="722"/>
<EditorIndex Value="4"/> <EditorIndex Value="5"/>
<UsageCount Value="12"/> <UsageCount Value="12"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit13> </Unit13>
@ -172,131 +174,139 @@
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/ocr.inc"/> <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/ocr.inc"/>
<CursorPos X="20" Y="5"/> <CursorPos X="20" Y="5"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="3"/> <EditorIndex Value="4"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit18> </Unit18>
</Units> </Units>
<JumpHistory Count="28" HistoryIndex="27"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="673" Column="15" TopLine="652"/>
</Position1>
<Position2>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="62" Column="33" TopLine="47"/>
</Position2>
<Position3>
<Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="673" Column="20" TopLine="652"/>
</Position3>
<Position4>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="62" Column="33" TopLine="47"/>
</Position4>
<Position5>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/> <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="483" Column="21" TopLine="459"/> <Caret Line="483" Column="21" TopLine="459"/>
</Position5> </Position1>
<Position6> <Position2>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="656" Column="18" TopLine="636"/> <Caret Line="656" Column="18" TopLine="636"/>
</Position6> </Position2>
<Position7> <Position3>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/> <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="62" Column="33" TopLine="47"/> <Caret Line="62" Column="33" TopLine="47"/>
</Position7> </Position3>
<Position8> <Position4>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="653" Column="39" TopLine="637"/> <Caret Line="653" Column="39" TopLine="637"/>
</Position8> </Position4>
<Position9> <Position5>
<Filename Value="../../Units/MMLCore/window.pas"/> <Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="52" Column="40" TopLine="37"/> <Caret Line="52" Column="40" TopLine="37"/>
</Position5>
<Position6>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="73" Column="33" TopLine="58"/>
</Position6>
<Position7>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="373" Column="39" TopLine="368"/>
</Position7>
<Position8>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="98" Column="27" TopLine="91"/>
</Position8>
<Position9>
<Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="656" Column="33" TopLine="637"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="../../Units/MMLCore/window.pas"/> <Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="73" Column="33" TopLine="58"/> <Caret Line="63" Column="37" TopLine="47"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="../../Units/MMLCore/window.pas"/> <Filename Value="project1.lpr"/>
<Caret Line="373" Column="39" TopLine="368"/> <Caret Line="68" Column="30" TopLine="63"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/> <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="98" Column="27" TopLine="91"/> <Caret Line="487" Column="3" TopLine="469"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="project1.lpr"/>
<Caret Line="656" Column="33" TopLine="637"/> <Caret Line="81" Column="4" TopLine="66"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="../../Units/MMLCore/window.pas"/> <Filename Value="project1.lpr"/>
<Caret Line="63" Column="37" TopLine="47"/> <Caret Line="60" Column="4" TopLine="45"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="project1.lpr"/> <Filename Value="project1.lpr"/>
<Caret Line="68" Column="30" TopLine="63"/> <Caret Line="81" Column="4" TopLine="66"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/> <Filename Value="project1.lpr"/>
<Caret Line="487" Column="3" TopLine="469"/> <Caret Line="60" Column="4" TopLine="45"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="project1.lpr"/>
<Caret Line="81" Column="4" TopLine="66"/>
</Position17>
<Position18>
<Filename Value="project1.lpr"/>
<Caret Line="60" Column="4" TopLine="45"/>
</Position18>
<Position19>
<Filename Value="project1.lpr"/>
<Caret Line="81" Column="4" TopLine="66"/>
</Position19>
<Position20>
<Filename Value="project1.lpr"/>
<Caret Line="60" Column="4" TopLine="45"/>
</Position20>
<Position21>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="11" Column="67" TopLine="1"/> <Caret Line="11" Column="67" TopLine="1"/>
</Position21> </Position17>
<Position22> <Position18>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="466" Column="18" TopLine="451"/> <Caret Line="466" Column="18" TopLine="451"/>
</Position22> </Position18>
<Position23> <Position19>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="477" Column="36" TopLine="45"/> <Caret Line="477" Column="36" TopLine="45"/>
</Position23> </Position19>
<Position24> <Position20>
<Filename Value="../../Units/MMLCore/ocr.pas"/> <Filename Value="../../Units/MMLCore/ocr.pas"/>
<Caret Line="493" Column="19" TopLine="478"/> <Caret Line="493" Column="19" TopLine="478"/>
</Position24> </Position20>
<Position25> <Position21>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/> <Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="98" Column="33" TopLine="91"/> <Caret Line="98" Column="33" TopLine="91"/>
</Position25> </Position21>
<Position26> <Position22>
<Filename Value="../../Units/MMLCore/client.pas"/> <Filename Value="../../Units/MMLCore/client.pas"/>
<Caret Line="33" Column="53" TopLine="31"/> <Caret Line="33" Column="53" TopLine="31"/>
</Position22>
<Position23>
<Filename Value="project1.lpr"/>
<Caret Line="12" Column="6" TopLine="1"/>
</Position23>
<Position24>
<Filename Value="project1.lpr"/>
<Caret Line="41" Column="17" TopLine="23"/>
</Position24>
<Position25>
<Filename Value="project1.lpr"/>
<Caret Line="96" Column="16" TopLine="75"/>
</Position25>
<Position26>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="47" Column="65" TopLine="33"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="project1.lpr"/> <Filename Value="project1.lpr"/>
<Caret Line="12" Column="6" TopLine="1"/> <Caret Line="13" Column="25" TopLine="1"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="project1.lpr"/> <Filename Value="project1.lpr"/>
<Caret Line="41" Column="17" TopLine="23"/> <Caret Line="96" Column="39" TopLine="82"/>
</Position28> </Position28>
<Position29>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="47" Column="33" TopLine="33"/>
</Position29>
<Position30>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="477" Column="35" TopLine="469"/>
</Position30>
</JumpHistory> </JumpHistory>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="8"/> <Version Value="8"/>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)/"/> <IncludeFiles Value="$(ProjOutDir)/"/>
<OtherUnitFiles Value="$(ProjPath)/../../Units/MMLCore/;$(ProjPath)/../../Units/Misc/;$(ProjPath)/../../Units/MMLAddon/;$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)/;$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)/"/> <OtherUnitFiles Value="$(ProjPath)/../../Units/MMLCore/;$(ProjPath)/../../Units/Misc/;$(ProjPath)/../../Units/MMLAddon/;$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)/;$(LazarusDir)/lcl/units/$(TargetCPU)-$(TargetOS)/;$(ProjPath)/../../Units/Linux/"/>
</SearchPaths> </SearchPaths>
<CodeGeneration> <CodeGeneration>
<Optimizations> <Optimizations>

8
Projects/MufasaTests/project1.lpr
View File

@ -10,7 +10,7 @@ uses
Forms,Interfaces, Forms,Interfaces,
LCLIntf, LCLIntf,
Client, Client,
bitmaps,x bitmaps,x ,mufasatypes
{ you can add units after this }; { you can add units after this };
@ -80,7 +80,7 @@ begin
bmp := TMufasaBitmap.Create; bmp := TMufasaBitmap.Create;
{$WARNING Change This Path!} {$WARNING Change This Path!}
bmp.LoadFromFile('/home/merlijn/Programs/mufasa/UpText/text1.bmp'); { bmp.LoadFromFile('/home/merlijn/Programs/mufasa/UpText/text1.bmp');
//bmp.LoadFromFile('/home/merlijn/Programs/mufasa/output.bmp'); //bmp.LoadFromFile('/home/merlijn/Programs/mufasa/output.bmp');
writeln(inttostr(bmp.Width) + ', ' + inttostr(bmp.height)); writeln(inttostr(bmp.Width) + ', ' + inttostr(bmp.height));
@ -91,7 +91,9 @@ begin
for i := 0 to 100 do for i := 0 to 100 do
C.MOCR.GetUpTextAt(0,0); C.MOCR.GetUpTextAt(0,0);
writeln('Time: ' + FloatToStr(((GetTickCount - Time) / (i + 1)))); writeln('Time: ' + FloatToStr(((GetTickCount - Time) / (i + 1))));
writeln(C.MOCR.GetUpTextAt(0,0)); writeln(C.MOCR.GetUpTextAt(0,0)); }
C.MInput.ClickMouse(5,5, mouse_Left);
C.Free; C.Free;
bmp.OnDestroy:=nil; bmp.OnDestroy:=nil;

283
Projects/SAMufasaGUI/project1.lpi
View File

@ -7,7 +7,7 @@
<TargetFileExt Value=""/> <TargetFileExt Value=""/>
<Title Value="Mufasa Stand Alone"/> <Title Value="Mufasa Stand Alone"/>
<UseXPManifest Value="True"/> <UseXPManifest Value="True"/>
<ActiveEditorIndexAtStart Value="15"/> <ActiveEditorIndexAtStart Value="13"/>
</General> </General>
<VersionInfo> <VersionInfo>
<ProjectVersion Value=""/> <ProjectVersion Value=""/>
@ -33,7 +33,7 @@
<PackageName Value="LCL"/> <PackageName Value="LCL"/>
</Item2> </Item2>
</RequiredPackages> </RequiredPackages>
<Units Count="203"> <Units Count="207">
<Unit0> <Unit0>
<Filename Value="project1.lpr"/> <Filename Value="project1.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
@ -162,8 +162,8 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="TestUnit"/> <UnitName Value="TestUnit"/>
<CursorPos X="35" Y="317"/> <CursorPos X="78" Y="265"/>
<TopLine Value="303"/> <TopLine Value="249"/>
<EditorIndex Value="0"/> <EditorIndex Value="0"/>
<UsageCount Value="202"/> <UsageCount Value="202"/>
<Loaded Value="True"/> <Loaded Value="True"/>
@ -221,7 +221,7 @@
<UnitName Value="Client"/> <UnitName Value="Client"/>
<CursorPos X="26" Y="44"/> <CursorPos X="26" Y="44"/>
<TopLine Value="26"/> <TopLine Value="26"/>
<EditorIndex Value="9"/> <EditorIndex Value="10"/>
<UsageCount Value="201"/> <UsageCount Value="201"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit25> </Unit25>
@ -229,8 +229,8 @@
<Filename Value="../../Units/MMLCore/mufasatypes.pas"/> <Filename Value="../../Units/MMLCore/mufasatypes.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="MufasaTypes"/> <UnitName Value="MufasaTypes"/>
<CursorPos X="35" Y="42"/> <CursorPos X="3" Y="51"/>
<TopLine Value="76"/> <TopLine Value="37"/>
<EditorIndex Value="1"/> <EditorIndex Value="1"/>
<UsageCount Value="201"/> <UsageCount Value="201"/>
<Loaded Value="True"/> <Loaded Value="True"/>
@ -273,16 +273,16 @@
<CursorPos X="29" Y="29"/> <CursorPos X="29" Y="29"/>
<TopLine Value="24"/> <TopLine Value="24"/>
<EditorIndex Value="4"/> <EditorIndex Value="4"/>
<UsageCount Value="42"/> <UsageCount Value="43"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit31> </Unit31>
<Unit32> <Unit32>
<Filename Value="../../Units/MMLCore/input.pas"/> <Filename Value="../../Units/MMLCore/input.pas"/>
<UnitName Value="Input"/> <UnitName Value="Input"/>
<CursorPos X="19" Y="229"/> <CursorPos X="18" Y="57"/>
<TopLine Value="225"/> <TopLine Value="46"/>
<EditorIndex Value="12"/> <EditorIndex Value="13"/>
<UsageCount Value="66"/> <UsageCount Value="67"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit32> </Unit32>
<Unit33> <Unit33>
@ -291,7 +291,7 @@
<UnitName Value="finder"/> <UnitName Value="finder"/>
<CursorPos X="50" Y="19"/> <CursorPos X="50" Y="19"/>
<TopLine Value="19"/> <TopLine Value="19"/>
<EditorIndex Value="10"/> <EditorIndex Value="11"/>
<UsageCount Value="201"/> <UsageCount Value="201"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit33> </Unit33>
@ -314,8 +314,8 @@
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/> <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="mmlpsthread"/> <UnitName Value="mmlpsthread"/>
<CursorPos X="23" Y="321"/> <CursorPos X="23" Y="198"/>
<TopLine Value="1"/> <TopLine Value="182"/>
<EditorIndex Value="5"/> <EditorIndex Value="5"/>
<UsageCount Value="202"/> <UsageCount Value="202"/>
<Loaded Value="True"/> <Loaded Value="True"/>
@ -385,8 +385,8 @@
<Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/> <Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/>
<CursorPos X="67" Y="97"/> <CursorPos X="67" Y="97"/>
<TopLine Value="87"/> <TopLine Value="87"/>
<EditorIndex Value="13"/> <EditorIndex Value="16"/>
<UsageCount Value="88"/> <UsageCount Value="89"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit46> </Unit46>
<Unit47> <Unit47>
@ -407,7 +407,7 @@
<UnitName Value="bitmaps"/> <UnitName Value="bitmaps"/>
<CursorPos X="44" Y="692"/> <CursorPos X="44" Y="692"/>
<TopLine Value="670"/> <TopLine Value="670"/>
<EditorIndex Value="11"/> <EditorIndex Value="12"/>
<UsageCount Value="200"/> <UsageCount Value="200"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit49> </Unit49>
@ -422,8 +422,8 @@
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/colour.inc"/> <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/colour.inc"/>
<CursorPos X="30" Y="28"/> <CursorPos X="30" Y="28"/>
<TopLine Value="16"/> <TopLine Value="16"/>
<EditorIndex Value="6"/> <EditorIndex Value="7"/>
<UsageCount Value="32"/> <UsageCount Value="33"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit51> </Unit51>
<Unit52> <Unit52>
@ -574,16 +574,18 @@
</Unit73> </Unit73>
<Unit74> <Unit74>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/mouse.inc"/> <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/mouse.inc"/>
<CursorPos X="1" Y="1"/> <CursorPos X="5" Y="32"/>
<TopLine Value="1"/> <TopLine Value="4"/>
<UsageCount Value="8"/> <EditorIndex Value="6"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit74> </Unit74>
<Unit75> <Unit75>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/other.inc"/> <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/other.inc"/>
<CursorPos X="1" Y="1"/> <CursorPos X="1" Y="1"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="14"/> <EditorIndex Value="17"/>
<UsageCount Value="32"/> <UsageCount Value="33"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit75> </Unit75>
<Unit76> <Unit76>
@ -834,7 +836,7 @@
<UnitName Value="mmath"/> <UnitName Value="mmath"/>
<CursorPos X="32" Y="42"/> <CursorPos X="32" Y="42"/>
<TopLine Value="16"/> <TopLine Value="16"/>
<UsageCount Value="190"/> <UsageCount Value="192"/>
</Unit111> </Unit111>
<Unit112> <Unit112>
<Filename Value="../../../Documents/fpc/rtl/objpas/types.pp"/> <Filename Value="../../../Documents/fpc/rtl/objpas/types.pp"/>
@ -870,8 +872,8 @@
<UnitName Value="ocr"/> <UnitName Value="ocr"/>
<CursorPos X="19" Y="91"/> <CursorPos X="19" Y="91"/>
<TopLine Value="75"/> <TopLine Value="75"/>
<EditorIndex Value="8"/> <EditorIndex Value="9"/>
<UsageCount Value="160"/> <UsageCount Value="162"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit116> </Unit116>
<Unit117> <Unit117>
@ -887,7 +889,7 @@
<UnitName Value="project"/> <UnitName Value="project"/>
<CursorPos X="46" Y="15"/> <CursorPos X="46" Y="15"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<UsageCount Value="157"/> <UsageCount Value="159"/>
</Unit118> </Unit118>
<Unit119> <Unit119>
<Filename Value="../../../FPC/FPCCheckout/rtl/inc/heap.inc"/> <Filename Value="../../../FPC/FPCCheckout/rtl/inc/heap.inc"/>
@ -1001,7 +1003,7 @@
<UnitName Value="web"/> <UnitName Value="web"/>
<CursorPos X="90" Y="16"/> <CursorPos X="90" Y="16"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<UsageCount Value="85"/> <UsageCount Value="87"/>
</Unit136> </Unit136>
<Unit137> <Unit137>
<Filename Value="../../../lazarus/lcl/lazhelphtml.pas"/> <Filename Value="../../../lazarus/lcl/lazhelphtml.pas"/>
@ -1170,7 +1172,6 @@
<CursorPos X="101" Y="886"/> <CursorPos X="101" Y="886"/>
<TopLine Value="884"/> <TopLine Value="884"/>
<UsageCount Value="7"/> <UsageCount Value="7"/>
<SyntaxHighlighter Value="Delphi"/>
</Unit157> </Unit157>
<Unit158> <Unit158>
<Filename Value="../../../Compilertje/PascalScript/Source/uPSRuntime.pas"/> <Filename Value="../../../Compilertje/PascalScript/Source/uPSRuntime.pas"/>
@ -1178,7 +1179,6 @@
<CursorPos X="3" Y="2111"/> <CursorPos X="3" Y="2111"/>
<TopLine Value="2125"/> <TopLine Value="2125"/>
<UsageCount Value="7"/> <UsageCount Value="7"/>
<SyntaxHighlighter Value="Delphi"/>
</Unit158> </Unit158>
<Unit159> <Unit159>
<Filename Value="../../../Compilertje/PascalScript/Samples/Import/fMain.pas"/> <Filename Value="../../../Compilertje/PascalScript/Samples/Import/fMain.pas"/>
@ -1200,10 +1200,10 @@
<ComponentName Value="ScriptFrame"/> <ComponentName Value="ScriptFrame"/>
<ResourceBaseClass Value="Frame"/> <ResourceBaseClass Value="Frame"/>
<UnitName Value="framescript"/> <UnitName Value="framescript"/>
<CursorPos X="36" Y="147"/> <CursorPos X="40" Y="146"/>
<TopLine Value="126"/> <TopLine Value="126"/>
<EditorIndex Value="15"/> <EditorIndex Value="18"/>
<UsageCount Value="78"/> <UsageCount Value="80"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit161> </Unit161>
<Unit162> <Unit162>
@ -1426,8 +1426,8 @@
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/ocr.inc"/> <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/ocr.inc"/>
<CursorPos X="33" Y="4"/> <CursorPos X="33" Y="4"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="7"/> <EditorIndex Value="8"/>
<UsageCount Value="23"/> <UsageCount Value="24"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit195> </Unit195>
<Unit196> <Unit196>
@ -1478,127 +1478,158 @@
<TopLine Value="182"/> <TopLine Value="182"/>
<UsageCount Value="9"/> <UsageCount Value="9"/>
</Unit202> </Unit202>
<Unit203>
<Filename Value="../../Units/Linux/xtest.pas"/>
<UnitName Value="XTest"/>
<CursorPos X="72" Y="28"/>
<TopLine Value="14"/>
<EditorIndex Value="14"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit203>
<Unit204>
<Filename Value="../../../../Documents/fpc/packages/x11/src/x.pp"/>
<UnitName Value="x"/>
<CursorPos X="4" Y="125"/>
<TopLine Value="111"/>
<UsageCount Value="10"/>
</Unit204>
<Unit205>
<Filename Value="../../../../Documents/fpc/rtl/unix/aliasctp.inc"/>
<CursorPos X="33" Y="45"/>
<TopLine Value="31"/>
<EditorIndex Value="15"/>
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit205>
<Unit206>
<Filename Value="../../../../Documents/fpc/rtl/inc/ctypes.pp"/>
<UnitName Value="ctypes"/>
<CursorPos X="32" Y="63"/>
<TopLine Value="49"/>
<UsageCount Value="10"/>
</Unit206>
</Units> </Units>
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="testunit.pas"/> <Filename Value="testunit.pas"/>
<Caret Line="348" Column="14" TopLine="337"/> <Caret Line="746" Column="53" TopLine="740"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="testunit.pas"/> <Filename Value="testunit.pas"/>
<Caret Line="365" Column="18" TopLine="354"/> <Caret Line="36" Column="5" TopLine="23"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="testunit.pas"/> <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="366" Column="18" TopLine="354"/> <Caret Line="196" Column="24" TopLine="190"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="testunit.pas"/> <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/colour.inc"/>
<Caret Line="22" Column="113" TopLine="18"/> <Caret Line="10" Column="25" TopLine="2"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="testunit.pas"/> <Filename Value="testunit.pas"/>
<Caret Line="26" Column="89" TopLine="18"/> <Caret Line="36" Column="5" TopLine="23"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="testunit.pas"/> <Filename Value="testunit.pas"/>
<Caret Line="157" Column="31" TopLine="144"/> <Caret Line="677" Column="17" TopLine="663"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="testunit.pas"/> <Filename Value="testunit.pas"/>
<Caret Line="231" Column="52" TopLine="227"/> <Caret Line="678" Column="17" TopLine="663"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="testunit.pas"/> <Filename Value="testunit.pas"/>
<Caret Line="573" Column="15" TopLine="570"/> <Caret Line="3" Column="69" TopLine="1"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="testunit.pas"/> <Filename Value="testunit.pas"/>
<Caret Line="196" Column="24" TopLine="179"/> <Caret Line="44" Column="37" TopLine="37"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="testunit.pas"/> <Filename Value="testunit.pas"/>
<Caret Line="890" Column="63" TopLine="871"/> <Caret Line="317" Column="35" TopLine="303"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="testunit.pas"/>
<Caret Line="575" Column="11" TopLine="572"/>
</Position11>
<Position12>
<Filename Value="testunit.pas"/>
<Caret Line="422" Column="44" TopLine="417"/>
</Position12>
<Position13>
<Filename Value="testunit.pas"/>
<Caret Line="423" Column="93" TopLine="418"/>
</Position13>
<Position14>
<Filename Value="testunit.pas"/>
<Caret Line="682" Column="1" TopLine="680"/>
</Position14>
<Position15>
<Filename Value="testunit.pas"/>
<Caret Line="720" Column="3" TopLine="718"/>
</Position15>
<Position16>
<Filename Value="testunit.pas"/>
<Caret Line="665" Column="3" TopLine="663"/>
</Position16>
<Position17>
<Filename Value="testunit.pas"/>
<Caret Line="743" Column="3" TopLine="740"/>
</Position17>
<Position18>
<Filename Value="testunit.pas"/>
<Caret Line="757" Column="3" TopLine="755"/>
</Position18>
<Position19>
<Filename Value="testunit.pas"/>
<Caret Line="746" Column="53" TopLine="740"/>
</Position19>
<Position20>
<Filename Value="testunit.pas"/>
<Caret Line="36" Column="5" TopLine="23"/>
</Position20>
<Position21>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="196" Column="24" TopLine="190"/>
</Position21>
<Position22>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/colour.inc"/>
<Caret Line="10" Column="25" TopLine="2"/>
</Position22>
<Position23>
<Filename Value="testunit.pas"/>
<Caret Line="36" Column="5" TopLine="23"/>
</Position23>
<Position24>
<Filename Value="testunit.pas"/>
<Caret Line="677" Column="17" TopLine="663"/>
</Position24>
<Position25>
<Filename Value="testunit.pas"/>
<Caret Line="678" Column="17" TopLine="663"/>
</Position25>
<Position26>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="197" Column="53" TopLine="244"/>
</Position26>
<Position27>
<Filename Value="testunit.pas"/>
<Caret Line="3" Column="69" TopLine="1"/>
</Position27>
<Position28>
<Filename Value="testunit.pas"/>
<Caret Line="44" Column="37" TopLine="37"/>
</Position28>
<Position29>
<Filename Value="testunit.pas"/>
<Caret Line="317" Column="35" TopLine="303"/>
</Position29>
<Position30>
<Filename Value="framescript.pas"/> <Filename Value="framescript.pas"/>
<Caret Line="65" Column="26" TopLine="51"/> <Caret Line="65" Column="26" TopLine="51"/>
</Position11>
<Position12>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="35" Column="22" TopLine="19"/>
</Position12>
<Position13>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="273" Column="8" TopLine="250"/>
</Position13>
<Position14>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="195" Column="82" TopLine="187"/>
</Position14>
<Position15>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="243" Column="32" TopLine="220"/>
</Position15>
<Position16>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="242" Column="19" TopLine="220"/>
</Position16>
<Position17>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="198" Column="10" TopLine="193"/>
</Position17>
<Position18>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="232" Column="25" TopLine="209"/>
</Position18>
<Position19>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="243" Column="43" TopLine="218"/>
</Position19>
<Position20>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="31" Column="21" TopLine="19"/>
</Position20>
<Position21>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="235" Column="17" TopLine="221"/>
</Position21>
<Position22>
<Filename Value="../../Units/Linux/xtest.pas"/>
<Caret Line="28" Column="72" TopLine="14"/>
</Position22>
<Position23>
<Filename Value="../../../../Documents/fpc/rtl/unix/aliasctp.inc"/>
<Caret Line="45" Column="33" TopLine="31"/>
</Position23>
<Position24>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="199" Column="18" TopLine="192"/>
</Position24>
<Position25>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="235" Column="25" TopLine="219"/>
</Position25>
<Position26>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="233" Column="25" TopLine="220"/>
</Position26>
<Position27>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="243" Column="24" TopLine="220"/>
</Position27>
<Position28>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="244" Column="24" TopLine="229"/>
</Position28>
<Position29>
<Filename Value="../../Units/MMLCore/input.pas"/>
<Caret Line="243" Column="65" TopLine="229"/>
</Position29>
<Position30>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="198" Column="23" TopLine="182"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
</ProjectOptions> </ProjectOptions>
@ -1609,7 +1640,7 @@
</Target> </Target>
<SearchPaths> <SearchPaths>
<IncludeFiles Value="$(ProjOutDir)/;$(ProjPath)../../Units/MMLAddon/PSInc/"/> <IncludeFiles Value="$(ProjOutDir)/;$(ProjPath)../../Units/MMLAddon/PSInc/"/>
<OtherUnitFiles Value="$(ProjPath)../../Units/MMLCore/;$(ProjPath)../../Units/MMLAddon/;$(ProjPath)../../Units/PascalScript/;$(ProjPath)../../Units/Misc/;$(ProjPath)../../Units/MMLAddon/PSInc/"/> <OtherUnitFiles Value="$(ProjPath)../../Units/MMLCore/;$(ProjPath)../../Units/MMLAddon/;$(ProjPath)../../Units/PascalScript/;$(ProjPath)../../Units/Misc/;$(ProjPath)../../Units/MMLAddon/PSInc/;$(ProjPath)../../Units/Linux/"/>
</SearchPaths> </SearchPaths>
<CodeGeneration> <CodeGeneration>
<Optimizations> <Optimizations>

1
Units/Linux/xtest.pas
View File

@ -42,6 +42,7 @@ procedure XTestSetGContextOfGC(gc: TGC; gid:TGContext); cdecl; external;
procedure XTestSetVisualIDOfVisual(visual:PVisual; visualid: TVisualID); cdecl; external; procedure XTestSetVisualIDOfVisual(visual:PVisual; visualid: TVisualID); cdecl; external;
function XTestDiscard(dpy:pDisplay):TStatus; cdecl; external; function XTestDiscard(dpy:pDisplay):TStatus; cdecl; external;
{ Below is old testing code }
procedure mouse_move(x,y: integer); procedure mouse_move(x,y: integer);
procedure mouse_click(left:boolean); procedure mouse_click(left:boolean);
procedure keytest; procedure keytest;

57
Units/MMLCore/input.pas
View File

@ -32,7 +32,7 @@ uses
mufasatypes, // for common mufasa types mufasatypes, // for common mufasa types
windowutil // for mufasa window utils windowutil // for mufasa window utils
{$IFDEF LINUX} {$IFDEF LINUX}
,ctypes,x, xlib{,xtest,keysym} // for X* stuff ,ctypes,x, xlib,xtest{,keysym} // for X* stuff
// do non silent keys with XTest. // do non silent keys with XTest.
{$ENDIF}; {$ENDIF};
type type
@ -43,11 +43,15 @@ type
procedure GetMousePos(var X, Y: Integer); procedure GetMousePos(var X, Y: Integer);
procedure SetMousePos(X, Y: Integer); procedure SetMousePos(X, Y: Integer);
procedure MouseButtonAction(x,y : integer; mClick: TClickType; mPress: TMousePress); procedure MouseButtonAction(x,y : integer; mClick: TClickType; mPress: TMousePress);
procedure MouseButtonActionSilent(x,y : integer; mClick: TClickType; mPress: TMousePress);
procedure ClickMouse(X, Y: Integer; mClick: TClickType); procedure ClickMouse(X, Y: Integer; mClick: TClickType);
procedure KeyUp(key: Integer); procedure KeyUp(key: Integer);
procedure KeyDown(key: Integer); procedure KeyDown(key: Integer);
// Not used yet.
procedure SetSilent(_Silent: Boolean);
{ {
Possibly change to GetMouseButtonStates? Then people can get the Possibly change to GetMouseButtonStates? Then people can get the
states bitwise. Like X and WinAPI. states bitwise. Like X and WinAPI.
@ -56,6 +60,9 @@ type
public public
Client: TObject; Client: TObject;
private
// Not used yet.
Silent: Boolean;
end; end;
@ -191,8 +198,8 @@ end;
procedure TMInput.MouseButtonAction(x,y : integer; mClick: TClickType; mPress: TMousePress); procedure TMInput.MouseButtonAction(x,y : integer; mClick: TClickType; mPress: TMousePress);
{$IFDEF LINUX} {$IFDEF LINUX}
var var
event : TXEvent; ButtonP: cuint;
Garbage : QWord; _isPress: cbool;
Old_Handler: TXErrorHandler; Old_Handler: TXErrorHandler;
{$ENDIF} {$ENDIF}
{$IFDEF MSWINDOWS} {$IFDEF MSWINDOWS}
@ -222,6 +229,44 @@ begin
SendInput(1,Input, sizeof(Input)); SendInput(1,Input, sizeof(Input));
{$ENDIF} {$ENDIF}
{$IFDEF LINUX}
Old_Handler := XSetErrorHandler(@MufasaXErrorHandler);
if mPress = mouse_Down then
_isPress := cbool(1)
else
_isPress := cbool(0);
case mClick of
mouse_Left: ButtonP := Button1;
mouse_Middle:ButtonP := Button2;
mouse_Right: ButtonP := Button3;
end;
XTestFakeButtonEvent(TClient(Client).MWindow.XDisplay, ButtonP,
_isPress, CurrentTime);
XSetErrorHandler(Old_Handler);
{$ENDIF}
end;
procedure TMInput.MouseButtonActionSilent(x,y : integer; mClick: TClickType; mPress: TMousePress);
{$IFDEF LINUX}
var
event : TXEvent;
Garbage : QWord;
Old_Handler: TXErrorHandler;
{$ENDIF}
{$IFDEF MSWINDOWS}
var
Input : TInput;
Rect : TRect;
{$ENDIF}
begin
{$IFDEF MSWINDOWS}
writeln('Not implemented');
{$ENDIF}
{$IFDEF LINUX} {$IFDEF LINUX}
Old_Handler := XSetErrorHandler(@MufasaXErrorHandler); Old_Handler := XSetErrorHandler(@MufasaXErrorHandler);
@ -264,6 +309,12 @@ begin
Self.MouseButtonAction(X, Y, mClick, mouse_Up); Self.MouseButtonAction(X, Y, mClick, mouse_Up);
end; end;
procedure TMInput.SetSilent(_Silent: Boolean);
begin
raise exception.CreateFmt('Input - SetSilent / Silent is not implemented',[]);
Self.Silent := _Silent;
end;
function TMInput.IsMouseButtonDown(mType: TClickType): Boolean; function TMInput.IsMouseButtonDown(mType: TClickType): Boolean;
{$IFDEF LINUX} {$IFDEF LINUX}
var var