X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_glx.c;h=7e670a13c3d2068c8529a0043c415784dc505e45;hb=0e6ee75ea28c1f0f9027b698779d945c71e65213;hp=86eb757d2a7042c3956c691d470c98ab5a104f20;hpb=bf2e9460b1c8ae1d7b6792ef2df986e8f3c2cf86;p=xonotic%2Fdarkplaces.git

diff --git a/vid_glx.c b/vid_glx.c
index 86eb757d..7e670a13 100644
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -35,11 +35,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #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
@@ -90,8 +93,10 @@ static qboolean		mouse_active = false, usingmouse = false;
 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;
 
@@ -254,6 +259,7 @@ static void install_grabs(void)
 
 	XGrabPointer(vidx11_display, win,  True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
 
+#ifndef __APPLE__
 	if (vid_dga.integer)
 	{
 		int MajorVersion, MinorVersion;
@@ -261,7 +267,7 @@ static void install_grabs(void)
 		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
@@ -272,6 +278,7 @@ static void install_grabs(void)
 		}
 	}
 	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);
@@ -285,8 +292,10 @@ static void uninstall_grabs(void)
 	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);
@@ -329,12 +338,14 @@ static void HandleEvents(void)
 			// 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)
@@ -596,7 +607,8 @@ void VID_Finish (void)
 	int usemouse;
 	if (r_render.integer)
 	{
-		qglFinish();
+		if (r_speeds.integer || gl_finish.integer)
+			qglFinish();
 		qglXSwapBuffers(vidx11_display, win);
 	}
 
@@ -636,8 +648,10 @@ int VID_GetGamma(unsigned short *ramps)
 
 void VID_Init(void)
 {
+#ifndef __APPLE__
 	Cvar_RegisterVariable (&vid_dga);
 	Cvar_RegisterVariable (&vid_dga_mouseaccel);
+#endif
 	InitSig(); // trap evil signals
 	if (COM_CheckParm ("-nomouse") || COM_CheckParm("-safe"))
 		mouse_avail = false;
@@ -671,7 +685,11 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 	int MajorVersion, MinorVersion;
 	const char *drivername;
 
+#if defined(__APPLE__) && defined(__MACH__)
+	drivername = "/usr/X11R6/lib/libGL.1.dylib";
+#else
 	drivername = "libGL.so.1";
+#endif
 	i = COM_CheckParm("-gl_driver");
 	if (i && i < com_argc - 1)
 		drivername = com_argv[i + 1];
@@ -683,7 +701,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 
 	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;
 	}
 
@@ -714,7 +732,7 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 	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;
 	}