X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=vid_glx.c;h=890cf78f34704fbaf5318ab3f40bafd0cf4a49ec;hb=491556ae8663fb14efed17c3a2b50770f7760afc;hp=64fa66c7191bad153529ba154d1b9c2282153a9f;hpb=656d8440b1ca6afe0b55650fba3b8ca4b01c9511;p=xonotic%2Fdarkplaces.git

diff --git a/vid_glx.c b/vid_glx.c
index 64fa66c7..890cf78f 100644
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -35,7 +35,7 @@ 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__)
+#if !defined(__APPLE__) && !defined(__MACH__) && !defined(SUNOS)
 #include <X11/extensions/xf86dga.h>
 #endif
 #include <X11/extensions/xf86vmode.h>
@@ -88,13 +88,12 @@ Atom wm_delete_window_atom;
 
 static qboolean mouse_avail = true;
 static qboolean vid_usingmouse = false;
-static qboolean vid_usemouse = false;
 static qboolean vid_usingvsync = false;
 static qboolean vid_usevsync = false;
 static float	mouse_x, mouse_y;
 static int p_mouse_x, p_mouse_y;
 
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(SUNOS)
 cvar_t vid_dga = {CVAR_SAVE, "vid_dga", "1"};
 cvar_t vid_dga_mouseaccel = {0, "vid_dga_mouseaccel", "1"};
 #endif
@@ -103,8 +102,6 @@ qboolean vidmode_ext = false;
 
 static int win_x, win_y;
 
-static int scr_width, scr_height;
-
 static XF86VidModeModeInfo **vidmodes;
 static int num_vidmodes;
 static qboolean vid_isfullscreen = false;
@@ -210,6 +207,8 @@ static int XLateKey(XKeyEvent *ev, char *ascii)
 		case XK_KP_Subtract: key = K_KP_MINUS; break;
 		case XK_KP_Divide: key = K_KP_SLASH; break;
 
+		case XK_section:	key = '~'; break;
+
 		default:
 			if (keysym < 32 && keysym > 126)
 				break;
@@ -266,7 +265,7 @@ static void IN_Activate (qboolean grab)
 
 			XGrabPointer(vidx11_display, win,  True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
 
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(SUNOS)
 			if (vid_dga.integer)
 			{
 				int MajorVersion, MinorVersion;
@@ -276,7 +275,7 @@ static void IN_Activate (qboolean grab)
 					// unable to query, probably not supported
 					Con_Print( "Failed to detect XF86DGA Mouse\n" );
 					Cvar_SetValueQuick(&vid_dga, 0);
-					XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, scr_width / 2, scr_height / 2);
+					XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2);
 				}
 				else
 				{
@@ -286,7 +285,7 @@ static void IN_Activate (qboolean grab)
 			}
 			else
 #endif
-				XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, scr_width / 2, scr_height / 2);
+				XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2);
 
 			XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
 
@@ -299,7 +298,7 @@ static void IN_Activate (qboolean grab)
 	{
 		if (vid_usingmouse)
 		{
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(SUNOS)
 			if (vid_dga.integer)
 				XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0);
 #endif
@@ -349,7 +348,7 @@ static void HandleEvents(void)
 			// mouse moved
 			if (vid_usingmouse)
 			{
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(SUNOS)
 				if (vid_dga.integer == 1)
 				{
 					mouse_x += event.xmotion.x_root * vid_dga_mouseaccel.value;
@@ -363,7 +362,7 @@ static void HandleEvents(void)
 					{
 						mouse_x += event.xmotion.x - p_mouse_x;
 						mouse_y += event.xmotion.y - p_mouse_y;
-						if (abs(scr_width/2 - event.xmotion.x) > scr_width / 4 || abs(scr_height/2 - event.xmotion.y) > scr_height / 4)
+						if (abs(vid.width/2 - event.xmotion.x) > vid.width / 4 || abs(vid.height/2 - event.xmotion.y) > vid.height / 4)
 							dowarp = true;
 					}
 					p_mouse_x = event.xmotion.x;
@@ -519,8 +518,8 @@ static void HandleEvents(void)
 	if (dowarp)
 	{
 		/* move the mouse to the window center again */
-		p_mouse_x = scr_width / 2;
-		p_mouse_y = scr_height / 2;
+		p_mouse_x = vid.width / 2;
+		p_mouse_y = vid.height / 2;
 		XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, p_mouse_x, p_mouse_y);
 	}
 }
@@ -611,20 +610,10 @@ void InitSig(void)
 	signal(SIGTERM, signal_handler);
 }
 
-/*
-=================
-VID_GetWindowSize
-=================
-*/
-void VID_GetWindowSize (int *x, int *y, int *width, int *height)
-{
-	*x = *y = 0;
-	*width = scr_width;
-	*height = scr_height;
-}
-
 void VID_Finish (void)
 {
+	qboolean vid_usemouse;
+
 	vid_usevsync = vid_vsync.integer && !cls.timedemo && gl_videosyncavailable;
 	if (vid_usingvsync != vid_usevsync && gl_videosyncavailable)
 	{
@@ -663,7 +652,7 @@ int VID_GetGamma(unsigned short *ramps)
 
 void VID_Init(void)
 {
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(SUNOS)
 	Cvar_RegisterVariable (&vid_dga);
 	Cvar_RegisterVariable (&vid_dga_mouseaccel);
 #endif
@@ -843,18 +832,24 @@ int VID_InitMode(int fullscreen, int width, int height, int bpp)
 
 	ctx = qglXCreateContext(vidx11_display, visinfo, NULL, True);
 	if (!ctx)
-		Sys_Error ("glXCreateContext failed\n");
+	{
+		Con_Printf ("glXCreateContext failed\n");
+		return false;
+	}
 
 	if (!qglXMakeCurrent(vidx11_display, win, ctx))
-		Sys_Error ("glXMakeCurrent failed\n");
+	{
+		Con_Printf ("glXMakeCurrent failed\n");
+		return false;
+	}
 
 	XSync(vidx11_display, False);
 
-	scr_width = width;
-	scr_height = height;
-
 	if ((qglGetString = GL_GetProcAddress("glGetString")) == NULL)
-		Sys_Error("glGetString not found in %s", gl_driver);
+	{
+		Con_Printf ("glGetString not found in %s", gl_driver);
+		return false;
+	}
 
 	gl_renderer = qglGetString(GL_RENDERER);
 	gl_vendor = qglGetString(GL_VENDOR);