X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=vid_agl.c;h=2cf7194bc1edc202d9a5b6677575774c0713d497;hp=83053a36e655bf62716585ae9d3dd65148d51c55;hb=ecddae3859018ea01887528f3248f03a138be6c3;hpb=c98af94360edd985e70be8330bf04d7d695d9001 diff --git a/vid_agl.c b/vid_agl.c index 83053a36..2cf7194b 100644 --- a/vid_agl.c +++ b/vid_agl.c @@ -24,9 +24,17 @@ #include #include #include +#include #include +#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 +#endif // Tell startup code that we have a client int cl_available = true; @@ -38,24 +46,58 @@ AGLPixelFormat (*qaglChoosePixelFormat) (const AGLDevice *gdevs, GLint ndev, con AGLContext (*qaglCreateContext) (AGLPixelFormat pix, AGLContext share); GLboolean (*qaglDestroyContext) (AGLContext ctx); void (*qaglDestroyPixelFormat) (AGLPixelFormat pix); +const GLubyte* (*qaglErrorString) (GLenum code); +GLenum (*qaglGetError) (void); GLboolean (*qaglSetCurrentContext) (AGLContext ctx); 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; static qboolean vid_usingmouse = 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"}; + 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) { @@ -68,6 +110,8 @@ static void IN_Activate( qboolean grab ) { if (grab) { + if(vid_usingmouse && (vid_usingnoaccel != !!apple_mouse_noaccel.integer)) + IN_Activate(false); // ungrab first! if (!vid_usingmouse && mouse_avail && window) { Rect winBounds; @@ -85,14 +129,59 @@ 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; + 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()); @@ -109,7 +198,7 @@ void VID_Finish (qboolean allowmousegrab) // handle the mouse state when windowed if that's changed vid_usemouse = false; - if (allowmousegrab && vid_mouse.integer && !key_consoleactive && !cls.demoplayback) + if (allowmousegrab && vid_mouse.integer && !key_consoleactive && (key_dest != key_game || !cls.demoplayback)) vid_usemouse = true; if (!vid_activewindow) vid_usemouse = false; @@ -134,11 +223,50 @@ void VID_Finish (qboolean allowmousegrab) if (r_render.integer) { + CHECKGLERROR if (r_speeds.integer || gl_finish.integer) - qglFinish(); + { + qglFinish();CHECKGLERROR + } qaglSwapBuffers(context); } VID_UpdateGamma(false, GAMMA_TABLE_SIZE); + + if (apple_multithreadedgl.integer) + { + if (!multithreadedgl) + { + 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) + { + if(qCGLGetCurrentContext && qCGLEnable && qCGLDisable) + { + CGLContextObj ctx = qCGLGetCurrentContext(); + qCGLDisable(ctx, kCGLCEMPEngine); + multithreadedgl = false; + } + } + } } int VID_SetGamma(unsigned short *ramps, int rampsize) @@ -171,7 +299,7 @@ int VID_GetGamma(unsigned short *ramps, int rampsize) CGGammaValue table_green [GAMMA_TABLE_SIZE]; CGGammaValue table_blue [GAMMA_TABLE_SIZE]; CGTableCount actualsize = 0; - unsigned int i; + int i; // Get the gamma ramps from the system if (CGGetDisplayTransferByTable(CGMainDisplayID(), rampsize, table_red, table_green, table_blue, &actualsize) != CGDisplayNoErr) @@ -179,7 +307,7 @@ int VID_GetGamma(unsigned short *ramps, int rampsize) Con_Print("VID_GetGamma: ERROR: CGGetDisplayTransferByTable failed!\n"); return false; } - if (actualsize != rampsize) + if (actualsize != (unsigned int)rampsize) { Con_Printf("VID_GetGamma: ERROR: invalid gamma table size (%u != %u)\n", actualsize, rampsize); return false; @@ -200,8 +328,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) @@ -221,15 +348,21 @@ void InitSig(void) 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; @@ -242,6 +375,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(); @@ -250,7 +384,12 @@ static int GL_OpenLibrary(void) Con_Printf("Unable to open symbol list for %s\n", name); return false; } - strcpy(gl_driver, name); + 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; } @@ -259,9 +398,16 @@ 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) + if (context == NULL && window == NULL) return; IN_Activate(false); @@ -273,6 +419,9 @@ void VID_Shutdown(void) context = NULL; } + if (vid_isfullscreen) + CGReleaseAllDisplays(); + if (window != NULL) { DisposeWindow(window); @@ -317,24 +466,40 @@ static OSStatus MainWindowEventHandler (EventHandlerCallRef nextHandler, EventRe return err; } +static void VID_AppFocusChanged(qboolean windowIsActive) +{ + if (vid_activewindow != windowIsActive) + { + vid_activewindow = windowIsActive; + if (!vid_activewindow) + VID_RestoreSystemGamma(); + } + + if (sound_active != windowIsActive) + { + sound_active = windowIsActive; + if (sound_active) + S_UnblockSound (); + else + S_BlockSound (); + } +} + static void VID_ProcessPendingAsyncEvents (void) { // Collapsed / expanded if (AsyncEvent_Collapsed != vid_hidden) { vid_hidden = !vid_hidden; - vid_activewindow = false; - VID_RestoreSystemGamma(); + VID_AppFocusChanged(!vid_hidden); } // Closed if (AsyncEvent_Quitting) - { - Sys_Quit(); - } + Sys_Quit(0); } -static void VID_BuildAGLAttrib(GLint *attrib, GLint stencil, qboolean fullscreen) +static void VID_BuildAGLAttrib(GLint *attrib, qboolean stencil, qboolean fullscreen, qboolean stereobuffer, int samples) { *attrib++ = AGL_RGBA; *attrib++ = AGL_RED_SIZE;*attrib++ = 1; @@ -351,10 +516,24 @@ static void VID_BuildAGLAttrib(GLint *attrib, GLint stencil, qboolean fullscreen } 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 VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer, int samples) { const EventTypeSpec winEvents[] = { @@ -364,14 +543,11 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate }; OSStatus carbonError; Rect windowBounds; + CFStringRef windowTitle; AGLPixelFormat pixelFormat; GLint attributes [32]; GLenum error; - // FullScreen Display stuff - GDHandle gdhDisplay; // = GetMainDevice(); /*deprecated*/ - CGDirectDisplayID mainDisplay = CGMainDisplayID(); - if (!GL_OpenLibrary()) { Con_Printf("Unable to load GL driver\n"); @@ -382,6 +558,8 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate || (qaglCreateContext = (AGLContext (*) (AGLPixelFormat pix, AGLContext share))GL_GetProcAddress("aglCreateContext")) == NULL || (qaglDestroyContext = (GLboolean (*) (AGLContext ctx))GL_GetProcAddress("aglDestroyContext")) == NULL || (qaglDestroyPixelFormat = (void (*) (AGLPixelFormat pix))GL_GetProcAddress("aglDestroyPixelFormat")) == NULL + || (qaglErrorString = (const GLubyte* (*) (GLenum code))GL_GetProcAddress("aglErrorString")) == NULL + || (qaglGetError = (GLenum (*) (void))GL_GetProcAddress("aglGetError")) == NULL || (qaglSetCurrentContext = (GLboolean (*) (AGLContext ctx))GL_GetProcAddress("aglSetCurrentContext")) == NULL || (qaglSetDrawable = (GLboolean (*) (AGLContext ctx, AGLDrawable draw))GL_GetProcAddress("aglSetDrawable")) == NULL || (qaglSetFullScreen = (GLboolean (*) (AGLContext ctx, GLsizei width, GLsizei height, GLsizei freq, GLint device))GL_GetProcAddress("aglSetFullScreen")) == NULL @@ -394,6 +572,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; @@ -406,14 +590,13 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate carbonError = CreateNewWindow(kDocumentWindowClass, kWindowStandardFloatingAttributes | kWindowStandardHandlerAttribute, &windowBounds, &window); if (carbonError != noErr || window == NULL) { - Con_Printf("Unable to create window (error %d)\n", carbonError); + Con_Printf("Unable to create window (error %u)\n", (unsigned)carbonError); return false; } // Set the window title - CFStringRef windowTitle = CFSTR("DarkPlaces AGL"); + windowTitle = CFSTR("DarkPlaces AGL"); SetWindowTitleWithCFString(window, windowTitle); - CFRelease(windowTitle); // Install the callback function for the window events we can't get // through ReceiveNextEvent (i.e. close, collapse, and expand) @@ -421,41 +604,45 @@ 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); + VID_BuildAGLAttrib(attributes, bpp == 32, fullscreen, stereobuffer, samples); if (!fullscreen) { - // Output to Window - // Set pixel format with built attribs - // Note: use NULL then must use 0 + // Output to Window pixelFormat = qaglChoosePixelFormat(NULL, 0, attributes); - error = aglGetError(); + error = qaglGetError(); if (error != AGL_NO_ERROR) { Con_Printf("qaglChoosePixelFormat FAILED: %s\n", - (char *)aglErrorString(error)); + (char *)qaglErrorString(error)); ReleaseWindow(window); return false; } } - - if (fullscreen) + else // Output is fullScreen { - // Output is FullScreen - // Get the mainDisplay and set resolution to current - CGDisplayCapture (mainDisplay); - CFDictionaryRef refDisplayMode = CGDisplayBestModeForParameters (mainDisplay, bpp, width, height, NULL); - CGDisplaySwitchToMode (mainDisplay, refDisplayMode); - DMGetGDeviceByDisplayID ((DisplayIDType)mainDisplay, &gdhDisplay, false); - - // Set pixel format with built attribs - // Note: specifying a device is *required* for AGL_FullScreen + CGDirectDisplayID mainDisplay; + CFDictionaryRef refDisplayMode; + GDHandle gdhDisplay; + + // Get the mainDisplay and set resolution to current + mainDisplay = CGMainDisplayID(); + CGDisplayCapture(mainDisplay); + + // 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); + CGDisplaySwitchToMode(mainDisplay, refDisplayMode); + DMGetGDeviceByDisplayID((DisplayIDType)mainDisplay, &gdhDisplay, false); + + // Set pixel format with built attribs + // Note: specifying a device is *required* for AGL_FullScreen pixelFormat = qaglChoosePixelFormat(&gdhDisplay, 1, attributes); - error = aglGetError(); + error = qaglGetError(); if (error != AGL_NO_ERROR) { Con_Printf("qaglChoosePixelFormat FAILED: %s\n", - (char *)aglErrorString(error)); + (char *)qaglErrorString(error)); ReleaseWindow(window); return false; } @@ -463,23 +650,23 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate // Create a context using the pform context = qaglCreateContext(pixelFormat, NULL); - error = aglGetError(); + error = qaglGetError(); if (error != AGL_NO_ERROR) { Con_Printf("qaglCreateContext FAILED: %s\n", - (char *)aglErrorString(error)); + (char *)qaglErrorString(error)); } // Make the context the current one ('enable' it) - qaglSetCurrentContext(context); - error = aglGetError(); - if (error != AGL_NO_ERROR) - { - Con_Printf("qaglSetCurrentContext FAILED: %s\n", - (char *)aglErrorString(error)); - ReleaseWindow(window); - return false; - } + qaglSetCurrentContext(context); + error = qaglGetError(); + if (error != AGL_NO_ERROR) + { + Con_Printf("qaglSetCurrentContext FAILED: %s\n", + (char *)qaglErrorString(error)); + ReleaseWindow(window); + return false; + } // Discard pform qaglDestroyPixelFormat(pixelFormat); @@ -488,36 +675,26 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate if (fullscreen) { qaglSetFullScreen (context, width, height, refreshrate, 0); - error = aglGetError(); + error = qaglGetError(); if (error != AGL_NO_ERROR) { Con_Printf("qaglSetFullScreen FAILED: %s\n", - (char *)aglErrorString(error)); + (char *)qaglErrorString(error)); return false; - // FullScreen Failed - vid_isfullscreen = false; - } - else - { - // FullScreen Success - vid_isfullscreen = true; } } - - if (!fullscreen) + else { - // Note: this _is_ a Window != FullScreen - // Set Window as Drawable - qaglSetDrawable(context, GetWindowPort(window)); - error = aglGetError(); + // Set Window as Drawable + qaglSetDrawable(context, GetWindowPort(window)); + error = qaglGetError(); if (error != AGL_NO_ERROR) { Con_Printf("qaglSetDrawable FAILED: %s\n", - (char *)aglErrorString(error)); + (char *)qaglErrorString(error)); ReleaseWindow(window); return false; } - } scr_width = width; @@ -533,9 +710,18 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate 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_usingmouse = false; vid_hidden = false; vid_activewindow = true; + sound_active = true; GL_Init(); SelectWindow(window); @@ -546,107 +732,205 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate static void Handle_KeyMod(UInt32 keymod) { + const struct keymod_to_event_s { UInt32 keybit; keynum_t event; } keymod_events [] = + { + { cmdKey, K_AUX1 }, + { shiftKey, K_SHIFT }, + { alphaLock, K_CAPSLOCK }, + { optionKey, K_ALT }, + { controlKey, K_CTRL }, + { kEventKeyModifierNumLockMask, K_NUMLOCK }, + { kEventKeyModifierFnMask, K_AUX2 } + }; static UInt32 prev_keymod = 0; - UInt32 modChanges = prev_keymod ^ keymod; + unsigned int i; + UInt32 modChanges; - if ((modChanges & cmdKey) != 0) - { - Key_Event(K_AUX1, '\0', (keymod & cmdKey) != 0); - } - if ((modChanges & shiftKey) != 0 || (modChanges & rightShiftKey) != 0) - { - Key_Event(K_SHIFT, '\0', (keymod & shiftKey) != 0); - } - if ((modChanges & alphaLock) != 0) - { - Key_Event(K_CAPSLOCK, '\0', (keymod & alphaLock) != 0); - } - if ((modChanges & optionKey) != 0 || (modChanges & rightOptionKey) != 0) - { - Key_Event(K_ALT, '\0', (keymod & optionKey) != 0); - } - if ((modChanges & controlKey) != 0 || (modChanges & rightControlKey) != 0) - { - Key_Event(K_CTRL, '\0', (keymod & controlKey) != 0); - } - if ((modChanges & kEventKeyModifierNumLockMask) != 0) - { - Key_Event(K_NUMLOCK, '\0', (keymod & kEventKeyModifierNumLockMask) != 0); - } - if ((modChanges & kEventKeyModifierFnMask) != 0) + modChanges = prev_keymod ^ keymod; + if (modChanges == 0) + return; + + for (i = 0; i < sizeof(keymod_events) / sizeof(keymod_events[0]); i++) { - Key_Event(K_AUX2, '\0', (keymod & kEventKeyModifierFnMask) != 0); + UInt32 keybit = keymod_events[i].keybit; + + if ((modChanges & keybit) != 0) + Key_Event(keymod_events[i].event, '\0', (keymod & keybit) != 0); } prev_keymod = keymod; } -static void Handle_Key(unsigned char charcode, qboolean keypressed) +static void Handle_Key(unsigned char charcode, UInt32 mackeycode, qboolean keypressed) { unsigned int keycode = 0; char ascii = '\0'; - switch (charcode) + switch (mackeycode) { - case kHomeCharCode: - keycode = K_HOME; + case MK_ESCAPE: + keycode = K_ESCAPE; break; - case kEnterCharCode: - keycode = K_KP_ENTER; + case MK_F1: + keycode = K_F1; break; - case kEndCharCode: - keycode = K_END; + case MK_F2: + keycode = K_F2; + break; + case MK_F3: + keycode = K_F3; + break; + case MK_F4: + keycode = K_F4; + break; + case MK_F5: + keycode = K_F5; + break; + case MK_F6: + keycode = K_F6; break; - case kBackspaceCharCode: + case MK_F7: + keycode = K_F7; + break; + case MK_F8: + keycode = K_F8; + break; + case MK_F9: + keycode = K_F9; + break; + case MK_F10: + keycode = K_F10; + break; + case MK_F11: + keycode = K_F11; + break; + case MK_F12: + keycode = K_F12; + break; + case MK_SCROLLOCK: + keycode = K_SCROLLOCK; + break; + case MK_PAUSE: + keycode = K_PAUSE; + break; + case MK_BACKSPACE: keycode = K_BACKSPACE; break; - case kTabCharCode: - keycode = K_TAB; + case MK_INSERT: + keycode = K_INS; + break; + case MK_HOME: + keycode = K_HOME; break; - case kPageUpCharCode: + case MK_PAGEUP: keycode = K_PGUP; break; - case kPageDownCharCode: + case MK_NUMLOCK: + keycode = K_NUMLOCK; + break; + case MK_KP_EQUALS: + keycode = K_KP_EQUALS; + break; + case MK_KP_DIVIDE: + keycode = K_KP_DIVIDE; + break; + case MK_KP_MULTIPLY: + keycode = K_KP_MULTIPLY; + break; + case MK_TAB: + keycode = K_TAB; + break; + case MK_DELETE: + keycode = K_DEL; + break; + case MK_END: + keycode = K_END; + break; + case MK_PAGEDOWN: keycode = K_PGDN; break; - case kReturnCharCode: + case MK_KP7: + keycode = K_KP_7; + break; + case MK_KP8: + keycode = K_KP_8; + break; + case MK_KP9: + keycode = K_KP_9; + break; + case MK_KP_MINUS: + keycode = K_KP_MINUS; + break; + case MK_CAPSLOCK: + keycode = K_CAPSLOCK; + break; + case MK_RETURN: keycode = K_ENTER; break; - case kEscapeCharCode: - keycode = K_ESCAPE; + case MK_KP4: + keycode = K_KP_4; break; - case kLeftArrowCharCode: - keycode = K_LEFTARROW; + case MK_KP5: + keycode = K_KP_5; break; - case kRightArrowCharCode: - keycode = K_RIGHTARROW; + case MK_KP6: + keycode = K_KP_6; break; - case kUpArrowCharCode: - keycode = K_UPARROW; + case MK_KP_PLUS: + keycode = K_KP_PLUS; break; - case kDownArrowCharCode : - keycode = K_DOWNARROW; + case MK_KP1: + keycode = K_KP_1; break; - case kDeleteCharCode: - keycode = K_DEL; + case MK_KP2: + keycode = K_KP_2; break; - case 0: - case 191: - // characters 0 and 191 are sent by the mouse buttons (?!) + case MK_KP3: + keycode = K_KP_3; + break; + case MK_KP_ENTER: + case MK_IBOOK_ENTER: + keycode = K_KP_ENTER; + break; + case MK_KP0: + keycode = K_KP_0; + break; + case MK_KP_PERIOD: + keycode = K_KP_PERIOD; break; default: - if ('A' <= charcode && charcode <= 'Z') + switch(charcode) { - keycode = charcode + ('a' - 'A'); // lowercase it - ascii = charcode; - } - else if (charcode >= 32) - { - keycode = charcode; - ascii = charcode; + case kUpArrowCharCode: + keycode = K_UPARROW; + break; + case kLeftArrowCharCode: + keycode = K_LEFTARROW; + break; + case kDownArrowCharCode: + keycode = K_DOWNARROW; + break; + case kRightArrowCharCode: + keycode = K_RIGHTARROW; + break; + case 0: + case 191: + // characters 0 and 191 are sent by the mouse buttons (?!) + break; + default: + if ('A' <= charcode && charcode <= 'Z') + { + keycode = charcode + ('a' - 'A'); // lowercase it + ascii = charcode; + } + else if (charcode >= 32) + { + keycode = charcode; + ascii = charcode; + } + else + Con_DPrintf(">> UNKNOWN char/keycode: %d/%u <<\n", charcode, (unsigned) mackeycode); } - else - Con_Printf(">> UNKNOWN charcode: %d <<\n", charcode); } if (keycode != 0) @@ -723,28 +1007,31 @@ void Sys_SendKeyEvents(void) } default: - Con_Printf (">> kEventClassMouse (UNKNOWN eventKind: %d) <<\n", eventKind); + Con_Printf (">> kEventClassMouse (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); break; } } case kEventClassKeyboard: { - char keycode; + char charcode; + UInt32 keycode; switch (eventKind) { case kEventRawKeyDown: - GetEventParameter(theEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(keycode), NULL, &keycode); - Handle_Key(keycode, true); + GetEventParameter(theEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(charcode), NULL, &charcode); + GetEventParameter(theEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(keycode), NULL, &keycode); + Handle_Key(charcode, keycode, true); break; case kEventRawKeyRepeat: break; case kEventRawKeyUp: - GetEventParameter(theEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(keycode), NULL, &keycode); - Handle_Key(keycode, false); + GetEventParameter(theEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(charcode), NULL, &charcode); + GetEventParameter(theEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(keycode), NULL, &keycode); + Handle_Key(charcode, keycode, false); break; case kEventRawKeyModifiersChanged: @@ -765,33 +1052,32 @@ void Sys_SendKeyEvents(void) break; default: - Con_Printf (">> kEventClassKeyboard (UNKNOWN eventKind: %d) <<\n", eventKind); + Con_Printf (">> kEventClassKeyboard (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); break; } break; } case kEventClassTextInput: - Con_Printf(">> kEventClassTextInput (%d) <<\n", eventKind); + Con_Printf(">> kEventClassTextInput (%d) <<\n", (int)eventKind); break; case kEventClassApplication: switch (eventKind) { case kEventAppActivated : - vid_activewindow = true; + VID_AppFocusChanged(true); break; case kEventAppDeactivated: - vid_activewindow = false; - VID_RestoreSystemGamma(); + VID_AppFocusChanged(false); break; case kEventAppQuit: - Sys_Quit(); + Sys_Quit(0); break; case kEventAppActiveWindowChanged: break; default: - Con_Printf(">> kEventClassApplication (UNKNOWN eventKind: %d) <<\n", eventKind); + Con_Printf(">> kEventClassApplication (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); break; } break; @@ -802,7 +1088,7 @@ void Sys_SendKeyEvents(void) case kEventAppleEvent : break; default: - Con_Printf(">> kEventClassAppleEvent (UNKNOWN eventKind: %d) <<\n", eventKind); + Con_Printf(">> kEventClassAppleEvent (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); break; } break; @@ -813,7 +1099,7 @@ void Sys_SendKeyEvents(void) case kEventWindowUpdate : break; default: - Con_Printf(">> kEventClassWindow (UNKNOWN eventKind: %d) <<\n", eventKind); + Con_Printf(">> kEventClassWindow (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); break; } break;