X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_agl.c;h=d0e7c4595e28e0b3f6647e7062b6ca76f0beb317;hp=4ecbd2ee4b0a1ee74ead33481d4322b01847cb58;hb=3adc05093a95f863ba206a76848f81b393d1f4f4;hpb=6c4d997a497cb5afde74b4bf16f6a9ade5aca37e diff --git a/vid_agl.c b/vid_agl.c index 4ecbd2ee..d0e7c459 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,39 +60,58 @@ 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; 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; -void VID_GetWindowSize (int *x, int *y, int *width, int *height) +io_connect_t IN_GetIOHandle(void) { - *x = *y = 0; - *width = scr_width; - *height = scr_height; + 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; } -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 +122,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) @@ -147,10 +210,10 @@ void VID_Finish (qboolean allowmousegrab) Con_Printf("ERROR: can't %s vsync\n", vid_usevsync ? "activate" : "deactivate"); } - if (r_render.integer) + if (!vid_hidden) { CHECKGLERROR - if (r_speeds.integer || gl_finish.integer) + if (r_speeds.integer == 2 || gl_finish.integer) { qglFinish();CHECKGLERROR } @@ -275,6 +338,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; @@ -335,7 +399,7 @@ void VID_Shutdown(void) if (context == NULL && window == NULL) return; - IN_Activate(false); + VID_SetMouse(false, false, false); VID_RestoreSystemGamma(); if (context != NULL) @@ -400,13 +464,21 @@ static void VID_AppFocusChanged(qboolean windowIsActive) VID_RestoreSystemGamma(); } - if (sound_active != windowIsActive) + if (windowIsActive || !snd_mutewhenidle.integer) { - sound_active = windowIsActive; - if (sound_active) + if (!sound_active) + { S_UnblockSound (); - else + sound_active = true; + } + } + else + { + if (sound_active) + { S_BlockSound (); + sound_active = false; + } } } @@ -424,31 +496,43 @@ static void VID_ProcessPendingAsyncEvents (void) 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) +qboolean VID_InitMode(viddef_mode_t *mode) { - const EventTypeSpec winEvents[] = + const EventTypeSpec winEvents[] = { { kEventClassWindow, kEventWindowClosed }, { kEventClassWindow, kEventWindowCollapsing }, @@ -498,8 +582,8 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate // Create the window, a bit towards the center of the screen windowBounds.left = 100; windowBounds.top = 100; - windowBounds.right = width + 100; - windowBounds.bottom = height + 100; + windowBounds.right = mode->width + 100; + windowBounds.bottom = mode->height + 100; carbonError = CreateNewWindow(kDocumentWindowClass, kWindowStandardFloatingAttributes | kWindowStandardHandlerAttribute, &windowBounds, &window); if (carbonError != noErr || window == NULL) { @@ -517,9 +601,9 @@ 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, mode->bitsperpixel == 32, mode->fullscreen, mode->stereobuffer, mode->samples); - if (!fullscreen) + if (!mode->fullscreen) { // Output to Window pixelFormat = qaglChoosePixelFormat(NULL, 0, attributes); @@ -544,7 +628,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate // TOCHECK: not sure whether or not it's necessary to change the resolution // "by hand", or if aglSetFullscreen does the job anyway - refDisplayMode = CGDisplayBestModeForParametersAndRefreshRate(mainDisplay, bpp, width, height, refreshrate, NULL); + refDisplayMode = CGDisplayBestModeForParametersAndRefreshRateWithProperty(mainDisplay, mode->bitsperpixel, mode->width, mode->height, mode->refreshrate, kCGDisplayModeIsSafeForHardware, NULL); CGDisplaySwitchToMode(mainDisplay, refDisplayMode); DMGetGDeviceByDisplayID((DisplayIDType)mainDisplay, &gdhDisplay, false); @@ -585,9 +669,9 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate qaglDestroyPixelFormat(pixelFormat); // Attempt fullscreen if requested - if (fullscreen) + if (mode->fullscreen) { - qaglSetFullScreen (context, width, height, refreshrate, 0); + qaglSetFullScreen (context, mode->width, mode->height, mode->refreshrate, 0); error = qaglGetError(); if (error != AGL_NO_ERROR) { @@ -610,22 +694,16 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate } } - scr_width = width; - scr_height = height; - 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_isfullscreen = mode->fullscreen; vid_usingmouse = false; + vid_usinghidecursor = false; vid_hidden = false; vid_activewindow = true; sound_active = true; @@ -836,7 +914,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); } } @@ -892,11 +970,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; } @@ -1029,11 +1115,50 @@ void Sys_SendKeyEvents(void) void IN_Move (void) { - if (mouse_avail) +} + +static bool GetDictionaryBoolean(CFDictionaryRef d, const void *key) +{ + CFBooleanRef ref = (CFBooleanRef) CFDictionaryGetValue(d, key); + if(ref) + return CFBooleanGetValue(ref); + return false; +} + +long GetDictionaryLong(CFDictionaryRef d, const void *key) +{ + long value = 0; + CFNumberRef ref = (CFNumberRef) CFDictionaryGetValue(d, key); + if(ref) + CFNumberGetValue(ref, kCFNumberLongType, &value); + return value; +} + +size_t VID_ListModes(vid_mode_t *modes, size_t maxcount) +{ + CGDirectDisplayID mainDisplay = CGMainDisplayID(); + CFArrayRef vidmodes = CGDisplayAvailableModes(mainDisplay); + CFDictionaryRef thismode; + unsigned int n = CFArrayGetCount(vidmodes); + unsigned int i; + size_t k; + + k = 0; + for(i = 0; i < n; ++i) { - in_mouse_x = mouse_x; - in_mouse_y = mouse_y; + thismode = (CFDictionaryRef) CFArrayGetValueAtIndex(vidmodes, i); + if(!GetDictionaryBoolean(thismode, kCGDisplayModeIsSafeForHardware)) + continue; + + if(k >= maxcount) + break; + modes[k].width = GetDictionaryLong(thismode, kCGDisplayWidth); + modes[k].height = GetDictionaryLong(thismode, kCGDisplayHeight); + modes[k].bpp = GetDictionaryLong(thismode, kCGDisplayBitsPerPixel); + modes[k].refreshrate = GetDictionaryLong(thismode, kCGDisplayRefreshRate); + modes[k].pixelheight_num = 1; + modes[k].pixelheight_denom = 1; // OS X doesn't expose this either + ++k; } - mouse_x = 0; - mouse_y = 0; + return k; }