X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=vid_agl.c;h=88e33a16e68e8a60971561f4af2f8063c49aec89;hb=6dab44a4a2dc52692d90438b14aef70a9ed96930;hp=cc1bb0c6e2d9dbdb5a9a7a53ee66a5bde81a0e95;hpb=dfe4cea30617a7a94d3285ed30dc96a45f69e2dd;p=xonotic%2Fdarkplaces.git diff --git a/vid_agl.c b/vid_agl.c index cc1bb0c6..88e33a16 100644 --- a/vid_agl.c +++ b/vid_agl.c @@ -26,8 +26,11 @@ #include #include #include -#include "vid_agl_mackeys.h" // this is SDL/src/video/maccommon/SDL_mackeys.h +#include +#include +#include #include "quakedef.h" +#include "vid_agl_mackeys.h" // this is SDL/src/video/maccommon/SDL_mackeys.h #ifndef kCGLCEMPEngine #define kCGLCEMPEngine 313 @@ -57,7 +60,8 @@ CGLContextObj (*qCGLGetCurrentContext) (void); static qboolean multithreadedgl; static qboolean mouse_avail = true; static qboolean vid_usingmouse = false; -static float mouse_x, mouse_y; +static qboolean vid_usinghidecursor = false; +static qboolean vid_usingnoaccel = false; static qboolean vid_isfullscreen = false; static qboolean vid_usingvsync = false; @@ -66,11 +70,34 @@ static qboolean sound_active = true; static int scr_width, scr_height; -static cvar_t apple_multithreadedgl = {CVAR_SAVE, "apple_multithreadedgl", "0", "makes use of a second thread for the OpenGL driver (if possible) rather than using the engine thread (note: this is done automatically on most other operating systems)"}; +static cvar_t apple_multithreadedgl = {CVAR_SAVE, "apple_multithreadedgl", "1", "makes use of a second thread for the OpenGL driver (if possible) rather than using the engine thread (note: this is done automatically on most other operating systems)"}; +static cvar_t apple_mouse_noaccel = {CVAR_SAVE, "apple_mouse_noaccel", "1", "disables mouse acceleration while DarkPlaces is active"}; static AGLContext context; static WindowRef window; +static double originalMouseSpeed = -1.0; + +io_connect_t IN_GetIOHandle() +{ + io_connect_t iohandle = MACH_PORT_NULL; + kern_return_t status; + io_service_t iohidsystem = MACH_PORT_NULL; + mach_port_t masterport; + + status = IOMasterPort(MACH_PORT_NULL, &masterport); + if(status != KERN_SUCCESS) + return 0; + + iohidsystem = IORegistryEntryFromPath(masterport, kIOServicePlane ":/IOResources/IOHIDSystem"); + if(!iohidsystem) + return 0; + + status = IOServiceOpen(iohidsystem, mach_task_self(), kIOHIDParamConnectType, &iohandle); + IOObjectRelease(iohidsystem); + + return iohandle; +} void VID_GetWindowSize (int *x, int *y, int *width, int *height) { @@ -79,17 +106,21 @@ void VID_GetWindowSize (int *x, int *y, int *width, int *height) *height = scr_height; } -static void IN_Activate( qboolean grab ) +void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor) { - if (grab) + if (!mouse_avail || !window) + relative = hidecursor = false; + + if (relative) { - if (!vid_usingmouse && mouse_avail && window) + if(vid_usingmouse && (vid_usingnoaccel != !!apple_mouse_noaccel.integer)) + VID_SetMouse(false, false, false); // ungrab first! + if (!vid_usingmouse) { Rect winBounds; CGPoint winCenter; SelectWindow(window); - CGDisplayHideCursor(CGMainDisplayID()); // Put the mouse cursor at the center of the window GetWindowBounds (window, kWindowContentRgn, &winBounds); @@ -100,38 +131,79 @@ static void IN_Activate( qboolean grab ) // Lock the mouse pointer at its current position CGAssociateMouseAndMouseCursorPosition(false); - mouse_x = mouse_y = 0; + // Save the status of mouse acceleration + originalMouseSpeed = -1.0; // in case of error + if(apple_mouse_noaccel.integer) + { + io_connect_t mouseDev = IN_GetIOHandle(); + if(mouseDev != 0) + { + if(IOHIDGetAccelerationWithKey(mouseDev, CFSTR(kIOHIDMouseAccelerationType), &originalMouseSpeed) == kIOReturnSuccess) + { + Con_DPrintf("previous mouse acceleration: %f\n", originalMouseSpeed); + if(IOHIDSetAccelerationWithKey(mouseDev, CFSTR(kIOHIDMouseAccelerationType), -1.0) != kIOReturnSuccess) + { + Con_Print("Could not disable mouse acceleration (failed at IOHIDSetAccelerationWithKey).\n"); + Cvar_SetValueQuick(&apple_mouse_noaccel, 0); + } + } + else + { + Con_Print("Could not disable mouse acceleration (failed at IOHIDGetAccelerationWithKey).\n"); + Cvar_SetValueQuick(&apple_mouse_noaccel, 0); + } + IOServiceClose(mouseDev); + } + else + { + Con_Print("Could not disable mouse acceleration (failed at IO_GetIOHandle).\n"); + Cvar_SetValueQuick(&apple_mouse_noaccel, 0); + } + } + vid_usingmouse = true; + vid_usingnoaccel = !!apple_mouse_noaccel.integer; } } else { if (vid_usingmouse) { + if(originalMouseSpeed != -1.0) + { + io_connect_t mouseDev = IN_GetIOHandle(); + if(mouseDev != 0) + { + Con_DPrintf("restoring mouse acceleration to: %f\n", originalMouseSpeed); + if(IOHIDSetAccelerationWithKey(mouseDev, CFSTR(kIOHIDMouseAccelerationType), originalMouseSpeed) != kIOReturnSuccess) + Con_Print("Could not re-enable mouse acceleration (failed at IOHIDSetAccelerationWithKey).\n"); + IOServiceClose(mouseDev); + } + else + Con_Print("Could not re-enable mouse acceleration (failed at IO_GetIOHandle).\n"); + } + CGAssociateMouseAndMouseCursorPosition(true); - CGDisplayShowCursor(CGMainDisplayID()); vid_usingmouse = false; } } + + if (vid_usinghidecursor != hidecursor) + { + vid_usinghidecursor = hidecursor; + if (hidecursor) + CGDisplayHideCursor(CGMainDisplayID()); + else + CGDisplayShowCursor(CGMainDisplayID()); + } } #define GAMMA_TABLE_SIZE 256 -void VID_Finish (qboolean allowmousegrab) +void VID_Finish (void) { - qboolean vid_usemouse; qboolean vid_usevsync; - // handle the mouse state when windowed if that's changed - vid_usemouse = false; - if (allowmousegrab && vid_mouse.integer && !key_consoleactive && (key_dest != key_game || !cls.demoplayback)) - vid_usemouse = true; - if (!vid_activewindow) - vid_usemouse = false; - if (vid_isfullscreen) - vid_usemouse = true; - IN_Activate(vid_usemouse); - // handle changes of the vsync option vid_usevsync = (vid_vsync.integer && !cls.timedemo); if (vid_usingvsync != vid_usevsync) @@ -254,8 +326,7 @@ void signal_handler(int sig) { printf("Received signal %d, exiting...\n", sig); VID_RestoreSystemGamma(); - Sys_Quit(); - exit(0); + Sys_Quit(1); } void InitSig(void) @@ -276,6 +347,7 @@ void VID_Init(void) { InitSig(); // trap evil signals Cvar_RegisterVariable(&apple_multithreadedgl); + Cvar_RegisterVariable(&apple_mouse_noaccel); // COMMANDLINEOPTION: Input: -nomouse disables mouse support (see also vid_mouse cvar) if (COM_CheckParm ("-nomouse")) mouse_avail = false; @@ -336,7 +408,7 @@ void VID_Shutdown(void) if (context == NULL && window == NULL) return; - IN_Activate(false); + VID_SetMouse(false, false, false); VID_RestoreSystemGamma(); if (context != NULL) @@ -422,32 +494,44 @@ static void VID_ProcessPendingAsyncEvents (void) // Closed if (AsyncEvent_Quitting) - Sys_Quit(); + Sys_Quit(0); } -static void VID_BuildAGLAttrib(GLint *attrib, qboolean stencil, qboolean fullscreen, qboolean stereobuffer) +static void VID_BuildAGLAttrib(GLint *attrib, qboolean stencil, qboolean fullscreen, qboolean stereobuffer, int samples) { *attrib++ = AGL_RGBA; - *attrib++ = AGL_RED_SIZE;*attrib++ = 1; - *attrib++ = AGL_GREEN_SIZE;*attrib++ = 1; - *attrib++ = AGL_BLUE_SIZE;*attrib++ = 1; + *attrib++ = AGL_RED_SIZE;*attrib++ = stencil ? 8 : 5; + *attrib++ = AGL_GREEN_SIZE;*attrib++ = stencil ? 8 : 5; + *attrib++ = AGL_BLUE_SIZE;*attrib++ = stencil ? 8 : 5; *attrib++ = AGL_DOUBLEBUFFER; - *attrib++ = AGL_DEPTH_SIZE;*attrib++ = 1; + *attrib++ = AGL_DEPTH_SIZE;*attrib++ = stencil ? 24 : 16; // if stencil is enabled, ask for alpha too if (stencil) { *attrib++ = AGL_STENCIL_SIZE;*attrib++ = 8; - *attrib++ = AGL_ALPHA_SIZE;*attrib++ = 1; + *attrib++ = AGL_ALPHA_SIZE;*attrib++ = 8; } if (fullscreen) *attrib++ = AGL_FULLSCREEN; if (stereobuffer) *attrib++ = AGL_STEREO; +#ifdef AGL_SAMPLE_BUFFERS_ARB +#ifdef AGL_SAMPLES_ARB + if (samples > 1) + { + *attrib++ = AGL_SAMPLE_BUFFERS_ARB; + *attrib++ = 1; + *attrib++ = AGL_SAMPLES_ARB; + *attrib++ = samples; + } +#endif +#endif + *attrib++ = AGL_NONE; } -int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer) +int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer, int samples) { const EventTypeSpec winEvents[] = { @@ -518,7 +602,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate GetEventTypeCount(winEvents), winEvents, window, NULL); // Create the desired attribute list - VID_BuildAGLAttrib(attributes, bpp == 32, fullscreen, stereobuffer); + VID_BuildAGLAttrib(attributes, bpp == 32, fullscreen, stereobuffer, samples); if (!fullscreen) { @@ -617,16 +701,14 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL) Sys_Error("glGetString not found in %s", gl_driver); - gl_renderer = (const char *)qglGetString(GL_RENDERER); - gl_vendor = (const char *)qglGetString(GL_VENDOR); - gl_version = (const char *)qglGetString(GL_VERSION); - gl_extensions = (const char *)qglGetString(GL_EXTENSIONS); + gl_platformextensions = ""; gl_platform = "AGL"; gl_videosyncavailable = true; multithreadedgl = false; vid_isfullscreen = fullscreen; vid_usingmouse = false; + vid_usinghidecursor = false; vid_hidden = false; vid_activewindow = true; sound_active = true; @@ -837,7 +919,7 @@ static void Handle_Key(unsigned char charcode, UInt32 mackeycode, qboolean keypr ascii = charcode; } else - Con_Printf(">> UNKNOWN char/keycode: %d/%u <<\n", charcode, (unsigned) mackeycode); + Con_DPrintf(">> UNKNOWN char/keycode: %d/%u <<\n", charcode, (unsigned) mackeycode); } } @@ -893,11 +975,19 @@ void Sys_SendKeyEvents(void) case kEventMouseDragged: { HIPoint deltaPos; + HIPoint windowPos; GetEventParameter(theEvent, kEventParamMouseDelta, typeHIPoint, NULL, sizeof(deltaPos), NULL, &deltaPos); + GetEventParameter(theEvent, kEventParamWindowMouseLocation, typeHIPoint, NULL, sizeof(windowPos), NULL, &windowPos); + + if (vid_usingmouse) + { + in_mouse_x += deltaPos.x; + in_mouse_y += deltaPos.y; + } - mouse_x += deltaPos.x; - mouse_y += deltaPos.y; + in_windowmouse_x = windowPos.x; + in_windowmouse_y = windowPos.y; break; } @@ -980,7 +1070,7 @@ void Sys_SendKeyEvents(void) VID_AppFocusChanged(false); break; case kEventAppQuit: - Sys_Quit(); + Sys_Quit(0); break; case kEventAppActiveWindowChanged: break; @@ -1030,11 +1120,4 @@ void Sys_SendKeyEvents(void) void IN_Move (void) { - if (mouse_avail) - { - in_mouse_x = mouse_x; - in_mouse_y = mouse_y; - } - mouse_x = 0; - mouse_y = 0; }