X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_agl.c;h=482c40f79fa4046cd481d2d68053fa2cc485bcb6;hb=679f31232d927e129a0d37d0325a9e62ff8845ad;hp=6e3f566392f0b9c709a113d1fe2290d010ee9a44;hpb=0adc2b2b9840aa8c9e4e5689c274debd8525c170;p=xonotic%2Fdarkplaces.git diff --git a/vid_agl.c b/vid_agl.c index 6e3f5663..482c40f7 100644 --- a/vid_agl.c +++ b/vid_agl.c @@ -3,7 +3,7 @@ Mac OS X OpenGL and input module, using Carbon and AGL - Copyright (C) 2005 Mathieu Olivier + Copyright (C) 2005-2006 Mathieu Olivier This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,32 +25,44 @@ #include #include #include +#include "vid_agl_mackeys.h" // this is SDL/src/video/maccommon/SDL_mackeys.h #include "quakedef.h" // Tell startup code that we have a client int cl_available = true; +qboolean vid_supportrefreshrate = true; + // AGL prototypes AGLPixelFormat (*qaglChoosePixelFormat) (const AGLDevice *gdevs, GLint ndev, const GLint *attribList); 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); +static qboolean multithreadedgl; static qboolean mouse_avail = true; static qboolean vid_usingmouse = 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", "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 AGLContext context; -static WindowRef window; +static WindowRef window; void VID_GetWindowSize (int *x, int *y, int *width, int *height) @@ -70,7 +82,7 @@ static void IN_Activate( qboolean grab ) CGPoint winCenter; SelectWindow(window); - HideCursor(); + CGDisplayHideCursor(CGMainDisplayID()); // Put the mouse cursor at the center of the window GetWindowBounds (window, kWindowContentRgn, &winBounds); @@ -90,20 +102,22 @@ static void IN_Activate( qboolean grab ) if (vid_usingmouse) { CGAssociateMouseAndMouseCursorPosition(true); - ShowCursor(); + CGDisplayShowCursor(CGMainDisplayID()); vid_usingmouse = false; } } } -void VID_Finish (void) +#define GAMMA_TABLE_SIZE 256 +void VID_Finish (qboolean allowmousegrab) { qboolean vid_usemouse; + qboolean vid_usevsync; // handle the mouse state when windowed if that's changed vid_usemouse = false; - if (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; @@ -111,24 +125,113 @@ void VID_Finish (void) 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) + { + GLint sync = (vid_usevsync ? 1 : 0); + + if (qaglSetInteger(context, AGL_SWAP_INTERVAL, &sync) == GL_TRUE) + { + vid_usingvsync = vid_usevsync; + Con_DPrintf("Vsync %s\n", vid_usevsync ? "activated" : "deactivated"); + } + else + Con_Printf("ERROR: can't %s vsync\n", vid_usevsync ? "activate" : "deactivate"); + } + if (r_render.integer) { + CHECKGLERROR if (r_speeds.integer || gl_finish.integer) - qglFinish(); + { + qglFinish();CHECKGLERROR + } qaglSwapBuffers(context); } + 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; + else + Cvar_SetValueQuick(&apple_multithreadedgl, 0); + } + } + else + { + if (multithreadedgl) + { + multithreadedgl = false; + CGLDisable(ctx, kCGLEMPEngine); + } + } +#else + if (apple_multithreadedgl.integer) + Cvar_SetValueQuick(&apple_multithreadedgl, 0); +#endif } -int VID_SetGamma(unsigned short *ramps) +int VID_SetGamma(unsigned short *ramps, int rampsize) { - // TODO - return false; + CGGammaValue table_red [GAMMA_TABLE_SIZE]; + CGGammaValue table_green [GAMMA_TABLE_SIZE]; + CGGammaValue table_blue [GAMMA_TABLE_SIZE]; + int i; + + // Convert the unsigned short table into 3 float tables + for (i = 0; i < rampsize; i++) + table_red[i] = (float)ramps[i] / 65535.0f; + for (i = 0; i < rampsize; i++) + table_green[i] = (float)ramps[i + rampsize] / 65535.0f; + for (i = 0; i < rampsize; i++) + table_blue[i] = (float)ramps[i + 2 * rampsize] / 65535.0f; + + if (CGSetDisplayTransferByTable(CGMainDisplayID(), rampsize, table_red, table_green, table_blue) != CGDisplayNoErr) + { + Con_Print("VID_SetGamma: ERROR: CGSetDisplayTransferByTable failed!\n"); + return false; + } + + return true; } -int VID_GetGamma(unsigned short *ramps) +int VID_GetGamma(unsigned short *ramps, int rampsize) { - // TODO - return false; + CGGammaValue table_red [GAMMA_TABLE_SIZE]; + CGGammaValue table_green [GAMMA_TABLE_SIZE]; + CGGammaValue table_blue [GAMMA_TABLE_SIZE]; + CGTableCount actualsize = 0; + int i; + + // Get the gamma ramps from the system + if (CGGetDisplayTransferByTable(CGMainDisplayID(), rampsize, table_red, table_green, table_blue, &actualsize) != CGDisplayNoErr) + { + Con_Print("VID_GetGamma: ERROR: CGGetDisplayTransferByTable failed!\n"); + return false; + } + if (actualsize != (unsigned int)rampsize) + { + Con_Printf("VID_GetGamma: ERROR: invalid gamma table size (%u != %u)\n", actualsize, rampsize); + return false; + } + + // Convert the 3 float tables into 1 unsigned short table + for (i = 0; i < rampsize; i++) + ramps[i] = table_red[i] * 65535.0f; + for (i = 0; i < rampsize; i++) + ramps[i + rampsize] = table_green[i] * 65535.0f; + for (i = 0; i < rampsize; i++) + ramps[i + 2 * rampsize] = table_blue[i] * 65535.0f; + + return true; } void signal_handler(int sig) @@ -156,8 +259,9 @@ void InitSig(void) void VID_Init(void) { InitSig(); // trap evil signals + Cvar_RegisterVariable(&apple_multithreadedgl); // 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; } @@ -185,7 +289,7 @@ 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)); return true; } @@ -196,18 +300,21 @@ void *GL_GetProcAddress(const char *name) void VID_Shutdown(void) { - if (context == NULL || window == NULL) + if (context == NULL && window == NULL) return; - + IN_Activate(false); VID_RestoreSystemGamma(); - + if (context != NULL) { qaglDestroyContext(context); context = NULL; } - + + if (vid_isfullscreen) + CGReleaseAllDisplays(); + if (window != NULL) { DisposeWindow(window); @@ -227,23 +334,20 @@ static qboolean AsyncEvent_Collapsed = false; static OSStatus MainWindowEventHandler (EventHandlerCallRef nextHandler, EventRef event, void *userData) { OSStatus err = noErr; - + switch (GetEventKind (event)) { case kEventWindowClosed: - //Con_Printf(">> kEventWindowClosed (received) <<\n"); AsyncEvent_Quitting = true; break; // Docked (start) case kEventWindowCollapsing: - //Con_Printf(">> kEventWindowCollapsing (received) <<\n"); AsyncEvent_Collapsed = true; break; // Undocked / restored (end) case kEventWindowExpanded: - //Con_Printf(">> kEventWindowExpanded (received) <<\n"); AsyncEvent_Collapsed = false; break; @@ -255,32 +359,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) { - /* - if (vid_hidden) - Con_Printf(">> kEventWindowExpanded (processed) <<\n"); - else - Con_Printf(">> kEventWindowCollapsing (processed) <<\n"); - */ - vid_hidden = !vid_hidden; - vid_activewindow = false; - VID_RestoreSystemGamma(); + VID_AppFocusChanged(!vid_hidden); } - + // Closed if (AsyncEvent_Quitting) - { - //Con_Printf(">> kEventWindowClosed (processed) <<\n"); Sys_Quit(); - } } -static void VID_BuildAGLAttrib(GLint *attrib, int stencil, qboolean fullscreen) +static void VID_BuildAGLAttrib(GLint *attrib, qboolean stencil, qboolean fullscreen, qboolean stereobuffer) { *attrib++ = AGL_RGBA; *attrib++ = AGL_RED_SIZE;*attrib++ = 1; @@ -288,6 +400,7 @@ static void VID_BuildAGLAttrib(GLint *attrib, int stencil, qboolean fullscreen) *attrib++ = AGL_BLUE_SIZE;*attrib++ = 1; *attrib++ = AGL_DOUBLEBUFFER; *attrib++ = AGL_DEPTH_SIZE;*attrib++ = 1; + // if stencil is enabled, ask for alpha too if (stencil) { @@ -296,10 +409,12 @@ static void VID_BuildAGLAttrib(GLint *attrib, int stencil, qboolean fullscreen) } if (fullscreen) *attrib++ = AGL_FULLSCREEN; + if (stereobuffer) + *attrib++ = AGL_STEREO; *attrib++ = AGL_NONE; } -int VID_InitMode(int fullscreen, int width, int height, int bpp) +int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer) { const EventTypeSpec winEvents[] = { @@ -309,9 +424,10 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) }; OSStatus carbonError; Rect windowBounds; - GDHandle screen; + CFStringRef windowTitle; AGLPixelFormat pixelFormat; GLint attributes [32]; + GLenum error; if (!GL_OpenLibrary()) { @@ -319,14 +435,17 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) return false; } - if ((qaglChoosePixelFormat = GL_GetProcAddress("aglChoosePixelFormat")) == NULL - || (qaglCreateContext = GL_GetProcAddress("aglCreateContext")) == NULL - || (qaglDestroyContext = GL_GetProcAddress("aglDestroyContext")) == NULL - || (qaglDestroyPixelFormat = GL_GetProcAddress("aglDestroyPixelFormat")) == NULL - || (qaglSetCurrentContext = GL_GetProcAddress("aglSetCurrentContext")) == NULL - || (qaglSetDrawable = GL_GetProcAddress("aglSetDrawable")) == NULL - || (qaglSetFullScreen = GL_GetProcAddress("aglSetFullScreen")) == NULL - || (qaglSwapBuffers = GL_GetProcAddress("aglSwapBuffers")) == NULL + if ((qaglChoosePixelFormat = (AGLPixelFormat (*) (const AGLDevice *gdevs, GLint ndev, const GLint *attribList))GL_GetProcAddress("aglChoosePixelFormat")) == NULL + || (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 + || (qaglSetInteger = (GLboolean (*) (AGLContext ctx, GLenum pname, const GLint *params))GL_GetProcAddress("aglSetInteger")) == NULL + || (qaglSwapBuffers = (void (*) (AGLContext ctx))GL_GetProcAddress("aglSwapBuffers")) == NULL ) { Con_Printf("AGL functions not found\n"); @@ -338,77 +457,140 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) AsyncEvent_Quitting = false; AsyncEvent_Collapsed = false; - // Create the window - SetRect(&windowBounds, 0, 0, width, height); - OffsetRect(&windowBounds, 100, 100); // move it a bit towards the center of the screen + // 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; 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) InstallWindowEventHandler (window, NewEventHandlerUPP (MainWindowEventHandler), - GetEventTypeCount(winEvents), winEvents, window, NULL); + GetEventTypeCount(winEvents), winEvents, window, NULL); + + // Create the desired attribute list + VID_BuildAGLAttrib(attributes, bpp == 32, fullscreen, stereobuffer); - screen = GetGWorldDevice(GetWindowPort(window)); - if (screen == NULL) + if (!fullscreen) { - Con_Printf("Unable to get GDevice for window\n"); - ReleaseWindow(window); - return false; + // Output to Window + pixelFormat = qaglChoosePixelFormat(NULL, 0, attributes); + error = qaglGetError(); + if (error != AGL_NO_ERROR) + { + Con_Printf("qaglChoosePixelFormat FAILED: %s\n", + (char *)qaglErrorString(error)); + ReleaseWindow(window); + return false; + } + } + else // Output is 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 = qaglGetError(); + if (error != AGL_NO_ERROR) + { + Con_Printf("qaglChoosePixelFormat FAILED: %s\n", + (char *)qaglErrorString(error)); + ReleaseWindow(window); + return false; + } + } + + // Create a context using the pform + context = qaglCreateContext(pixelFormat, NULL); + error = qaglGetError(); + if (error != AGL_NO_ERROR) + { + Con_Printf("qaglCreateContext FAILED: %s\n", + (char *)qaglErrorString(error)); } - // Create and set pixel format - VID_BuildAGLAttrib(attributes, bpp == 32, fullscreen); - pixelFormat = qaglChoosePixelFormat(&screen, 1, attributes); - if (pixelFormat == NULL) + // Make the context the current one ('enable' it) + qaglSetCurrentContext(context); + error = qaglGetError(); + if (error != AGL_NO_ERROR) { - Con_Printf("Unable to create pixel format\n"); + Con_Printf("qaglSetCurrentContext FAILED: %s\n", + (char *)qaglErrorString(error)); ReleaseWindow(window); return false; } - // Set context and show the window - context = qaglCreateContext(pixelFormat, NULL); + // Discard pform qaglDestroyPixelFormat(pixelFormat); - if (context == NULL) - Sys_Error ("aglCreateContext failed\n"); - if (!qaglSetDrawable(context, GetWindowPort(window))) - Sys_Error ("aglSetDrawable failed\n"); - if (!qaglSetCurrentContext(context)) - Sys_Error ("aglSetCurrentContext failed\n"); - - scr_width = width; - scr_height = height; - - if ((qglGetString = GL_GetProcAddress("glGetString")) == NULL) - Sys_Error("glGetString not found in %s", gl_driver); + // Attempt fullscreen if requested if (fullscreen) { - if (!qaglSetFullScreen (context, width, height, 0, 0)) - Sys_Error("aglSetFullScreen failed\n"); - vid_isfullscreen = true; + qaglSetFullScreen (context, width, height, refreshrate, 0); + error = qaglGetError(); + if (error != AGL_NO_ERROR) + { + Con_Printf("qaglSetFullScreen FAILED: %s\n", + (char *)qaglErrorString(error)); + return false; + } + } + else + { + // Set Window as Drawable + qaglSetDrawable(context, GetWindowPort(window)); + error = qaglGetError(); + if (error != AGL_NO_ERROR) + { + Con_Printf("qaglSetDrawable FAILED: %s\n", + (char *)qaglErrorString(error)); + ReleaseWindow(window); + return false; + } } - gl_renderer = qglGetString(GL_RENDERER); - gl_vendor = qglGetString(GL_VENDOR); - gl_version = qglGetString(GL_VERSION); - gl_extensions = qglGetString(GL_EXTENSIONS); + 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_platform = "AGL"; - gl_videosyncavailable = false; + gl_videosyncavailable = true; + multithreadedgl = false; + vid_isfullscreen = fullscreen; vid_usingmouse = false; vid_hidden = false; vid_activewindow = true; + sound_active = true; GL_Init(); SelectWindow(window); @@ -419,106 +601,205 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp) 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(qbyte 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 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 kBackspaceCharCode: + 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 MK_KP3: + keycode = K_KP_3; + break; + case MK_KP_ENTER: + case MK_IBOOK_ENTER: + keycode = K_KP_ENTER; break; - case 191: - // char 191 is sent by the mouse buttons (?!) + case MK_KP0: + keycode = K_KP_0; + break; + case MK_KP_PERIOD: + keycode = K_KP_PERIOD; break; default: - if ('A' <= charcode && charcode <= 'Z') - { - keycode = charcode + ('a' - 'A'); // lowercase it - ascii = charcode; - } - else if (32 <= charcode && charcode <= 126) + switch(charcode) { - 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_Printf(">> UNKNOWN char/keycode: %d/%u <<\n", charcode, (unsigned) mackeycode); } - else - Con_Printf(">> UNKNOWN charcode: %d <<\n", charcode); } if (keycode != 0) @@ -529,8 +810,8 @@ void Sys_SendKeyEvents(void) { EventRef theEvent; EventTargetRef theTarget; - - // Start by processing the asynchronous events we received since the previous frame + + // Start by processing the asynchronous events we received since the previous frame VID_ProcessPendingAsyncEvents(); theTarget = GetEventDispatcherTarget(); @@ -556,26 +837,25 @@ void Sys_SendKeyEvents(void) default: case kEventMouseButtonPrimary: key = K_MOUSE1; - //Con_Printf(">> kEventMouseButtonPrimary <<\n"); break; case kEventMouseButtonSecondary: key = K_MOUSE2; - //Con_Printf(">> kEventMouseButtonSecondary <<\n"); break; case kEventMouseButtonTertiary: key = K_MOUSE3; - //Con_Printf(">> kEventMouseButtonTertiary <<\n"); break; } Key_Event(key, '\0', eventKind == kEventMouseDown); break; + // Note: These two events are mutual exclusives + // Treat MouseDragged in the same statement, so we don't block MouseMoved while a mousebutton is held case kEventMouseMoved: + case kEventMouseDragged: { HIPoint deltaPos; - + GetEventParameter(theEvent, kEventParamMouseDelta, typeHIPoint, NULL, sizeof(deltaPos), NULL, &deltaPos); - //Con_Printf(">> kEventMouseMoved (%f, %f) <<\n", deltaPos.x, deltaPos.y); mouse_x += deltaPos.x; mouse_y += deltaPos.y; @@ -588,7 +868,6 @@ void Sys_SendKeyEvents(void) unsigned int wheelEvent; GetEventParameter(theEvent, kEventParamMouseWheelDelta, typeSInt32, NULL, sizeof(delta), NULL, &delta); - //Con_Printf(">> kEventMouseWheelMoved (delta: %d) <<\n", delta); wheelEvent = (delta > 0) ? K_MWHEELUP : K_MWHEELDOWN; Key_Event(wheelEvent, 0, true); @@ -596,91 +875,78 @@ void Sys_SendKeyEvents(void) break; } - case kEventMouseDragged: - //Con_Printf(">> kEventMouseDragged <<\n"); - break; - 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); - //Con_Printf(">> kEventRawKeyDown (%d) <<\n", keycode); + 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: - //Con_Printf(">> kEventRawKeyRepeat <<\n"); break; case kEventRawKeyUp: - GetEventParameter(theEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(keycode), NULL, &keycode); - Handle_Key(keycode, false); - //Con_Printf(">> kEventRawKeyUp (%d) <<\n", keycode); + 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: { UInt32 keymod = 0; GetEventParameter(theEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(keymod), NULL, &keymod); Handle_KeyMod(keymod); - //Con_Printf(">> kEventRawKeyModifiersChanged (0x%08X) <<\n", keymod); break; } case kEventHotKeyPressed: - //Con_Printf(">> kEventHotKeyPressed <<\n"); break; case kEventHotKeyReleased: - //Con_Printf(">> kEventHotKeyReleased <<\n"); break; case kEventMouseWheelMoved: - //Con_Printf(">> kEventMouseWheelMoved - via a keyboard event (!?) <<\n"); 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 : - //Con_Printf(">> kEventAppActivated <<\n"); - vid_activewindow = true; + VID_AppFocusChanged(true); break; case kEventAppDeactivated: - //Con_Printf(">> kEventAppDeactivated <<\n"); - vid_activewindow = false; - VID_RestoreSystemGamma(); + VID_AppFocusChanged(false); break; case kEventAppQuit: - //Con_Printf(">> kEventAppQuit <<\n"); Sys_Quit(); break; case kEventAppActiveWindowChanged: - //Con_Printf(">> kEventAppActiveWindowChanged <<\n"); break; default: - Con_Printf(">> kEventClassApplication (UNKNOWN eventKind: %d) <<\n", eventKind); + Con_Printf(">> kEventClassApplication (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); break; } break; @@ -689,10 +955,9 @@ void Sys_SendKeyEvents(void) switch (eventKind) { case kEventAppleEvent : - //Con_Printf(">> kEventAppleEvent <<\n"); break; default: - Con_Printf(">> kEventClassAppleEvent (UNKNOWN eventKind: %d) <<\n", eventKind); + Con_Printf(">> kEventClassAppleEvent (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); break; } break; @@ -701,16 +966,14 @@ void Sys_SendKeyEvents(void) switch (eventKind) { case kEventWindowUpdate : - //Con_Printf(">> kEventWindowUpdate <<\n"); break; default: - Con_Printf(">> kEventClassWindow (UNKNOWN eventKind: %d) <<\n", eventKind); + Con_Printf(">> kEventClassWindow (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind); break; } break; case kEventClassControl: - //Con_Printf(">> kEventClassControl (%d) <<\n", eventKind); break; default: