http://packetstormsecurity.org/UNIX/admin/xscreensaver-4.00.tar.gz

[xscreensaver] / hacks / t3d.c

diff --git a/hacks/t3d.c b/hacks/t3d.c
index 58ec47f2bf01ae96dfe8b35326ece537e09350b8..8b7ee7ed6f64b3cfad0a012f5fc552eeb2bad99a 100644 (file)
--- a/hacks/t3d.c
+++ b/hacks/t3d.c
@@ -59,7 +59,8 @@ int timewait=40000;
 
 #define frac(argument) argument-floor(argument)
 
-#define abs(x) ((x)<0.0 ? -(x) : (x))
+#undef ABS
+#define ABS(x) ((x)<0.0 ? -(x) : (x))
 
 static Colormap cmap;
 /* static XColor gray1; */
@@ -209,7 +210,7 @@ initColor (double r, double g, double b)
 {
   int n,n1;
   unsigned long pixels[12];
-  long dummy;
+  unsigned long dummy;
   
   cmap = xgwa.colormap;
   
@@ -293,7 +294,7 @@ initialize (void)
     if (s && *s)
       {
         double hh, ss, vv;
-        if (3 == sscanf (s, "%lf %lf %lf", &hh, &ss, &vv, &dummy)) {
+        if (3 == sscanf (s, "%lf %lf %lf %c", &hh, &ss, &vv, &dummy)) {
           hue = hh, sat = ss, val = vv;
           hsv2rgb(hue,sat,val,&r,&g,&b);
         }
@@ -512,7 +513,7 @@ fill_kugel(int i, Pixmap buf, int setcol)
 {
   double ra;
   int m,col,inc=1,inr=3,d;
-  d=(int)((abs(kugeln[i].r1)*2));
+  d=(int)((ABS(kugeln[i].r1)*2));
   if (d==0) d=1;
   
 #ifdef FASTDRAW
@@ -533,7 +534,7 @@ fill_kugel(int i, Pixmap buf, int setcol)
   else
 #endif
     {
-      if(abs(kugeln[i].r1)<6.0) inr=9;
+      if(ABS(kugeln[i].r1)<6.0) inr=9;
       
       for (m=0;m<=28;m+=inr)
        {
@@ -800,7 +801,8 @@ XrmOptionDescRec options [] = {
   { "-wobble",         ".wobble",      XrmoptionSepArg, 0 },
   { "-cycle",          ".cycle",       XrmoptionSepArg, 0 },
   { "-mag",            ".mag",         XrmoptionSepArg, 0 },
-  { "-minutes",                ".minutes",     XrmoptionSepArg, 0 },
+  { "-minutes",                ".minutes",     XrmoptionNoArg, "True" },
+  { "-no-minutes",     ".minutes",     XrmoptionNoArg, "False" },
   { "-delay",          ".delay",       XrmoptionSepArg, 0 },
   { "-fast",           ".fast",        XrmoptionSepArg, 0 },
   { "-colcycle",       ".colcycle",    XrmoptionSepArg, 0 },
@@ -816,7 +818,8 @@ screenhack (Display *d, Window w)
 {
   Window junk_win,in_win;
   
-  int px,py,junk,kb/*,wai*/;
+  int px,py,junk/*,wai*/;
+  unsigned int kb;
 /*  int act,act1,tc;*/
   double vnorm;
   /* double var=0.0; */