#include <dlfcn.h>
#include <signal.h>
#include <AGL/agl.h>
+#include <OpenGL/OpenGL.h>
#include <Carbon/Carbon.h>
+#include <IOKit/hidsystem/IOHIDLib.h>
+#include <IOKit/hidsystem/IOHIDParameter.h>
+#include <IOKit/hidsystem/event_status_driver.h>
#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;
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 float mouse_x, mouse_y;
+static qboolean vid_usinghidecursor = false;
+static qboolean vid_usingnoaccel = false;
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(void)
+{
+ 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)
{
*height = scr_height;
}
-static void IN_Activate( qboolean grab )
+void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor)
{
- if (grab)
+ if (!mouse_avail || !window)
+ relative = hidecursor = false;
+
+ if (relative)
{
- if (!vid_usingmouse && mouse_avail && window)
+ if(vid_usingmouse && (vid_usingnoaccel != !!apple_mouse_noaccel.integer))
+ 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);
// Lock the mouse pointer at its current position
CGAssociateMouseAndMouseCursorPosition(false);
- mouse_x = mouse_y = 0;
+ // 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);
+ }
+ }
+
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());
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)
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)
+ if (r_speeds.integer == 2 || gl_finish.integer)
{
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)
{
printf("Received signal %d, exiting...\n", sig);
VID_RestoreSystemGamma();
- Sys_Quit();
- exit(0);
+ Sys_Quit(1);
}
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;
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();
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;
}
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)
return;
- IN_Activate(false);
+ VID_SetMouse(false, false, false);
VID_RestoreSystemGamma();
if (context != NULL)
return err;
}
+static void VID_AppFocusChanged(qboolean windowIsActive)
+{
+ if (vid_activewindow != windowIsActive)
+ {
+ vid_activewindow = windowIsActive;
+ if (!vid_activewindow)
+ VID_RestoreSystemGamma();
+ }
+
+ if (windowIsActive || !snd_mutewhenidle.integer)
+ {
+ if (!sound_active)
+ {
+ S_UnblockSound ();
+ sound_active = true;
+ }
+ }
+ else
+ {
+ if (sound_active)
+ {
+ S_BlockSound ();
+ sound_active = false;
+ }
+ }
+}
+
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, qboolean 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;
- *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;
+ 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[] =
{
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;
// 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 = *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;
}
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)
{
// 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, bpp, *width, *height, refreshrate, kCGDisplayModeIsSafeForHardware, NULL);
CGDisplaySwitchToMode(mainDisplay, refDisplayMode);
DMGetGDeviceByDisplayID((DisplayIDType)mainDisplay, &gdhDisplay, false);
// Attempt fullscreen if requested
if (fullscreen)
{
- qaglSetFullScreen (context, width, height, refreshrate, 0);
+ qaglSetFullScreen (context, *width, *height, refreshrate, 0);
error = qaglGetError();
if (error != AGL_NO_ERROR)
{
}
}
- scr_width = width;
- scr_height = height;
+ 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;
+ multithreadedgl = false;
vid_isfullscreen = fullscreen;
vid_usingmouse = false;
+ vid_usinghidecursor = false;
vid_hidden = false;
vid_activewindow = true;
+ sound_active = true;
GL_Init();
SelectWindow(window);
static void Handle_KeyMod(UInt32 keymod)
{
- const struct keymod_to_event_s { int 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}
+ 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;
unsigned int i;
UInt32 modChanges;
modChanges = prev_keymod ^ keymod;
+ if (modChanges == 0)
+ return;
for (i = 0; i < sizeof(keymod_events) / sizeof(keymod_events[0]); i++)
{
- int keybit = keymod_events[i].keybit;
+ 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 kPageUpCharCode:
+ case MK_HOME:
+ keycode = K_HOME;
+ break;
+ 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)
case kEventMouseDragged:
{
HIPoint deltaPos;
+ HIPoint windowPos;
GetEventParameter(theEvent, kEventParamMouseDelta, typeHIPoint, NULL, sizeof(deltaPos), NULL, &deltaPos);
+ GetEventParameter(theEvent, kEventParamWindowMouseLocation, typeHIPoint, NULL, sizeof(windowPos), NULL, &windowPos);
+
+ if (vid_usingmouse)
+ {
+ in_mouse_x += deltaPos.x;
+ in_mouse_y += deltaPos.y;
+ }
- mouse_x += deltaPos.x;
- mouse_y += deltaPos.y;
+ in_windowmouse_x = windowPos.x;
+ in_windowmouse_y = windowPos.y;
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);
+ 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:
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;
case kEventAppleEvent :
break;
default:
- Con_Printf(">> kEventClassAppleEvent (UNKNOWN eventKind: %d) <<\n", eventKind);
+ Con_Printf(">> kEventClassAppleEvent (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind);
break;
}
break;
case kEventWindowUpdate :
break;
default:
- Con_Printf(">> kEventClassWindow (UNKNOWN eventKind: %d) <<\n", eventKind);
+ Con_Printf(">> kEventClassWindow (UNKNOWN eventKind: %u) <<\n", (unsigned)eventKind);
break;
}
break;
void IN_Move (void)
{
- if (mouse_avail)
+}
+
+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)
+{
+ 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;
}
projects / xonotic / darkplaces.git / blobdiff