#include <dlfcn.h>
#include <signal.h>
#include <AGL/agl.h>
+#include <OpenGL/OpenGL.h>
#include <Carbon/Carbon.h>
+#include "vid_agl_mackeys.h" // this is SDL/src/video/maccommon/SDL_mackeys.h
#include "quakedef.h"
+#ifndef kCGLCEMPEngine
+#define kCGLCEMPEngine 313
+#endif
// Tell startup code that we have a client
int cl_available = true;
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;
}
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;
+ 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
- Cvar_SetQuickValue(&apple_multithreadedgl, 0);
+ {
+ Con_Printf("WARNING: can't enable multithreaded GL, CGL functions not present\n");
+ Cvar_SetValueQuick(&apple_multithreadedgl, 0);
+ }
}
}
else
{
if (multithreadedgl)
{
- multithreadedgl = false;
- CGLDisable(ctx, kCGLEMPEngine);
+ if(qCGLGetCurrentContext && qCGLEnable && qCGLDisable)
+ {
+ CGLContextObj ctx = qCGLGetCurrentContext();
+ qCGLDisable(ctx, kCGLCEMPEngine);
+ multithreadedgl = false;
+ }
}
}
-#else
- if (apple_multithreadedgl.integer)
- Cvar_SetQuickValue(&apple_multithreadedgl, 0);
-#endif
}
int VID_SetGamma(unsigned short *ramps, int rampsize)
{
printf("Received signal %d, exiting...\n", sig);
VID_RestoreSystemGamma();
- Sys_Quit();
- exit(0);
+ Sys_Quit(1);
}
void InitSig(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;
}
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;
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();
return false;
}
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;
}
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)
// Closed
if (AsyncEvent_Quitting)
- Sys_Quit();
+ Sys_Quit(0);
}
static void VID_BuildAGLAttrib(GLint *attrib, qboolean stencil, qboolean fullscreen, qboolean stereobuffer)
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;
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 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 kBackspaceCharCode:
+ 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 0:
- case 191:
- // characters 0 and 191 are 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 (charcode >= 32)
+ 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)
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:
VID_AppFocusChanged(false);
break;
case kEventAppQuit:
- Sys_Quit();
+ Sys_Quit(0);
break;
case kEventAppActiveWindowChanged:
break;
projects / xonotic / darkplaces.git / blobdiff