#include <X11/cursorfont.h>
#include <X11/extensions/XShm.h>
+#if !defined(__APPLE__) && !defined(__MACH__)
#include <X11/extensions/xf86dga.h>
+#endif
#include <X11/extensions/xf86vmode.h>
#include "quakedef.h"
+// Tell startup code that we have a client
int cl_available = true;
//GLX prototypes
static float mouse_x, mouse_y;
static int p_mouse_x, p_mouse_y;
+#ifndef __APPLE__
cvar_t vid_dga = {CVAR_SAVE, "vid_dga", "1"};
cvar_t vid_dga_mouseaccel = {0, "vid_dga_mouseaccel", "1"};
+#endif
qboolean vidmode_ext = false;
XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
+#ifndef __APPLE__
if (vid_dga.integer)
{
int MajorVersion, MinorVersion;
if (!XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion))
{
// unable to query, probalby not supported
- Con_Printf( "Failed to detect XF86DGA Mouse\n" );
+ Con_Print( "Failed to detect XF86DGA Mouse\n" );
vid_dga.integer = 0;
}
else
}
}
else
+#endif
XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, scr_width / 2, scr_height / 2);
XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
if (!vidx11_display || !win)
return;
+#ifndef __APPLE__
if (vid_dga.integer == 1)
XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0);
+#endif
XUngrabPointer(vidx11_display, CurrentTime);
XUngrabKeyboard(vidx11_display, CurrentTime);
// mouse moved
if (usingmouse)
{
+#ifndef __APPLE__
if (vid_dga.integer == 1)
{
mouse_x += event.xmotion.x_root * vid_dga_mouseaccel.value;
mouse_y += event.xmotion.y_root * vid_dga_mouseaccel.value;
}
else
+#endif
{
if (!event.xmotion.send_event)
p_mouse_y = event.xmotion.y;
}
}
- else
- ui_mouseupdate(event.xmotion.x, event.xmotion.y);
+ //else
+ // ui_mouseupdate(event.xmotion.x, event.xmotion.y);
break;
case ButtonPress:
case MapNotify:
// window restored
vid_hidden = false;
- vid_allowhwgamma = true;
+ vid_activewindow = false;
+ VID_RestoreSystemGamma();
break;
case UnmapNotify:
// window iconified/rolledup/whatever
vid_hidden = true;
- vid_allowhwgamma = false;
+ vid_activewindow = false;
VID_RestoreSystemGamma();
break;
case FocusIn:
// window is now the input focus
- vid_allowhwgamma = true;
+ vid_activewindow = true;
break;
case FocusOut:
// window is no longer the input focus
- vid_allowhwgamma = false;
+ vid_activewindow = false;
VID_RestoreSystemGamma();
break;
case EnterNotify:
// mouse entered window
- vid_allowhwgamma = true;
break;
case LeaveNotify:
// mouse left window
- vid_allowhwgamma = false;
- VID_RestoreSystemGamma();
break;
}
}
ctx = NULL;
GL_CloseLibrary();
+ Key_ClearStates ();
}
void signal_handler(int sig)
int usemouse;
if (r_render.integer)
{
- qglFinish();
+ if (r_speeds.integer || gl_finish.integer)
+ qglFinish();
qglXSwapBuffers(vidx11_display, win);
}
void VID_Init(void)
{
+#ifndef __APPLE__
Cvar_RegisterVariable (&vid_dga);
Cvar_RegisterVariable (&vid_dga_mouseaccel);
+#endif
InitSig(); // trap evil signals
+// COMMANDLINEOPTION: Input: -nomouse disables mouse support (see also vid_mouse cvar)
if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe"))
mouse_avail = false;
}
*attrib++ = None;
}
-int VID_InitMode(int fullscreen, int width, int height, int bpp, int stencil)
+int VID_InitMode(int fullscreen, int width, int height, int bpp)
{
int i;
int attrib[32];
int MajorVersion, MinorVersion;
const char *drivername;
+#if defined(__APPLE__) && defined(__MACH__)
+ drivername = "/usr/X11R6/lib/libGL.1.dylib";
+#else
drivername = "libGL.so.1";
+#endif
+// COMMANDLINEOPTION: Linux GLX: -gl_driver <drivername> selects a GL driver library, default is libGL.so.1, useful only for using fxmesa or similar, if you don't know what this is for, you don't need it
+// COMMANDLINEOPTION: BSD GLX: -gl_driver <drivername> selects a GL driver library, default is libGL.so.1, useful only for using fxmesa or similar, if you don't know what this is for, you don't need it
+// LordHavoc: although this works on MacOSX, it's useless there (as there is only one system libGL)
i = COM_CheckParm("-gl_driver");
if (i && i < com_argc - 1)
drivername = com_argv[i + 1];
if (!(vidx11_display = XOpenDisplay(NULL)))
{
- Con_Printf("Couldn't open the X display\n");
+ Con_Print("Couldn't open the X display\n");
return false;
}
return false;
}
- VID_BuildGLXAttrib(attrib, stencil);
+ VID_BuildGLXAttrib(attrib, bpp == 32);
visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib);
if (!visinfo)
{
- Con_Printf("Couldn't get an RGB, Double-buffered, Depth visual\n");
+ Con_Print("Couldn't get an RGB, Double-buffered, Depth visual\n");
return false;
}
gl_platform = "GLX";
gl_platformextensions = qglXQueryExtensionsString(vidx11_display, vidx11_screen);
+ gl_videosyncavailable = false;
+
+// COMMANDLINEOPTION: Linux GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions)
+// COMMANDLINEOPTION: BSD GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions)
+// COMMANDLINEOPTION: MacOSX GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions)
GL_CheckExtension("GLX_ARB_get_proc_address", getprocaddressfuncs, "-nogetprocaddress", false);
+// COMMANDLINEOPTION: Linux GLX: -novideosync disables GLX_SGI_video_sync
+// COMMANDLINEOPTION: BSD GLX: -novideosync disables GLX_SGI_video_sync
+// COMMANDLINEOPTION: MacOSX GLX: -novideosync disables GLX_SGI_video_sync
gl_videosyncavailable = GL_CheckExtension("GLX_SGI_video_sync", videosyncfuncs, "-novideosync", false);
usingmouse = false;
vid_hidden = false;
- vid_allowhwgamma = true;
+ vid_activewindow = true;
GL_Init();
return true;
}