dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-05-24 12:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finished merging

Browse source
This commit is contained in:
José Pedro 2016-08-24 20:04:07 +01:00
parent a3b055fa7c
commit 74ccda1ffc
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/Cosmos.System/Cosmos.System.csproj
View file

@ -107,6 +107,9 @@
<Compile Include="Keyboard\KeyEvent.cs" /> <Compile Include="Keyboard\KeyEvent.cs" />
<Compile Include="Keyboard\KeyMapping.cs" /> <Compile Include="Keyboard\KeyMapping.cs" />
<Compile Include="Keyboard\ScanMapBase.cs" /> <Compile Include="Keyboard\ScanMapBase.cs" />
<Compile Include="Keyboard\ScanMaps\FR_Standard.cs" />
<Compile Include="Keyboard\ScanMaps\US_Standard.cs" />
<Compile Include="Keyboard\ScanMaps\DE_Standard.cs" />
<Compile Include="MathEx.cs" /> <Compile Include="MathEx.cs" />
<Compile Include="Network\ARP\ARPCache.cs" /> <Compile Include="Network\ARP\ARPCache.cs" />
<Compile Include="Network\ARP\ARPPacket.cs" /> <Compile Include="Network\ARP\ARPPacket.cs" />
@ -124,9 +127,6 @@
<Compile Include="Network\UdpClient.cs" /> <Compile Include="Network\UdpClient.cs" />
<Compile Include="Power.cs" /> <Compile Include="Power.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ScanMaps\DE_Standard.cs" />
<Compile Include="ScanMaps\FR_Standard.cs" />
<Compile Include="ScanMaps\US_Standard.cs" />
<Compile Include="TestingHelpers.cs" /> <Compile Include="TestingHelpers.cs" />
<Compile Include="Graphics\VBEScreen.cs" /> <Compile Include="Graphics\VBEScreen.cs" />
<Compile Include="Graphics\VGAScreen.cs" /> <Compile Include="Graphics\VGAScreen.cs" />

22
source/Cosmos.System/Keyboard/KeyMapping.cs
View file

@ -16,7 +16,7 @@ namespace Cosmos.System
public ConsoleKeyEx Key; public ConsoleKeyEx Key;
public ConsoleKeyEx NumLockKey; public ConsoleKeyEx NumLockKey;
public KeyMapping(uint aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, char shiftaltgr, char ctrl, char shiftctrl, ConsoleKeyEx aKey, ConsoleKeyEx numKey) public KeyMapping(byte aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, char shiftaltgr, char ctrl, char shiftctrl, ConsoleKeyEx aKey, ConsoleKeyEx numKey)
{ {
Scancode = aScanCode; Scancode = aScanCode;
Value = norm; Value = norm;
@ -34,37 +34,37 @@ namespace Cosmos.System
NumLockKey = numKey; NumLockKey = numKey;
} }
public KeyMapping(uint aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, char shiftaltgr, ConsoleKeyEx aKey, ConsoleKeyEx numKey) public KeyMapping(byte aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, char shiftaltgr, ConsoleKeyEx aKey, ConsoleKeyEx numKey)
: this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, altgr, shiftaltgr, '\0', '\0', aKey, numKey) : this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, altgr, shiftaltgr, '\0', '\0', aKey, numKey)
{ {
} }
public KeyMapping(uint aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, ConsoleKeyEx aKey, ConsoleKeyEx numKey) public KeyMapping(byte aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, ConsoleKeyEx aKey, ConsoleKeyEx numKey)
: this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, altgr, '\0', '\0', '\0', aKey, numKey) : this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, altgr, '\0', '\0', '\0', aKey, numKey)
{ {
} }
public KeyMapping(uint aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, char shiftaltgr, char ctrl, char shiftctrl, ConsoleKeyEx aKey) public KeyMapping(byte aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, char shiftaltgr, char ctrl, char shiftctrl, ConsoleKeyEx aKey)
: this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, altgr, shiftaltgr, ctrl, shiftctrl, aKey, aKey) : this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, altgr, shiftaltgr, ctrl, shiftctrl, aKey, aKey)
{ {
} }
public KeyMapping(uint aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, char shiftaltgr, ConsoleKeyEx aKey) public KeyMapping(byte aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, char shiftaltgr, ConsoleKeyEx aKey)
: this (aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, altgr, shiftaltgr, '\0', '\0', aKey) : this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, altgr, shiftaltgr, '\0', '\0', aKey)
{ {
} }
public KeyMapping(uint aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, ConsoleKeyEx aKey) public KeyMapping(byte aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, char altgr, ConsoleKeyEx aKey)
: this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, altgr, '\0', '\0', '\0', aKey) : this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, altgr, '\0', '\0', '\0', aKey)
{ {
} }
public KeyMapping(uint aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, ConsoleKeyEx aKey) public KeyMapping(byte aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, ConsoleKeyEx aKey)
: this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, '\0', '\0', '\0', '\0', aKey) : this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, '\0', '\0', '\0', '\0', aKey)
{ {
} }
public KeyMapping(uint aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, ConsoleKeyEx aKey, ConsoleKeyEx numKey) public KeyMapping(byte aScanCode, char norm, char shift, char num, char caps, char shiftcaps, char shiftnum, ConsoleKeyEx aKey, ConsoleKeyEx numKey)
: this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, '\0', aKey, numKey) : this(aScanCode, norm, shift, num, caps, shiftcaps, shiftnum, '\0', aKey, numKey)
{ {
} }
@ -74,12 +74,12 @@ namespace Cosmos.System
{ {
} }
public KeyMapping(uint aScanCode, char num, ConsoleKeyEx aKey, ConsoleKeyEx numKey) public KeyMapping(byte aScanCode, char num, ConsoleKeyEx aKey, ConsoleKeyEx numKey)
: this(aScanCode, '\0', '\0', num, '\0', '\0', '\0', aKey, numKey) : this(aScanCode, '\0', '\0', num, '\0', '\0', '\0', aKey, numKey)
{ {
} }
public KeyMapping(uint aScanCode, char n, ConsoleKeyEx aKey) public KeyMapping(byte aScanCode, char n, ConsoleKeyEx aKey)
: this(aScanCode, n, n, n, n, n, n, aKey) : this(aScanCode, n, n, n, n, n, n, aKey)
{ {
} }

0
source/Cosmos.System/ScanMaps/DE_Standard.cs → source/Cosmos.System/Keyboard/ScanMaps/DE_Standard.cs
View file