From 4fefea3c8feaa601f1f8af1b79888da862a53119 Mon Sep 17 00:00:00 2001 From: Jinrong Xie Date: Mon, 29 Jun 2015 10:09:00 +0000 Subject: [PATCH 1/1] Added support for 3Dconnexion Space Navigator. (cherry picked from commit 5c1e897f1a843963f5f8e49314ce06424a2525b3) (cherry picked from commit 5c1e897f1a843963f5f8e49314ce06424a2525b3) git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1760 7f0cb862-5218-0410-a997-914c9d46530a --- src/mswin/fg_spaceball_mswin.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mswin/fg_spaceball_mswin.c b/src/mswin/fg_spaceball_mswin.c index 4d96c31..901954d 100644 --- a/src/mswin/fg_spaceball_mswin.c +++ b/src/mswin/fg_spaceball_mswin.c @@ -30,6 +30,8 @@ */ /* + * 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. */ @@ -68,8 +70,6 @@ void fgPlatformInitializeSpaceball(void) __fgSpaceball.hwndTarget = NULL; sball_initialized = 0; } - - return; } void fgPlatformSpaceballClose(void) @@ -94,6 +94,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 +102,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; -- 1.7.10.4