// 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 (*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 mouse_avail = true;
static float mouse_x, mouse_y;
static qboolean vid_isfullscreen = false;
+static qboolean vid_usingvsync = false;
static int scr_width, scr_height;
}
}
-void VID_Finish (void)
+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 && !cls.demoplayback)
vid_usemouse = true;
if (!vid_activewindow)
vid_usemouse = false;
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)
{
if (r_speeds.integer || gl_finish.integer)
}
}
+#define GAMMA_TABLE_SIZE 256
int VID_SetGamma(unsigned short *ramps)
{
- // TODO
- return false;
+ CGGammaValue table_red [GAMMA_TABLE_SIZE];
+ CGGammaValue table_green [GAMMA_TABLE_SIZE];
+ CGGammaValue table_blue [GAMMA_TABLE_SIZE];
+ unsigned int i;
+
+ // Convert the unsigned short table into 3 float tables
+ for (i = 0; i < GAMMA_TABLE_SIZE; i++)
+ table_red[i] = (float)ramps[i] / 65535.0f;
+ for (i = 0; i < GAMMA_TABLE_SIZE; i++)
+ table_green[i] = (float)ramps[i + GAMMA_TABLE_SIZE] / 65535.0f;
+ for (i = 0; i < GAMMA_TABLE_SIZE; i++)
+ table_blue[i] = (float)ramps[i + 2 * GAMMA_TABLE_SIZE] / 65535.0f;
+
+ if (CGSetDisplayTransferByTable(CGMainDisplayID(), GAMMA_TABLE_SIZE, 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)
{
- // TODO
- return false;
+ CGGammaValue table_red [GAMMA_TABLE_SIZE];
+ CGGammaValue table_green [GAMMA_TABLE_SIZE];
+ CGGammaValue table_blue [GAMMA_TABLE_SIZE];
+ CGTableCount actualsize = 0;
+ unsigned int i;
+
+ // Get the gamma ramps from the system
+ if (CGGetDisplayTransferByTable(CGMainDisplayID(), GAMMA_TABLE_SIZE, table_red, table_green, table_blue, &actualsize) != CGDisplayNoErr)
+ {
+ Con_Print("VID_GetGamma: ERROR: CGGetDisplayTransferByTable failed!\n");
+ return false;
+ }
+ if (actualsize != GAMMA_TABLE_SIZE)
+ {
+ Con_Printf("VID_GetGamma: ERROR: invalid gamma table size (%u != %u)\n", actualsize, GAMMA_TABLE_SIZE);
+ return false;
+ }
+
+ // Convert the 3 float tables into 1 unsigned short table
+ for (i = 0; i < GAMMA_TABLE_SIZE; i++)
+ ramps[i] = table_red[i] * 65535.0f;
+ for (i = 0; i < GAMMA_TABLE_SIZE; i++)
+ ramps[i + GAMMA_TABLE_SIZE] = table_green[i] * 65535.0f;
+ for (i = 0; i < GAMMA_TABLE_SIZE; i++)
+ ramps[i + 2 * GAMMA_TABLE_SIZE] = table_blue[i] * 65535.0f;
+
+ return true;
}
void signal_handler(int sig)
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;
// 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();
// Closed
if (AsyncEvent_Quitting)
{
- //Con_Printf(">> kEventWindowClosed (processed) <<\n");
Sys_Quit();
}
}
*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)
{
*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)
{
const EventTypeSpec winEvents[] =
{
|| (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
)
{
// Set context and show the window
context = qaglCreateContext(pixelFormat, NULL);
- qaglDestroyPixelFormat(pixelFormat);
if (context == NULL)
- Sys_Error ("aglCreateContext failed\n");
- if (!qaglSetDrawable(context, GetWindowPort(window)))
- Sys_Error ("aglSetDrawable failed\n");
+ Sys_Error ("aglCreateContext failed");
+ if (fullscreen)
+ {
+ if (!qaglSetFullScreen (context, width, height, refreshrate, 0))
+ Sys_Error("aglSetFullScreen failed");
+ vid_isfullscreen = true;
+ }
+ else
+ {
+ if (!qaglSetDrawable(context, GetWindowPort(window)))
+ Sys_Error ("aglSetDrawable failed");
+ }
if (!qaglSetCurrentContext(context))
- Sys_Error ("aglSetCurrentContext failed\n");
+ Sys_Error ("aglSetCurrentContext failed");
+ qaglDestroyPixelFormat(pixelFormat);
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);
- if (fullscreen)
- {
- if (!qaglSetFullScreen (context, width, height, 0, 0))
- Sys_Error("aglSetFullScreen failed\n");
- vid_isfullscreen = true;
- }
-
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;
vid_usingmouse = false;
vid_hidden = false;
case kDeleteCharCode:
keycode = K_DEL;
break;
+ case 0:
case 191:
- // char 191 is sent by the mouse buttons (?!)
+ // 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 (32 <= charcode && charcode <= 126)
+ else if (charcode >= 32)
{
keycode = charcode;
ascii = charcode;
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);
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;
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);
}
case kEventMouseDragged:
- //Con_Printf(">> kEventMouseDragged <<\n");
break;
default:
case kEventRawKeyDown:
GetEventParameter(theEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(keycode), NULL, &keycode);
Handle_Key(keycode, true);
- //Con_Printf(">> kEventRawKeyDown (%d) <<\n", keycode);
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);
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:
switch (eventKind)
{
case kEventAppActivated :
- //Con_Printf(">> kEventAppActivated <<\n");
vid_activewindow = true;
break;
case kEventAppDeactivated:
- //Con_Printf(">> kEventAppDeactivated <<\n");
vid_activewindow = false;
VID_RestoreSystemGamma();
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);
switch (eventKind)
{
case kEventAppleEvent :
- //Con_Printf(">> kEventAppleEvent <<\n");
break;
default:
Con_Printf(">> kEventClassAppleEvent (UNKNOWN eventKind: %d) <<\n", eventKind);
switch (eventKind)
{
case kEventWindowUpdate :
- //Con_Printf(">> kEventWindowUpdate <<\n");
break;
default:
Con_Printf(">> kEventClassWindow (UNKNOWN eventKind: %d) <<\n", eventKind);
break;
case kEventClassControl:
- //Con_Printf(">> kEventClassControl (%d) <<\n", eventKind);
break;
default:
projects / xonotic / darkplaces.git / blobdiff