fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-19 10:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

tidied up whitespace in osx mouse acceleration hack code. fixed declaration

Browse source 
of the new cvar to use the new cvar flags.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@601 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2012-01-07 08:50:11 +00:00
parent 31ad97cccd
commit 5e9d475661
1 changed files with 39 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
quakespasm/Quake/in_sdl.c
View file

@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "SDL.h" #include "SDL.h"
#ifdef __APPLE__ #ifdef __APPLE__
// Mouse acceleration needs to be disabled /* Mouse acceleration needs to be disabled on OS X */
#define MACOS_X_ACCELERATION_HACK #define MACOS_X_ACCELERATION_HACK
#endif #endif
@ -54,7 +54,7 @@ static int buttonremap[] =
cvar_t m_filter = {"m_filter","0",CVAR_NONE}; cvar_t m_filter = {"m_filter","0",CVAR_NONE};
#ifdef MACOS_X_ACCELERATION_HACK #ifdef MACOS_X_ACCELERATION_HACK
cvar_t in_disablemacosxmouseaccel = {"in_disablemacosxmouseaccel", "1", true}; static cvar_t in_disablemacosxmouseaccel = {"in_disablemacosxmouseaccel", "1", CVAR_ARCHIVE};
static double originalMouseSpeed = -1.0; static double originalMouseSpeed = -1.0;
#endif #endif
@ -76,29 +76,24 @@ static int FilterMouseEvents (const SDL_Event *event)
} }
#ifdef MACOS_X_ACCELERATION_HACK #ifdef MACOS_X_ACCELERATION_HACK
/* static io_connect_t IN_GetIOHandle(void)
===============
IN_GetIOHandle
===============
*/
static io_connect_t IN_GetIOHandle(void) // mac os x mouse accel hack
{ {
io_connect_t iohandle = MACH_PORT_NULL; io_connect_t iohandle = MACH_PORT_NULL;
kern_return_t status; kern_return_t status;
io_service_t iohidsystem = MACH_PORT_NULL; io_service_t iohidsystem = MACH_PORT_NULL;
mach_port_t masterport; mach_port_t masterport;
status = IOMasterPort(MACH_PORT_NULL, &masterport); status = IOMasterPort(MACH_PORT_NULL, &masterport);
if(status != KERN_SUCCESS) if (status != KERN_SUCCESS)
return 0; return 0;
iohidsystem = IORegistryEntryFromPath(masterport, kIOServicePlane ":/IOResources/IOHIDSystem"); iohidsystem = IORegistryEntryFromPath(masterport, kIOServicePlane ":/IOResources/IOHIDSystem");
if(!iohidsystem) if (!iohidsystem)
return 0; return 0;
status = IOServiceOpen(iohidsystem, mach_task_self(), kIOHIDParamConnectType, &iohandle); status = IOServiceOpen(iohidsystem, mach_task_self(), kIOHIDParamConnectType, &iohandle);
IOObjectRelease(iohidsystem); IOObjectRelease(iohidsystem);
return iohandle; return iohandle;
} }
#endif #endif
@ -110,39 +105,35 @@ void IN_Activate (void)
return; return;
#ifdef MACOS_X_ACCELERATION_HACK #ifdef MACOS_X_ACCELERATION_HACK
// mac os x mouse accel hack /* Save the status of mouse acceleration */
if (originalMouseSpeed == -1 && in_disablemacosxmouseaccel.value)
{ {
// Save the status of mouse acceleration io_connect_t mouseDev = IN_GetIOHandle();
if (mouseDev != 0)
if (originalMouseSpeed == -1 && in_disablemacosxmouseaccel.value)
{ {
io_connect_t mouseDev = IN_GetIOHandle(); if (IOHIDGetAccelerationWithKey(mouseDev, CFSTR(kIOHIDMouseAccelerationType), &originalMouseSpeed) == kIOReturnSuccess)
if(mouseDev != 0)
{ {
if(IOHIDGetAccelerationWithKey(mouseDev, CFSTR(kIOHIDMouseAccelerationType), &originalMouseSpeed) == kIOReturnSuccess) if (IOHIDSetAccelerationWithKey(mouseDev, CFSTR(kIOHIDMouseAccelerationType), -1.0) != kIOReturnSuccess)
{ {
if(IOHIDSetAccelerationWithKey(mouseDev, CFSTR(kIOHIDMouseAccelerationType), -1.0) != kIOReturnSuccess) Con_Printf("WARNING: Could not disable mouse acceleration (failed at IOHIDSetAccelerationWithKey).\n");
{
Con_Printf("WARNING: Could not disable mouse acceleration (failed at IOHIDSetAccelerationWithKey).\n");
Cvar_Set ("in_disablemacosxmouseaccel", "0");
}
}
else
{
Con_Printf("WARNING: Could not disable mouse acceleration (failed at IOHIDGetAccelerationWithKey).\n");
Cvar_Set ("in_disablemacosxmouseaccel", "0"); Cvar_Set ("in_disablemacosxmouseaccel", "0");
} }
IOServiceClose(mouseDev);
} }
else else
{ {
Con_Printf("WARNING: Could not disable mouse acceleration (failed at IO_GetIOHandle).\n"); Con_Printf("WARNING: Could not disable mouse acceleration (failed at IOHIDGetAccelerationWithKey).\n");
Cvar_Set ("in_disablemacosxmouseaccel", "0"); Cvar_Set ("in_disablemacosxmouseaccel", "0");
} }
IOServiceClose(mouseDev);
}
else
{
Con_Printf("WARNING: Could not disable mouse acceleration (failed at IO_GetIOHandle).\n");
Cvar_Set ("in_disablemacosxmouseaccel", "0");
} }
} }
#endif #endif
if (SDL_WM_GrabInput(SDL_GRAB_QUERY) != SDL_GRAB_ON) if (SDL_WM_GrabInput(SDL_GRAB_QUERY) != SDL_GRAB_ON)
{ {
SDL_WM_GrabInput(SDL_GRAB_ON); SDL_WM_GrabInput(SDL_GRAB_ON);
@ -170,26 +161,23 @@ void IN_Deactivate (qboolean free_cursor)
return; return;
#ifdef MACOS_X_ACCELERATION_HACK #ifdef MACOS_X_ACCELERATION_HACK
// mac os x mouse accel hack if (originalMouseSpeed != -1.0)
{ {
if(originalMouseSpeed != -1.0) io_connect_t mouseDev = IN_GetIOHandle();
if (mouseDev != 0)
{ {
io_connect_t mouseDev = IN_GetIOHandle(); if (IOHIDSetAccelerationWithKey(mouseDev, CFSTR(kIOHIDMouseAccelerationType), originalMouseSpeed) != kIOReturnSuccess)
if(mouseDev != 0) Con_Printf("WARNING: Could not re-enable mouse acceleration (failed at IOHIDSetAccelerationWithKey).\n");
{ IOServiceClose(mouseDev);
if(IOHIDSetAccelerationWithKey(mouseDev, CFSTR(kIOHIDMouseAccelerationType), originalMouseSpeed) != kIOReturnSuccess)
Con_Printf("WARNING: Could not re-enable mouse acceleration (failed at IOHIDSetAccelerationWithKey).\n");
IOServiceClose(mouseDev);
}
else
{
Con_Printf("WARNING: Could not re-enable mouse acceleration (failed at IO_GetIOHandle).\n");
}
originalMouseSpeed = -1;
} }
else
{
Con_Printf("WARNING: Could not re-enable mouse acceleration (failed at IO_GetIOHandle).\n");
}
originalMouseSpeed = -1;
} }
#endif #endif
if (free_cursor) if (free_cursor)
{ {
if (SDL_WM_GrabInput(SDL_GRAB_QUERY) != SDL_GRAB_OFF) if (SDL_WM_GrabInput(SDL_GRAB_QUERY) != SDL_GRAB_OFF)
@ -228,7 +216,7 @@ void IN_Init (void)
#ifdef MACOS_X_ACCELERATION_HACK #ifdef MACOS_X_ACCELERATION_HACK
Cvar_RegisterVariable(&in_disablemacosxmouseaccel); Cvar_RegisterVariable(&in_disablemacosxmouseaccel);
#endif #endif
IN_Activate(); IN_Activate();
} }