r300 - in trunk: code/unix web/include

[DONOTREPLY at icculus.org]

Author: tma
Date: 2005-11-06 12:31:48 -0500 (Sun, 06 Nov 2005)
New Revision: 300

Modified:
   trunk/code/unix/linux_glimp.c
   trunk/web/include/status.php
Log:
* Ignore in_dgamouse setting if dga isn't available
* Changed status of Solaris sparc


Modified: trunk/code/unix/linux_glimp.c
===================================================================
--- trunk/code/unix/linux_glimp.c	2005-11-06 16:51:28 UTC (rev 299)
+++ trunk/code/unix/linux_glimp.c	2005-11-06 17:31:48 UTC (rev 300)
@@ -410,9 +410,9 @@
 
   mouseResetTime = Sys_Milliseconds ();
 
+#ifdef HAVE_XF86DGA
   if (in_dgamouse->value)
   {
-#ifdef HAVE_XF86DGA
     int MajorVersion, MinorVersion;
 
     if (!XF86DGAQueryVersion(dpy, &MajorVersion, &MinorVersion))
@@ -425,8 +425,8 @@
       XF86DGADirectVideo(dpy, DefaultScreen(dpy), XF86DGADirectMouse);
       XWarpPointer(dpy, None, win, 0, 0, 0, 0, 0, 0);
     }
+  } else
 #endif /* HAVE_XF86DGA */
-  } else
   {
     mwx = glConfig.vidWidth / 2;
     mwy = glConfig.vidHeight / 2;
@@ -443,14 +443,14 @@
 
 static void uninstall_grabs(void)
 {
+#ifdef HAVE_XF86DGA
   if (in_dgamouse->value)
   {
 		if (com_developer->value)
 			ri.Printf( PRINT_ALL, "DGA Mouse - Disabling DGA DirectVideo\n" );
-#ifdef HAVE_XF86DGA
     XF86DGADirectVideo(dpy, DefaultScreen(dpy), 0);
+  }
 #endif /* HAVE_XF86DGA */
-  }
 
   XChangePointerControl(dpy, qtrue, qtrue, mouse_accel_numerator, 
                         mouse_accel_denominator, mouse_threshold);
@@ -589,6 +589,7 @@
 			t = Sys_XTimeToSysTime(event.xkey.time);
       if (mouse_active)
       {
+#ifdef HAVE_XF86DGA
         if (in_dgamouse->value)
         {
           mx += event.xmotion.x_root;
@@ -599,6 +600,7 @@
           }
           mx = my = 0;
         } else
+#endif /* HAVE_XF86DGA */
         {
           // If it's a center motion, we've just returned from our warp
           if (event.xmotion.x == glConfig.vidWidth/2 &&
@@ -952,7 +954,7 @@
   {
     if (!XF86DGAQueryVersion(dpy, &dga_MajorVersion, &dga_MinorVersion))
     {
-      // unable to query, probalby not supported
+      // unable to query, probably not supported
       ri.Printf( PRINT_ALL, "Failed to detect XF86DGA Mouse\n" );
       ri.Cvar_Set( "in_dgamouse", "0" );
     } else
@@ -961,7 +963,7 @@
                  dga_MajorVersion, dga_MinorVersion);
     }
   }
-#endif /* HAVE_XF86DGA */      
+#endif /* HAVE_XF86DGA */
 
 #ifdef HAVE_XF86DGA
   if (vidmode_ext)

Modified: trunk/web/include/status.php
===================================================================
--- trunk/web/include/status.php	2005-11-06 16:51:28 UTC (rev 299)
+++ trunk/web/include/status.php	2005-11-06 17:31:48 UTC (rev 300)
@@ -89,7 +89,7 @@
 	</tr>
 	<tr>
 		<td>gcc-sparc</td> <!--Platform-->
-		<td>broken</td> <!--Status-->
+		<td>working</td> <!--Status-->
 		<td></td> <!--LKWR-->
 		<td></td> <!--Notes-->
 	</tr>