X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_agl.c;h=87559d36f19a980d4cf2b7f1336af3f9959087e5;hp=97c36dbfd80e2cd376fb58b5aaa96686e4c3afdc;hb=420be816bba26e6457f6c6001f0ceba564e889f0;hpb=144f44c523edfab569e960288dd6d84ad7f4d5f4 diff --git a/vid_agl.c b/vid_agl.c index 97c36dbf..87559d36 100644 --- a/vid_agl.c +++ b/vid_agl.c @@ -68,8 +68,6 @@ 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,13 +97,6 @@ io_connect_t IN_GetIOHandle() return iohandle; } -void VID_GetWindowSize (int *x, int *y, int *width, int *height) -{ - *x = *y = 0; - *width = scr_width; - *height = scr_height; -} - void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor) { if (!mouse_avail || !window) @@ -219,13 +210,10 @@ void VID_Finish (void) Con_Printf("ERROR: can't %s vsync\n", vid_usevsync ? "activate" : "deactivate"); } - if (r_render.integer) + if (!vid_hidden) { - CHECKGLERROR if (r_speeds.integer == 2 || gl_finish.integer) - { - qglFinish();CHECKGLERROR - } + GL_Finish(); qaglSwapBuffers(context); } VID_UpdateGamma(false, GAMMA_TABLE_SIZE); @@ -324,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); } @@ -408,6 +396,7 @@ void VID_Shutdown(void) if (context == NULL && window == NULL) return; + VID_EnableJoystick(false); VID_SetMouse(false, false, false); VID_RestoreSystemGamma(); @@ -473,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; + } } } @@ -531,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 }, @@ -583,8 +580,8 @@ int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshra // 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) { @@ -602,9 +599,9 @@ int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshra 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); @@ -629,7 +626,7 @@ int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshra // 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); @@ -670,9 +667,9 @@ int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshra 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) { @@ -695,18 +692,14 @@ int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshra } } - 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_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; @@ -1118,11 +1111,78 @@ 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) { + 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; } size_t VID_ListModes(vid_mode_t *modes, size_t maxcount) { - return 0; // FIXME implement this + 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) + { + 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; + } + return k; }