X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmswin%2Ffg_spaceball_mswin.c;h=277b648635ed83a32e724b9ab4df52f91f948b05;hb=4e0dd98c5cef6701f92c134bdf11ceecbdd6ad8f;hp=4d96c31a0b4265fe025a5d2bba38afa6db1ca837;hpb=cae6701c343e3a42bc9504f14e6d83e4ca9d8119;p=freeglut

diff --git a/src/mswin/fg_spaceball_mswin.c b/src/mswin/fg_spaceball_mswin.c
index 4d96c31..277b648 100644
--- a/src/mswin/fg_spaceball_mswin.c
+++ b/src/mswin/fg_spaceball_mswin.c
@@ -10,7 +10,7 @@
  * Copyright (c) 2014 Jinrong Xie. All Rights Reserved.
  * Written by Jinrong Xie <stonexjr at gmail.com>
  * Modification date: Wed Dec 24, 2014
-
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
@@ -30,11 +30,14 @@
  */
 
 /*
+ * Modified by Jinrong Xie (stonexjr@gmail.com) 12/24/2014
+ * for Space Navigator support on Windows.
  * This code is enhanced by at least supporting 3Dconnexion's 
  * six degree of freedom navigator.
  */
 
 #include <GL/freeglut.h>
+#include <stdlib.h>
 #include "../fg_internal.h"
 
 enum {
@@ -51,7 +54,7 @@ RAWINPUTDEVICE __fgSpaceball = { 0x01, 0x08, 0x00, 0x00 };
 void fgPlatformInitializeSpaceball(void)
 {
 	HWND hwnd;
-    sball_initialized = 1;
+	sball_initialized = 1;
 	if (!fgStructure.CurrentWindow)
 	{
 		sball_initialized = 0;
@@ -68,8 +71,6 @@ void fgPlatformInitializeSpaceball(void)
 		__fgSpaceball.hwndTarget = NULL;
 		sball_initialized = 0;
 	}
-
-	return;
 }
 
 void fgPlatformSpaceballClose(void)
@@ -94,6 +95,7 @@ void fgPlatformSpaceballSetWindow(SFG_Window *window)
 
 int fgIsSpaceballWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
+	return 0;
 }
 
 void fgSpaceballHandleWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam)
@@ -101,7 +103,6 @@ void fgSpaceballHandleWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam)
 	#define LOGITECH_VENDOR_ID 0x46d
 	HRAWINPUT hRawInput = (HRAWINPUT)lParam;
 	UINT inputCode = (UINT)wParam;
-	RAWINPUTHEADER hdr;
 	UINT size;
 	BYTE *rawInputBuffer;
 	PRAWINPUT pRawInput;
@@ -121,7 +122,7 @@ void fgSpaceballHandleWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam)
 	if (res == -1)
 		return;
 
-	rawInputBuffer = (BYTE*)malloc(size);
+	rawInputBuffer = malloc(size * sizeof *rawInputBuffer);
 	pRawInput = (PRAWINPUT)rawInputBuffer;
 
 	res = GetRawInputData(hRawInput, RID_INPUT, pRawInput, &size, sizeof(RAWINPUTHEADER));
@@ -148,7 +149,7 @@ void fgSpaceballHandleWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam)
 		// X goes right, Y goes up and Z goes towards viewer, e.g.
 		// the one used in OpenGL
 		if (pRawInput->data.hid.bRawData[0] == 
-			SPNAV_EVENT_MOTION_TRANSLATION)//0x01)
+			SPNAV_EVENT_MOTION_TRANSLATION)
 		{ // Translation vector
 			short* pnData = (short*)(&pRawInput->data.hid.bRawData[1]);
 			short X =  pnData[0];
@@ -157,7 +158,7 @@ void fgSpaceballHandleWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam)
 			INVOKE_WCB(*window, SpaceMotion, (X, Y, Z));
 		}
 		else if (pRawInput->data.hid.bRawData[0] == 
-				SPNAV_EVENT_MOTION_ROTATION)//0x02)
+				SPNAV_EVENT_MOTION_ROTATION)
 		{ // Axis aligned rotation vector
 			short* pnData = (short*)(&pRawInput->data.hid.bRawData[1]);
 			short rX =  pnData[0];
@@ -166,7 +167,7 @@ void fgSpaceballHandleWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam)
 			INVOKE_WCB(*window, SpaceRotation, (rX, rY, rZ));
 		}
 		else if (pRawInput->data.hid.bRawData[0] == 
-				 SPNAV_EVENT_BUTTON)//0x03)
+				 SPNAV_EVENT_BUTTON)
 		{ // State of the keys
 			unsigned long dwKeystate = *(unsigned long*)(&pRawInput->data.hid.bRawData[1]);
 			unsigned int state = GLUT_UP;
@@ -188,4 +189,4 @@ void fgSpaceballHandleWinEvent(HWND hwnd, WPARAM wParam, LPARAM lParam)
 			__fgSpaceKeystate = dwKeystate;
 		}
 	}
-}
\ No newline at end of file
+}