X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Ft3d.c;h=959d24aff5c6604738963b01bcaaf2b88eee6516;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hp=65beb6d92aa35a928cca7f264246066c2b39be5c;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/t3d.c b/hacks/t3d.c
index 65beb6d9..959d24af 100644
--- a/hacks/t3d.c
+++ b/hacks/t3d.c
@@ -13,10 +13,10 @@
                           of the command-line options provided by screenhack.c.
 */
 
-#ifndef HAVE_COCOA
+#ifndef HAVE_JWXYZ
 # define FASTDRAW
 # define FASTCOPY
-#endif /* !HAVE_COCOA */
+#endif /* !HAVE_JWXYZ */
 
 #include <stdio.h>
 #include <math.h>
@@ -325,7 +325,7 @@ initialize (struct state *st)
 
   st->planes=st->xgwa.depth;
 
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
 # define GXandInverted GXcopy  /* #### this can't be right, right? */
 #endif
  st->gc = XCreateGC (st->dpy, st->window, 0,  xgc);
@@ -527,7 +527,10 @@ static void
 fill_kugel(struct state *st, int i, Pixmap buf, int setcol)
 {
   double ra;
-  int m,col,inc=1,inr=3,d;
+  int m,col,inr=3,d;
+#ifdef USE_POLYGON
+  int inc=1;
+#endif
   d=(int)((ABS(st->kugeln[i].r1)*2));
   if (d==0) d=1;
   
@@ -557,16 +560,23 @@ fill_kugel(struct state *st, int i, Pixmap buf, int setcol)
 #ifdef PRTDBX
 	  printf("Radius: %f\n",ra);
 #endif
+#ifdef USE_POLYGON
 	  if(-ra< 3.0) inc=14;
 	  else if(-ra< 6.0) inc=8;
 	  else if(-ra<20.0) inc=4;
 	  else if(-ra<40.0) inc=2;
+#endif
 	  if(setcol)
 	    {
-	      if (m==27) col=33;
+	      if (m==27)
+                col=33;
 	      else
 		col=(int)(m);
-	      if (col>33) col=33;	col/=3;
+
+	      if (col>33)
+                col=33;
+
+              col/=3;
 	      setink(st->colors[col].pixel);
 	    }
 
@@ -895,8 +905,9 @@ t3d_event (Display *dpy, Window window, void *closure, XEvent *event)
   struct state *st = (struct state *) closure;
   if (event->type == KeyPress)
     {
-      KeySym kpr=XKeycodeToKeysym(st->dpy,event->xkey.keycode,0);
-
+      KeySym keysym;
+      char kpr = 0;
+      XLookupString (&event->xkey, &kpr, 1, &keysym, 0);
       switch (kpr)
         {
         case 's': case 'S':
@@ -938,7 +949,7 @@ static const char *t3d_defaults [] = {
   "*move:	0.5",
   "*wobble:	2.0",
   "*cycle:	10.0",
-  "*mag:	1",
+  "*mag:	1.0",
   "*minutes:	False",
   "*delay:      40000",
   "*fast:	50",