X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_agl.c;h=bacbb5ffd4d23a47fa49765cc489711257aa097c;hp=2cf7194bc1edc202d9a5b6677575774c0713d497;hb=6fb644eee19956bee121e1f2430d2b84067dc056;hpb=ecddae3859018ea01887528f3248f03a138be6c3 diff --git a/vid_agl.c b/vid_agl.c index 2cf7194b..bacbb5ff 100644 --- a/vid_agl.c +++ b/vid_agl.c @@ -60,16 +60,14 @@ CGLContextObj (*qCGLGetCurrentContext) (void); static qboolean multithreadedgl; static qboolean mouse_avail = true; static qboolean vid_usingmouse = false; +static qboolean vid_usinghidecursor = false; static qboolean vid_usingnoaccel = false; -static float mouse_x, mouse_y; 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", "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"}; @@ -78,7 +76,7 @@ static WindowRef window; static double originalMouseSpeed = -1.0; -io_connect_t IN_GetIOHandle() +io_connect_t IN_GetIOHandle(void) { io_connect_t iohandle = MACH_PORT_NULL; kern_return_t status; @@ -99,26 +97,21 @@ io_connect_t IN_GetIOHandle() return iohandle; } -void VID_GetWindowSize (int *x, int *y, int *width, int *height) +void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor) { - *x = *y = 0; - *width = scr_width; - *height = scr_height; -} + if (!mouse_avail || !window) + relative = hidecursor = false; -static void IN_Activate( qboolean grab ) -{ - if (grab) + if (relative) { if(vid_usingmouse && (vid_usingnoaccel != !!apple_mouse_noaccel.integer)) - IN_Activate(false); // ungrab first! - if (!vid_usingmouse && mouse_avail && window) + 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); @@ -159,7 +152,6 @@ static void IN_Activate( qboolean grab ) } } - mouse_x = mouse_y = 0; vid_usingmouse = true; vid_usingnoaccel = !!apple_mouse_noaccel.integer; } @@ -183,29 +175,26 @@ static void IN_Activate( qboolean grab ) } 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) @@ -221,13 +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) - { - qglFinish();CHECKGLERROR - } + if (r_speeds.integer == 2 || gl_finish.integer) + GL_Finish(); qaglSwapBuffers(context); } VID_UpdateGamma(false, GAMMA_TABLE_SIZE); @@ -326,7 +312,7 @@ int VID_GetGamma(unsigned short *ramps, int rampsize) void signal_handler(int sig) { - printf("Received signal %d, exiting...\n", sig); + Sys_PrintfToTerminal("Received signal %d, exiting...\n", sig); VID_RestoreSystemGamma(); Sys_Quit(1); } @@ -410,7 +396,8 @@ void VID_Shutdown(void) if (context == NULL && window == NULL) return; - IN_Activate(false); + VID_EnableJoystick(false); + VID_SetMouse(false, false, false); VID_RestoreSystemGamma(); if (context != NULL) @@ -475,13 +462,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; + } } } @@ -502,17 +497,17 @@ static void VID_ProcessPendingAsyncEvents (void) 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; @@ -533,9 +528,9 @@ static void VID_BuildAGLAttrib(GLint *attrib, qboolean stencil, qboolean fullscr *attrib++ = AGL_NONE; } -int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer, int samples) +qboolean VID_InitMode(viddef_mode_t *mode) { - const EventTypeSpec winEvents[] = + const EventTypeSpec winEvents[] = { { kEventClassWindow, kEventWindowClosed }, { kEventClassWindow, kEventWindowCollapsing }, @@ -585,8 +580,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) { @@ -604,9 +599,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, samples); + 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); @@ -631,7 +626,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); @@ -672,9 +667,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) { @@ -697,28 +692,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; - - Con_DPrintf("GL_VENDOR: %s\n", gl_vendor); - Con_DPrintf("GL_RENDERER: %s\n", gl_renderer); - Con_DPrintf("GL_VERSION: %s\n", gl_version); - Con_DPrintf("GL_EXTENSIONS: %s\n", gl_extensions); - Con_DPrintf("%s_EXTENSIONS: %s\n", gl_platform, gl_platformextensions); multithreadedgl = false; - vid_isfullscreen = fullscreen; + vid_isfullscreen = mode->fullscreen; vid_usingmouse = false; + vid_usinghidecursor = false; vid_hidden = false; vid_activewindow = true; sound_active = true; @@ -985,11 +968,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); - mouse_x += deltaPos.x; - mouse_y += deltaPos.y; + if (vid_usingmouse) + { + in_mouse_x += deltaPos.x; + in_mouse_y += deltaPos.y; + } + + in_windowmouse_x = windowPos.x; + in_windowmouse_y = windowPos.y; break; } @@ -1120,13 +1111,83 @@ void Sys_SendKeyEvents(void) } } +void VID_BuildJoyState(vid_joystate_t *joystate) +{ + VID_Shared_BuildJoyState_Begin(joystate); + VID_Shared_BuildJoyState_Finish(joystate); +} + +void VID_EnableJoystick(qboolean enable) +{ + int index = joy_enable.integer > 0 ? joy_index.integer : -1; + qboolean success = false; + int sharedcount = 0; + sharedcount = VID_Shared_SetJoystick(index); + if (index >= 0 && index < sharedcount) + success = true; + + // update cvar containing count of XInput joysticks + if (joy_detected.integer != sharedcount) + Cvar_SetValueQuick(&joy_detected, sharedcount); + + Cvar_SetValueQuick(&joy_active, success ? 1 : 0); +} + void IN_Move (void) { - if (mouse_avail) + vid_joystate_t joystate; + VID_EnableJoystick(true); + VID_BuildJoyState(&joystate); + VID_ApplyJoyState(&joystate); +} + +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; +} + +vid_mode_t *VID_GetDesktopMode(void) +{ + return NULL; // FIXME add desktopfullscreen +} + +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; }