X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=vid_agl.c;h=944f955901113b829bcec5e693f98f7dd3240f41;hb=74114c15d518859de79175ce60347ce6d959f81c;hp=cd62ab0775cafa60fad1c8ec16bdc3b9b350c1b1;hpb=c7e088e8d9564915c0c99b135508d8291aa821a1;p=xonotic%2Fdarkplaces.git diff --git a/vid_agl.c b/vid_agl.c index cd62ab07..944f9559 100644 --- a/vid_agl.c +++ b/vid_agl.c @@ -24,10 +24,17 @@ #include #include #include +#include #include +#include +#include +#include #include "vid_agl_mackeys.h" // this is SDL/src/video/maccommon/SDL_mackeys.h #include "quakedef.h" +#ifndef kCGLCEMPEngine +#define kCGLCEMPEngine 313 +#endif // Tell startup code that we have a client int cl_available = true; @@ -46,6 +53,9 @@ GLboolean (*qaglSetDrawable) (AGLContext ctx, AGLDrawable draw); GLboolean (*qaglSetFullScreen) (AGLContext ctx, GLsizei width, GLsizei height, GLsizei freq, GLint device); GLboolean (*qaglSetInteger) (AGLContext ctx, GLenum pname, const GLint *params); void (*qaglSwapBuffers) (AGLContext ctx); +CGLError (*qCGLEnable) (CGLContextObj ctx, CGLContextEnable pname); +CGLError (*qCGLDisable) (CGLContextObj ctx, CGLContextEnable pname); +CGLContextObj (*qCGLGetCurrentContext) (void); static qboolean multithreadedgl; static qboolean mouse_avail = true; @@ -59,11 +69,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) { @@ -93,6 +126,36 @@ static void IN_Activate( qboolean grab ) // Lock the mouse pointer at its current position CGAssociateMouseAndMouseCursorPosition(false); + // 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); + } + } + mouse_x = mouse_y = 0; vid_usingmouse = true; } @@ -101,6 +164,20 @@ static void IN_Activate( qboolean grab ) { 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()); @@ -151,32 +228,41 @@ void VID_Finish (qboolean allowmousegrab) } VID_UpdateGamma(false, GAMMA_TABLE_SIZE); -#ifdef kCGLCEMPEngine if (apple_multithreadedgl.integer) { if (!multithreadedgl) { - CGLError err = 0; - CGLContextObj ctx = CGLGetCurrentContext(); - err = CGLEnable(ctx, kCGLEMPEngine); - if (err == kCGLNoError) - multithreadedgl = true; + if(qCGLGetCurrentContext && qCGLEnable && qCGLDisable) + { + CGLContextObj ctx = qCGLGetCurrentContext(); + CGLError e = qCGLEnable(ctx, kCGLCEMPEngine); + if(e == kCGLNoError) + multithreadedgl = true; + else + { + Con_Printf("WARNING: can't enable multithreaded GL, error %d\n", (int) e); + Cvar_SetValueQuick(&apple_multithreadedgl, 0); + } + } else + { + Con_Printf("WARNING: can't enable multithreaded GL, CGL functions not present\n"); Cvar_SetValueQuick(&apple_multithreadedgl, 0); + } } } else { if (multithreadedgl) { - multithreadedgl = false; - CGLDisable(ctx, kCGLEMPEngine); + if(qCGLGetCurrentContext && qCGLEnable && qCGLDisable) + { + CGLContextObj ctx = qCGLGetCurrentContext(); + qCGLDisable(ctx, kCGLCEMPEngine); + multithreadedgl = false; + } } } -#else - if (apple_multithreadedgl.integer) - Cvar_SetValueQuick(&apple_multithreadedgl, 0); -#endif } int VID_SetGamma(unsigned short *ramps, int rampsize) @@ -238,8 +324,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) @@ -260,15 +345,20 @@ 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") || COM_CheckParm("-safe")) + if (COM_CheckParm ("-nomouse")) mouse_avail = false; } static void *prjobj = NULL; +static void *cglobj = NULL; static void GL_CloseLibrary(void) { + if (cglobj) + dlclose(cglobj); + cglobj = NULL; if (prjobj) dlclose(prjobj); prjobj = NULL; @@ -281,6 +371,7 @@ static void GL_CloseLibrary(void) static int GL_OpenLibrary(void) { const char *name = "/System/Library/Frameworks/AGL.framework/AGL"; + const char *name2 = "/System/Library/Frameworks/OpenGL.framework/OpenGL"; Con_Printf("Loading OpenGL driver %s\n", name); GL_CloseLibrary(); @@ -290,6 +381,11 @@ static int GL_OpenLibrary(void) return false; } strlcpy(gl_driver, name, sizeof(gl_driver)); + + Con_Printf("Loading OpenGL driver %s\n", name2); + if (!(cglobj = dlopen(name2, RTLD_LAZY))) + Con_Printf("Unable to open symbol list for %s; multithreaded GL disabled\n", name); + return true; } @@ -298,6 +394,13 @@ void *GL_GetProcAddress(const char *name) return dlsym(prjobj, name); } +static void *CGL_GetProcAddress(const char *name) +{ + if(!cglobj) + return NULL; + return dlsym(cglobj, name); +} + void VID_Shutdown(void) { if (context == NULL && window == NULL) @@ -389,7 +492,7 @@ 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) @@ -453,6 +556,12 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate return false; } + qCGLEnable = (CGLError (*) (CGLContextObj ctx, CGLContextEnable pname)) CGL_GetProcAddress("CGLEnable"); + qCGLDisable = (CGLError (*) (CGLContextObj ctx, CGLContextEnable pname)) CGL_GetProcAddress("CGLDisable"); + qCGLGetCurrentContext = (CGLContextObj (*) (void)) CGL_GetProcAddress("CGLGetCurrentContext"); + if(!qCGLEnable || !qCGLDisable || !qCGLGetCurrentContext) + Con_Printf("CGL functions not found; disabling multithreaded OpenGL\n"); + // Ignore the events from the previous window AsyncEvent_Quitting = false; AsyncEvent_Collapsed = false; @@ -798,7 +907,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); } } @@ -941,7 +1050,7 @@ void Sys_SendKeyEvents(void) VID_AppFocusChanged(false); break; case kEventAppQuit: - Sys_Quit(); + Sys_Quit(0); break; case kEventAppActiveWindowChanged: break;