--- a/src/SpacenavWrapper.cpp	Thu Mar 07 15:41:38 2019 +0100
+++ b/src/SpacenavWrapper.cpp	Thu Mar 07 16:20:51 2019 +0100
@@ -58,19 +58,22 @@
 	spnav_event event;
 
 	if (spnav_wait_event(&event)) {
-
-		// TODO: copy fields
+		e.type = event.type == SPNAV_EVENT_MOTION ? SpacenavWrapper::Event::Type::MOTION : SpacenavWrapper::Event::Type::BUTTON;
 
-
-		// TODO: remove logging
 		if (event.type == SPNAV_EVENT_MOTION) {
-			std::wcout << L"xxx motion event: t(" << event.motion.x << L", " << event.motion.y << L", " << event.motion.z << L") ";
-			std::wcout << L"r(" << event.motion.rx << L", " << event.motion.ry << L", " << event.motion.rz << L")" << std::endl;
+			e.motion.x = event.motion.x;
+			e.motion.y = event.motion.y;
+			e.motion.z = event.motion.z;
+			e.motion.rx = event.motion.rx;
+			e.motion.ry = event.motion.ry;
+			e.motion.rz = event.motion.rz;
+			e.motion.type = event.motion.type;
+			e.motion.period = event.motion.period;
 		} else { /* SPNAV_EVENT_BUTTON */
-			std::wcout << L"xxx button " << (event.button.press ? "press" : "release") << L" event b(" << event.button.bnum << L")" << std::endl;
+			e.button.number = event.button.bnum;
+			e.button.pressed = event.button.press;
 		}
 
-
 		return e;
 	} else {
 		// TODO: throw exception