X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fjuggle.c;h=c10a8dec38506669e2a563ecc3dbe52e8e89a270;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=7634d3e5f11720a62c15e29ee7c5f3969d17ba67;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/juggle.c b/hacks/juggle.c
index 7634d3e5..c10a8dec 100644
--- a/hacks/juggle.c
+++ b/hacks/juggle.c
@@ -1,9 +1,8 @@
 /* -*- Mode: C; tab-width: 4 -*- */
 /* juggle */
 
-#if !defined( lint ) && !defined( SABER )
+#if 0
 static const char sccsid[] = "@(#)juggle.c	5.10 2003/09/02 xlockmore";
-
 #endif
 
 /*-
@@ -135,7 +134,9 @@ static const char sccsid[] = "@(#)juggle.c	5.10 2003/09/02 xlockmore";
 					"*count:   200   \n" \
 					"*cycles:  1000  \n" \
 					"*ncolors: 32    \n" \
-					"*font:    -*-times-bold-r-normal-*-180-*\n"
+					"*font:    -*-helvetica-bold-r-normal-*-180-*\n" \
+					"*fpsSolid: true\n" \
+
 # define refresh_juggle 0
 # define juggle_handle_event 0
 # undef SMOOTH_COLORS
@@ -2614,7 +2615,8 @@ init_juggle (ModeInfo * mi)
   sp->scale = MIN(MI_HEIGHT(mi)/480.0, MI_WIDTH(mi)/160.0);
 
   if(describe && !sp->mode_font) { /* Check to see if there's room to describe patterns. */
-	sp->mode_font = XQueryFont(MI_DISPLAY(mi), XGContextFromGC(MI_GC(mi)));
+    char *font = get_string_resource (MI_DISPLAY(mi), "font", "Font");
+	sp->mode_font = XLoadQueryFont(MI_DISPLAY(mi), font);
   }
 }
 
@@ -2640,7 +2642,7 @@ draw_juggle (ModeInfo * mi)
 
   MI_IS_DRAWN(mi) = True;
 
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
   /* Don't worry about flicker, trust Quartz's double-buffering.
      This is a fast fix for the pixel-turds I can't track down...
    */