Skip to content

Commit

Permalink
Fix indent style
Browse files Browse the repository at this point in the history
  • Loading branch information
@mfakane
mfakane committed May 5, 2019
1 parent 98c0dbe commit 0f491d2
Show file tree
Hide file tree
Showing 18 changed files with 359 additions and 359 deletions.
36 changes: 18 additions & 18 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,30 +27,30 @@ protected override void WndProc(ref Message m)
{
const int WM_INPUT = 0x00FF;

// You can read inputs by processing the WM_INPUT message.
// You can read inputs by processing the WM_INPUT message.
if (m.Msg == WM_INPUT)
{
// Create an RawInputData from the handle stored in lParam.
// Create an RawInputData from the handle stored in lParam.
var data = RawInputData.FromHandle(m.LParam);

// You can identify the source device using Header.DeviceHandle or just Device.
var sourceDeviceHandle = data.Header.DeviceHandle;
var sourceDevice = data.Device;
// You can identify the source device using Header.DeviceHandle or just Device.
var sourceDeviceHandle = data.Header.DeviceHandle;
var sourceDevice = data.Device;

// The data will be an instance of either RawInputMouseData, RawInputKeyboardData, or RawInputHidData.
// They contain the raw input data in their properties.
// The data will be an instance of either RawInputMouseData, RawInputKeyboardData, or RawInputHidData.
// They contain the raw input data in their properties.
switch (data)
{
case RawInputMouseData mouse:
Console.WriteLine(mouse.Mouse);
break;
case RawInputKeyboardData keyboard:
Console.WriteLine(keyboard.Keyboard);
break;
case RawInputHidData hid:
Console.WriteLine(hid.Hid);
break;
}
{
case RawInputMouseData mouse:
Console.WriteLine(mouse.Mouse);
break;
case RawInputKeyboardData keyboard:
Console.WriteLine(keyboard.Keyboard);
break;
case RawInputHidData hid:
Console.WriteLine(hid.Hid);
break;
}
}

base.WndProc(ref m);
Expand Down
26 changes: 13 additions & 13 deletions RawInput.Sharp/HidButtonSet.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,38 @@
namespace Linearstar.RawInput
{
public class HidButtonSet : IEnumerable<HidButton>
{
internal readonly HidReader reader;
{
internal readonly HidReader reader;
internal readonly HidPButtonCaps buttonCaps;

public int ReportId => buttonCaps.ReportID;
public int ReportId => buttonCaps.ReportID;

public int ButtonCount => buttonCaps.Range.UsageMax - buttonCaps.Range.UsageMin + 1;
public int ButtonCount => buttonCaps.Range.UsageMax - buttonCaps.Range.UsageMin + 1;

public ushort UsagePage => buttonCaps.UsagePage;
public ushort UsagePage => buttonCaps.UsagePage;

public ushort UsageMin => buttonCaps.Range.UsageMin;

public ushort UsageMax => buttonCaps.Range.UsageMax;

public HidUsageAndPage LinkUsageAndPage => new HidUsageAndPage(buttonCaps.LinkUsagePage, buttonCaps.LinkUsage);

public int LinkCollection => buttonCaps.LinkCollection;
public int LinkCollection => buttonCaps.LinkCollection;

internal HidButtonSet(HidReader reader, HidPButtonCaps buttonCaps)
{
this.reader = reader;
this.buttonCaps = buttonCaps;
}
{
this.reader = reader;
this.buttonCaps = buttonCaps;
}

public HidButtonSetState GetStates(ArraySegment<byte> report) =>
GetStates(report.ToArray(), report.Count);

public HidButtonSetState GetStates(byte[] report, int reportLength) =>
public HidButtonSetState GetStates(byte[] report, int reportLength) =>
new HidButtonSetState(this, report, reportLength);

public override string ToString() =>
$"{ReportId}, {LinkCollection}, Link: {{{LinkUsageAndPage}}}, UsagePage: {{{UsagePage}}}, Count: {ButtonCount}";
public override string ToString() =>
$"{ReportId}, {LinkCollection}, Link: {{{LinkUsageAndPage}}}, UsagePage: {{{UsagePage}}}, Count: {ButtonCount}";

public IEnumerator<HidButton> GetEnumerator()
{
Expand Down
66 changes: 33 additions & 33 deletions RawInput.Sharp/HidReader.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,34 @@
namespace Linearstar.RawInput
{
public class HidReader
{
HidPCaps capabilities;

public byte[] PreparsedData
{
get;
}

public HidPreparsedData PreparsedDataPtr
{
get;
}

public int ValueCount => capabilities.NumberInputValueCaps;
public HidButtonSet[] ButtonSets { get; private set; }
public HidValueSet[] ValueSets { get; private set; }

public HidReader(HidPreparsedData preparsedData) =>
Initialize(PreparsedDataPtr = preparsedData);

public HidReader(byte[] preparsedData)
{
using (var preparsedDataPtr = new HidPreparsedDataPtr(PreparsedData = preparsedData))
Initialize(preparsedDataPtr);
}

void Initialize(HidPreparsedData preparsedData)
{
{
HidPCaps capabilities;

public byte[] PreparsedData
{
get;
}

public HidPreparsedData PreparsedDataPtr
{
get;
}

public int ValueCount => capabilities.NumberInputValueCaps;
public HidButtonSet[] ButtonSets { get; private set; }
public HidValueSet[] ValueSets { get; private set; }

public HidReader(HidPreparsedData preparsedData) =>
Initialize(PreparsedDataPtr = preparsedData);

public HidReader(byte[] preparsedData)
{
using (var preparsedDataPtr = new HidPreparsedDataPtr(PreparsedData = preparsedData))
Initialize(preparsedDataPtr);
}

void Initialize(HidPreparsedData preparsedData)
{
capabilities = HidP.GetCaps(preparsedData);

var buttonCaps = HidP.GetButtonCaps(preparsedData, HidPReportType.Input);
Expand All @@ -40,12 +40,12 @@ void Initialize(HidPreparsedData preparsedData)

var valueCaps = HidP.GetValueCaps(preparsedData, HidPReportType.Input);

ValueSets = valueCaps.Select(i => new HidValueSet(this, i)).ToArray();
}
ValueSets = valueCaps.Select(i => new HidValueSet(this, i)).ToArray();
}

internal HidPreparsedDataPtr GetPreparsedData() =>
PreparsedData == null
internal HidPreparsedDataPtr GetPreparsedData() =>
PreparsedData == null
? new HidPreparsedDataPtr(PreparsedDataPtr)
: new HidPreparsedDataPtr(PreparsedData);
}
}
}
96 changes: 48 additions & 48 deletions RawInput.Sharp/HidUsageAndPage.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,52 @@

namespace Linearstar.RawInput
{
public struct HidUsageAndPage : IEquatable<HidUsageAndPage>
{
public static readonly HidUsageAndPage Mouse = new HidUsageAndPage(0x01, 0x02);
public static readonly HidUsageAndPage Joystick = new HidUsageAndPage(0x01, 0x04);
public static readonly HidUsageAndPage GamePad = new HidUsageAndPage(0x01, 0x05);
public static readonly HidUsageAndPage Keyboard = new HidUsageAndPage(0x01, 0x06);
public static readonly HidUsageAndPage Pen = new HidUsageAndPage(0x0D, 0x02);
public static readonly HidUsageAndPage TouchScreen = new HidUsageAndPage(0x0D, 0x04);
public static readonly HidUsageAndPage TouchPad = new HidUsageAndPage(0x0D, 0x05);

public HidUsageAndPage(ushort usagePage, ushort usage)
{
UsagePage = usagePage;
Usage = usage;
}

public ushort Usage
{
get;
}

public ushort UsagePage
{
get;
}

public static bool operator ==(HidUsageAndPage a, HidUsageAndPage b) =>
a.UsagePage == b.UsagePage &&
a.Usage == b.Usage;

public static bool operator !=(HidUsageAndPage a, HidUsageAndPage b) =>
a.UsagePage != b.UsagePage ||
a.Usage != b.Usage;

public bool Equals(HidUsageAndPage other) =>
GetHashCode() == other.GetHashCode();

public override bool Equals(object obj) =>
obj is HidUsageAndPage huap ? Equals(huap) : base.Equals(obj);

public override int GetHashCode() =>
typeof(HidUsageAndPage).GetHashCode() ^
UsagePage.GetHashCode() ^
Usage.GetHashCode();

public override string ToString() =>
$"{UsagePage:X2}:{Usage:X2}";
}
public struct HidUsageAndPage : IEquatable<HidUsageAndPage>
{
public static readonly HidUsageAndPage Mouse = new HidUsageAndPage(0x01, 0x02);
public static readonly HidUsageAndPage Joystick = new HidUsageAndPage(0x01, 0x04);
public static readonly HidUsageAndPage GamePad = new HidUsageAndPage(0x01, 0x05);
public static readonly HidUsageAndPage Keyboard = new HidUsageAndPage(0x01, 0x06);
public static readonly HidUsageAndPage Pen = new HidUsageAndPage(0x0D, 0x02);
public static readonly HidUsageAndPage TouchScreen = new HidUsageAndPage(0x0D, 0x04);
public static readonly HidUsageAndPage TouchPad = new HidUsageAndPage(0x0D, 0x05);

public HidUsageAndPage(ushort usagePage, ushort usage)
{
UsagePage = usagePage;
Usage = usage;
}

public ushort Usage
{
get;
}

public ushort UsagePage
{
get;
}

public static bool operator ==(HidUsageAndPage a, HidUsageAndPage b) =>
a.UsagePage == b.UsagePage &&
a.Usage == b.Usage;

public static bool operator !=(HidUsageAndPage a, HidUsageAndPage b) =>
a.UsagePage != b.UsagePage ||
a.Usage != b.Usage;

public bool Equals(HidUsageAndPage other) =>
GetHashCode() == other.GetHashCode();

public override bool Equals(object obj) =>
obj is HidUsageAndPage huap ? Equals(huap) : base.Equals(obj);

public override int GetHashCode() =>
typeof(HidUsageAndPage).GetHashCode() ^
UsagePage.GetHashCode() ^
Usage.GetHashCode();

public override string ToString() =>
$"{UsagePage:X2}:{Usage:X2}";
}
}
14 changes: 7 additions & 7 deletions RawInput.Sharp/Native/RawHid.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ namespace Linearstar.RawInput.Native
/// <summary>
/// RAWHID
/// </summary>
public struct RawHid
{
public struct RawHid
{
int dwSizeHid;
int dwCount;
byte[] rawData;

public int ElementSize => dwSizeHid;
public int Count => dwCount;
public int ElementSize => dwSizeHid;
public int Count => dwCount;
public unsafe byte[] RawData => rawData;

public static unsafe RawHid FromPointer(void* ptr)
Expand Down Expand Up @@ -59,7 +59,7 @@ public unsafe byte[] ToStructure()
return result;
}

public override string ToString() =>
$"{{Count: {Count}, Size: {ElementSize}, Content: {BitConverter.ToString(RawData).Replace("-", " ")}}}";
}
public override string ToString() =>
$"{{Count: {Count}, Size: {ElementSize}, Content: {BitConverter.ToString(RawData).Replace("-", " ")}}}";
}
}
48 changes: 24 additions & 24 deletions RawInput.Sharp/Native/RawKeyboard.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@ namespace Linearstar.RawInput.Native
/// <summary>
/// RAWKEYBOARD
/// </summary>
[StructLayout(LayoutKind.Sequential)]
public struct RawKeyboard
{
readonly ushort usMakeCode;
readonly RawKeyboardFlags usFlags;
readonly ushort usReserverd;
readonly ushort usVKey;
readonly uint ulMessage;
[StructLayout(LayoutKind.Sequential)]
public struct RawKeyboard
{
readonly ushort usMakeCode;
readonly RawKeyboardFlags usFlags;
readonly ushort usReserverd;
readonly ushort usVKey;
readonly uint ulMessage;
readonly uint ulExtraInformation;

public int ScanCode => usMakeCode;
public RawKeyboardFlags Flags => usFlags;
public int VirutalKey => usVKey;
public uint WindowMessage => ulMessage;
public uint ExtraInformation => ulExtraInformation;
public int ScanCode => usMakeCode;
public RawKeyboardFlags Flags => usFlags;
public int VirutalKey => usVKey;
public uint WindowMessage => ulMessage;
public uint ExtraInformation => ulExtraInformation;

public override string ToString() =>
$"{{Key: {VirutalKey}, ScanCode: {ScanCode}, Flags: {Flags}}}";
}
public override string ToString() =>
$"{{Key: {VirutalKey}, ScanCode: {ScanCode}, Flags: {Flags}}}";
}

[Flags]
public enum RawKeyboardFlags : ushort
{
Down,
Up,
LeftKey,
RightKey = 4,
}
[Flags]
public enum RawKeyboardFlags : ushort
{
Down,
Up,
LeftKey,
RightKey = 4,
}
}
Loading

0 comments on commit 0f491d2

Please sign in to comment.