X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fmemscroller.c;h=444298e6833a99fda302d4193e3f90d071d88320;hb=2762a7d7cf8d83e68b8f635941f6609119d630ae;hp=afaed3c99dd6e574eeb4ca7558d41865823db7f7;hpb=6f5482d73adb0165c0130bb47d852644ab0c4869;p=xscreensaver

diff --git a/hacks/memscroller.c b/hacks/memscroller.c
index afaed3c9..444298e6 100644
--- a/hacks/memscroller.c
+++ b/hacks/memscroller.c
@@ -86,7 +86,7 @@ memscroller_init (Display *dpy, Window window)
   {
     int ncolors = 255;
     XColor colors[256];
-    make_random_colormap (st->dpy, st->xgwa.visual, st->xgwa.colormap,
+    make_random_colormap (st->xgwa.screen, st->xgwa.visual, st->xgwa.colormap,
                           colors, &ncolors, True, True, 0, False);
   }
 
@@ -619,12 +619,12 @@ static const char *memscroller_defaults [] = {
   "*borderSize:		   2",
 
 #if defined(HAVE_COCOA) && !defined(USE_IPHONE)
-  ".font1:		   OCR A Std 192, Lucida Console 192",
-  ".font2:		   OCR A Std 144, Lucida Console 144",
-  ".font3:		   OCR A Std 128, Lucida Console 128",
-  ".font4:		   OCR A Std 96,  Lucida Console 96",
-  ".font5:		   OCR A Std 48,  Lucida Console 48",
-  ".font6:		   OCR A Std 24,  Lucida Console 24",
+  ".font1:		   OCR A Std 192, Lucida Console 192, Monaco 192",
+  ".font2:		   OCR A Std 144, Lucida Console 144, Monaco 144",
+  ".font3:		   OCR A Std 128, Lucida Console 128, Monaco 128",
+  ".font4:		   OCR A Std 96,  Lucida Console 96,  Monaco 96",
+  ".font5:		   OCR A Std 48,  Lucida Console 48,  Monaco 48",
+  ".font6:		   OCR A Std 24,  Lucida Console 24,  Monaco 24",
 #else  /* !HAVE_COCOA */
   ".font1:		   -*-courier-bold-r-*-*-*-1440-*-*-m-*-*-*",
   ".font2:		   -*-courier-bold-r-*-*-*-960-*-*-m-*-*-*",