Mono-threading to be compatible with unity

Program.cs

@@ -14,7 +14,7 @@ namespace SpaceNavWrapper
 			//	var ev = spnavwrapper.SpaceNav.Instance.WaitEvent(100);
 			//	Console.WriteLine(ev);
 			//}
-			SpaceNavDriver navDriver = new SpaceNavDriver();
+			SpaceNav navDriver = new SpaceNav();
 			navDriver.InitDevice();
 			navDriver.Button += OnButton;
 			navDriver.Motion += OnMotion;
@@ -22,9 +22,9 @@ namespace SpaceNavWrapper
             Console.CancelKeyPress += delegate {
 				navDriver.Dispose();
             };
-
 			for (; ; ) 
             {
+                navDriver.WaitEvent();
             }
 		}
 
@@ -35,7 +35,7 @@ namespace SpaceNavWrapper
 
 		private static void OnButton(object sender, EventArgs e)
 		{
-			Console.WriteLine("Button pressed");
+			Console.WriteLine(e);
 		}
 	}
 }

SpaceNav.cs

@@ -1,10 +1,9 @@
 using System;
 using System.Runtime.InteropServices;
-using System.Threading;
 
 namespace SpaceNavWrapper
 {
-	public class SpaceNavDriver : IDisposable
+	public class SpaceNav : IDisposable
 	{
 
 		const string DLL_NAME = "spnavhdi";
@@ -17,10 +16,8 @@ namespace SpaceNavWrapper
 		#endregion
 
 		public event EventHandler<MotionEventArgs> Motion;
-		public event EventHandler<EventArgs> Button;
+		public event EventHandler<ButtonEventArgs> Button;
 
-		private Thread eventThread;
-        private bool deviceReady;
 		private double _sensitivity = 1.0;
 		private int _threshold = 5;
 		private bool isDisposed;
@@ -38,7 +35,8 @@ namespace SpaceNavWrapper
 		private struct SpNavEventButton
 		{
 			public int type;
-            public int press;
+            [MarshalAs(UnmanagedType.Bool)]
+			public bool press;
 			public int bnum;
 		}
 
@@ -66,44 +64,37 @@ namespace SpaceNavWrapper
 		private static extern int spnav_deadzone(int threshold);
 		#endregion
 
-        public SpaceNavDriver()
-        {
-			eventThread = new Thread(HandleEvents)
-			{
-				IsBackground = true,
-				Name = "3Dconnexion-Event-Dispatcher"
-			};
-			eventThread.Start();
-        }
-        
 		public void InitDevice()
 		{
+			// TODO handle retcode and errors
 			spnav_open(SPNAV_VENDOR_ID, SPNAV_PRODUCT_ID);
-			spnav_deadzone(5);
-			deviceReady = true;
 		}
 
-		private void HandleEvents(object obj)
+		public void WaitEvent(int millis = -1)
-		{        
-            // Block while the device isn't ready
-            while (!deviceReady) {}
-            Console.WriteLine("Device ready !");
-			while (!isDisposed)
 		{
 			SpNavEvent sev = new SpNavEvent();
-				int ev_type = spnav_wait_event(ref sev);
+			int ev_type;
-				Console.WriteLine("Event type : {0}", sev.type);
+			if (millis == -1)
+			{
+				ev_type = spnav_wait_event(ref sev);
+			}
+			else
+			{
+				ev_type = spnav_wait_event_timeout(ref sev, (int)millis);
+			}
+
 			switch (ev_type)
 			{
 				case SPNAV_EVENT_BUTTON:
-						//return new SpaceNavButtonEvent(Convert.ToBoolean(sev.button.press), sev.button.bnum);
+					var e = sev.button;
-						Button(this, new EventArgs());
+					Button(this, new ButtonEventArgs(e.press, e.bnum));
 					break;
 				case SPNAV_EVENT_MOTION:
 					var ev = sev.motion;
 					Motion(this, new MotionEventArgs(ev.x, ev.y, ev.z, ev.rx, ev.ry, ev.rz));
 					break;
-                }
+				default:
+					break;
 			}
 		}
 

SpaceNavEvent.cs

@@ -26,12 +26,17 @@ namespace SpaceNavWrapper
 
 	public class ButtonEventArgs : EventArgs
 	{
-		public readonly int button;
+		public readonly bool Pressed;
-		public readonly bool pressed;
+		public readonly int Button;
         
+		public ButtonEventArgs(bool pressed, int button)
+		{
+			Pressed = pressed;
+			Button = button;
+		}
 		public override string ToString()
 		{
-			return string.Format("[ButtonEventArgs: button={0}, pressed={1}]", button, pressed);
+			return string.Format("[ButtonEventArgs: button={0}, pressed={1}]", Button, Pressed);
 		}
 	}
 }

spnav-csharp-wrapper.csproj

@@ -27,9 +27,9 @@
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="SpaceNav.cs" />
     <Compile Include="SpaceNavEvent.cs" />
     <Compile Include="Program.cs" />
+    <Compile Include="SpaceNav.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>