X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fsplash.c;h=e382fa2a58ab42a7911bea4485b6ca41bdc7246c;hb=39809ded547bdbb08207d3e514950425215b4410;hp=b4dcf20c6efe0c9ad57319eb9f2d438f7231bbdb;hpb=ebc241816cc8e3eec7270a594bb1a607df32bcd6;p=xscreensaver

diff --git a/driver/splash.c b/driver/splash.c
index b4dcf20c..e382fa2a 100644
--- a/driver/splash.c
+++ b/driver/splash.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1991-2001 Jamie Zawinski <jwz@netscape.com>
+/* xscreensaver, Copyright (c) 1991-2017 Jamie Zawinski <jwz@netscape.com>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -87,10 +87,7 @@ draw_shaded_rectangle (Display *dpy, Window window,
 int
 string_width (XFontStruct *font, char *s)
 {
-  int direction, ascent, descent;
-  XCharStruct overall;
-  XTextExtents (font, s, strlen(s), &direction, &ascent, &descent, &overall);
-  return overall.width;
+  return XTextWidth(font, s, strlen(s));
 }
 
 
@@ -99,12 +96,41 @@ static void draw_splash_window (saver_info *si);
 static void destroy_splash_window (saver_info *si);
 static void unsplash_timer (XtPointer closure, XtIntervalId *id);
 
-static void do_demo (saver_info *si);
-static void do_prefs (saver_info *si);
-static void do_help (saver_info *si);
+static void do_demo (saver_screen_info *ssi);
+#ifdef PREFS_BUTTON
+static void do_prefs (saver_screen_info *ssi);
+#endif /* PREFS_BUTTON */
+static void do_help (saver_screen_info *ssi);
+
+
+XFontStruct *
+splash_load_font (Display *dpy, char *name, char *class)
+{
+  /* Try RES, RES2, etc. */
+  int i;
+  for (i = 0; i < 4; i++)
+    {
+      char *name2 = (char *) malloc (strlen(name) + 2);
+      char *s;
+      if (i)
+        sprintf (name2, "%s%d", name, i+1);
+      else
+        strcpy (name2, name);
+      s = get_string_resource (dpy, name2, class);
+      free (name2);
+      if (s && *s)
+        {
+          XFontStruct *f = XLoadQueryFont (dpy, s);
+          if (f) return f;
+        }
+    }
+  return XLoadQueryFont (dpy, "fixed");
+}
 
 
 struct splash_dialog_data {
+
+  saver_screen_info *prompt_screen;
   XtIntervalId timer;
 
   Dimension width;
@@ -113,8 +139,12 @@ struct splash_dialog_data {
   char *heading_label;
   char *body_label;
   char *body2_label;
+  char *body3_label;
+  char *body4_label;
   char *demo_label;
+#ifdef PREFS_BUTTON
   char *prefs_label;
+#endif /* PREFS_BUTTON */
   char *help_label;
 
   XFontStruct *heading_font;
@@ -123,10 +153,9 @@ struct splash_dialog_data {
 
   Pixel foreground;
   Pixel background;
+  Pixel border;
   Pixel button_foreground;
   Pixel button_background;
-  Pixel logo_foreground;
-  Pixel logo_background;
   Pixel shadow_top;
   Pixel shadow_bottom;
 
@@ -137,9 +166,16 @@ struct splash_dialog_data {
 
   Dimension button_width, button_height;
   Dimension demo_button_x, demo_button_y;
+#ifdef PREFS_BUTTON
   Dimension prefs_button_x, prefs_button_y;
+#endif /* PREFS_BUTTON */
   Dimension help_button_x, help_button_y;
 
+  Pixmap logo_pixmap;
+  Pixmap logo_clipmask;
+  int logo_npixels;
+  unsigned long *logo_pixels;
+
   int pressed;
 };
 
@@ -147,13 +183,27 @@ struct splash_dialog_data {
 void
 make_splash_dialog (saver_info *si)
 {
+  saver_preferences *p = &si->prefs;
   int x, y, bw;
   XSetWindowAttributes attrs;
   unsigned long attrmask = 0;
   splash_dialog_data *sp;
-  Screen *screen = si->default_screen->screen;
-  Colormap cmap = DefaultColormapOfScreen (screen);
-  char *f;
+  saver_screen_info *ssi;
+  Colormap cmap;
+
+  Bool whine = decrepit_p ();
+
+  if (whine)
+    {
+      /* If locking is not enabled, make sure they see the message. */
+      if (!p->lock_p)
+        {
+          si->prefs.splash_p = True;
+          if (si->prefs.splash_duration < 5000)
+            si->prefs.splash_duration = 5000;
+        }
+      si->prefs.splash_duration += 3000;
+    }
 
   if (si->sp_data)
     return;
@@ -161,21 +211,45 @@ make_splash_dialog (saver_info *si)
       si->prefs.splash_duration <= 0)
     return;
 
+  ssi = &si->screens[mouse_screen (si)];
+
+  if (!ssi || !ssi->screen)
+    return;    /* WTF?  Trying to splash while no screens connected? */
+
+  cmap = DefaultColormapOfScreen (ssi->screen);
+
   sp = (splash_dialog_data *) calloc (1, sizeof(*sp));
+  sp->prompt_screen = ssi;
 
-  sp->heading_label = get_string_resource ("splash.heading.label",
+  sp->heading_label = get_string_resource (si->dpy,
+                                           "splash.heading.label",
 					   "Dialog.Label.Label");
-  sp->body_label = get_string_resource ("splash.body.label",
+  sp->body_label = get_string_resource (si->dpy,
+                                        "splash.body.label",
 					"Dialog.Label.Label");
-  sp->body2_label = get_string_resource ("splash.body2.label",
+  sp->body2_label = get_string_resource (si->dpy,
+                                         "splash.body2.label",
 					 "Dialog.Label.Label");
-  sp->demo_label = get_string_resource ("splash.demo.label",
+  sp->demo_label = get_string_resource (si->dpy,
+                                        "splash.demo.label",
 					"Dialog.Button.Label");
-  sp->prefs_label = get_string_resource ("splash.prefs.label",
+#ifdef PREFS_BUTTON
+  sp->prefs_label = get_string_resource (si->dpy,
+                                         "splash.prefs.label",
 					"Dialog.Button.Label");
-  sp->help_label = get_string_resource ("splash.help.label",
+#endif /* PREFS_BUTTON */
+  sp->help_label = get_string_resource (si->dpy,
+                                        "splash.help.label",
 					"Dialog.Button.Label");
 
+
+
+  if (whine)
+    {
+      sp->body3_label = strdup("WARNING: This version is very old!");
+      sp->body4_label = strdup("Please upgrade!");
+    }
+
   if (!sp->heading_label)
     sp->heading_label = strdup("ERROR: REESOURCES NOT INSTALLED CORRECTLY");
   if (!sp->body_label)
@@ -183,7 +257,9 @@ make_splash_dialog (saver_info *si)
   if (!sp->body2_label)
     sp->body2_label = strdup("ERROR: REESOURCES NOT INSTALLED CORRECTLY");
   if (!sp->demo_label) sp->demo_label = strdup("ERROR");
+#ifdef PREFS_BUTTON
   if (!sp->prefs_label) sp->prefs_label = strdup("ERROR");
+#endif /* PREFS_BUTTON */
   if (!sp->help_label) sp->help_label = strdup("ERROR");
 
   /* Put the version number in the label. */
@@ -194,61 +270,54 @@ make_splash_dialog (saver_info *si)
     sp->heading_label = s;
   }
 
-  f = get_string_resource ("splash.headingFont", "Dialog.Font");
-  sp->heading_font = XLoadQueryFont (si->dpy, (f ? f : "fixed"));
-  if (!sp->heading_font) sp->heading_font = XLoadQueryFont (si->dpy, "fixed");
-  if (f) free (f);
-
-  f = get_string_resource("splash.bodyFont", "Dialog.Font");
-  sp->body_font = XLoadQueryFont (si->dpy, (f ? f : "fixed"));
-  if (!sp->body_font) sp->body_font = XLoadQueryFont (si->dpy, "fixed");
-  if (f) free (f);
-
-  f = get_string_resource("splash.buttonFont", "Dialog.Font");
-  sp->button_font = XLoadQueryFont (si->dpy, (f ? f : "fixed"));
-  if (!sp->button_font) sp->button_font = XLoadQueryFont (si->dpy, "fixed");
-  if (f) free (f);
-
-  sp->foreground = get_pixel_resource ("splash.foreground",
-				       "Dialog.Foreground",
-				       si->dpy, cmap);
-  sp->background = get_pixel_resource ("splash.background",
-				       "Dialog.Background",
-				       si->dpy, cmap);
+  sp->heading_font =
+    splash_load_font (si->dpy, "splash.headingFont", "Dialog.Font");
+  sp->body_font =
+    splash_load_font (si->dpy, "splash.bodyFont", "Dialog.Font");
+  sp->button_font =
+    splash_load_font (si->dpy, "splash.buttonFont", "Dialog.Font");
+
+  sp->foreground = get_pixel_resource (si->dpy, cmap,
+                                       "splash.foreground",
+				       "Dialog.Foreground");
+  sp->background = get_pixel_resource (si->dpy, cmap, 
+                                       "splash.background",
+				       "Dialog.Background");
+  sp->border = get_pixel_resource (si->dpy, cmap, 
+                                       "splash.borderColor",
+				       "Dialog.borderColor");
 
   if (sp->foreground == sp->background)
     {
       /* Make sure the error messages show up. */
-      sp->foreground = BlackPixelOfScreen (screen);
-      sp->background = WhitePixelOfScreen (screen);
+      sp->foreground = BlackPixelOfScreen (ssi->screen);
+      sp->background = WhitePixelOfScreen (ssi->screen);
     }
 
-  sp->button_foreground = get_pixel_resource ("splash.Button.foreground",
-					      "Dialog.Button.Foreground",
-					      si->dpy, cmap);
-  sp->button_background = get_pixel_resource ("splash.Button.background",
-					      "Dialog.Button.Background",
-					      si->dpy, cmap);
-  sp->logo_foreground = get_pixel_resource ("splash.logo.foreground",
-					    "Dialog.Logo.Foreground",
-					    si->dpy, cmap);
-  sp->logo_background = get_pixel_resource ("splash.logo.background",
-					    "Dialog.Logo.Background",
-					    si->dpy, cmap);
-  sp->shadow_top = get_pixel_resource ("splash.topShadowColor",
-				       "Dialog.Foreground",
-				       si->dpy, cmap);
-  sp->shadow_bottom = get_pixel_resource ("splash.bottomShadowColor",
-					  "Dialog.Background",
-					  si->dpy, cmap);
-
-  sp->logo_width = get_integer_resource ("splash.logo.width",
+  sp->button_foreground = get_pixel_resource (si->dpy, cmap,
+                                              "splash.Button.foreground",
+					      "Dialog.Button.Foreground");
+  sp->button_background = get_pixel_resource (si->dpy, cmap,
+                                              "splash.Button.background",
+					      "Dialog.Button.Background");
+  sp->shadow_top = get_pixel_resource (si->dpy, cmap,
+                                       "splash.topShadowColor",
+				       "Dialog.Foreground");
+  sp->shadow_bottom = get_pixel_resource (si->dpy, cmap,
+                                          "splash.bottomShadowColor",
+					  "Dialog.Background");
+
+  sp->logo_width = get_integer_resource (si->dpy, 
+                                         "splash.logo.width",
 					 "Dialog.Logo.Width");
-  sp->logo_height = get_integer_resource ("splash.logo.height",
+  sp->logo_height = get_integer_resource (si->dpy, 
+                                          "splash.logo.height",
 					  "Dialog.Logo.Height");
-  sp->internal_border = get_integer_resource ("splash.internalBorderWidth",
+  sp->internal_border = get_integer_resource (si->dpy, 
+                                              "splash.internalBorderWidth",
 					      "Dialog.InternalBorderWidth");
-  sp->shadow_width = get_integer_resource ("splash.shadowThickness",
+  sp->shadow_width = get_integer_resource (si->dpy, 
+                                           "splash.shadowThickness",
 					   "Dialog.ShadowThickness");
 
   if (sp->logo_width == 0)  sp->logo_width = 150;
@@ -284,6 +353,20 @@ make_splash_dialog (saver_info *si)
     if (overall.width > sp->width) sp->width = overall.width;
     sp->height += ascent + descent;
 
+    /* Measure the optional body3_label. */
+    if (sp->body3_label)
+      {
+        XTextExtents (sp->heading_font,
+                      sp->body3_label, strlen(sp->body3_label),
+                      &direction, &ascent, &descent, &overall);
+        if (overall.width > sp->width) sp->width = overall.width;
+        XTextExtents (sp->heading_font,
+                      sp->body4_label, strlen(sp->body4_label),
+                      &direction, &ascent, &descent, &overall);
+        if (overall.width > sp->width) sp->width = overall.width;
+        sp->height += (ascent + descent) * 5;
+      }
+
     {
       Dimension w2 = 0, w3 = 0, w4 = 0;
       Dimension h2 = 0, h3 = 0, h4 = 0;
@@ -295,12 +378,17 @@ make_splash_dialog (saver_info *si)
       w2 = overall.width;
       h2 = ascent + descent;
 
+#ifdef PREFS_BUTTON
       /* Measure the Prefs button. */
       XTextExtents (sp->button_font,
 		    sp->prefs_label, strlen(sp->prefs_label),
 		    &direction, &ascent, &descent, &overall);
       w3 = overall.width;
       h3 = ascent + descent;
+#else  /* !PREFS_BUTTON */
+      w3 = 0;
+      h3 = 0;
+#endif /* !PREFS_BUTTON */
 
       /* Measure the Help button. */
       XTextExtents (sp->button_font,
@@ -312,13 +400,20 @@ make_splash_dialog (saver_info *si)
       w2 = MAX(w2, w3); w2 = MAX(w2, w4);
       h2 = MAX(h2, h3); h2 = MAX(h2, h4);
 
+      /* Add some horizontal padding inside the buttons. */
+      w2 += ascent;
+
       w2 += ((ascent + descent) / 2) + (sp->shadow_width * 2);
       h2 += ((ascent + descent) / 2) + (sp->shadow_width * 2);
 
       sp->button_width = w2;
       sp->button_height = h2;
 
+#ifdef PREFS_BUTTON
       w2 *= 3;
+#else  /* !PREFS_BUTTON */
+      w2 *= 2;
+#endif /* !PREFS_BUTTON */
 
       w2 += ((ascent + descent) * 2);  /* for space between buttons */
 
@@ -344,8 +439,12 @@ make_splash_dialog (saver_info *si)
   attrs.event_mask = (ExposureMask | ButtonPressMask | ButtonReleaseMask);
 
   {
-    int sx, sy, w, h;
-    get_screen_viewport (si->default_screen, &sx, &sy, &w, &h, False);
+    int sx = 0, sy = 0, w, h;
+
+    x = ssi->x;
+    y = ssi->y;
+    w = ssi->width;
+    h = ssi->height;
     if (si->prefs.debug_p) w /= 2;
     x = sx + (((w + sp->width)  / 2) - sp->width);
     y = sy + (((h + sp->height) / 2) - sp->height);
@@ -353,16 +452,28 @@ make_splash_dialog (saver_info *si)
     if (y < sy) y = sy;
   }
 
-  bw = get_integer_resource ("splash.borderWidth", "Dialog.BorderWidth");
+  bw = get_integer_resource (si->dpy, 
+                             "splash.borderWidth",
+                             "Dialog.BorderWidth");
 
   si->splash_dialog =
     XCreateWindow (si->dpy,
-		   RootWindowOfScreen(screen),
+		   RootWindowOfScreen(ssi->screen),
 		   x, y, sp->width, sp->height, bw,
-		   DefaultDepthOfScreen (screen), InputOutput,
-		   DefaultVisualOfScreen(screen),
+		   DefaultDepthOfScreen (ssi->screen), InputOutput,
+		   DefaultVisualOfScreen(ssi->screen),
 		   attrmask, &attrs);
   XSetWindowBackground (si->dpy, si->splash_dialog, sp->background);
+  XSetWindowBorder (si->dpy, si->splash_dialog, sp->border);
+
+
+  sp->logo_pixmap = xscreensaver_logo (ssi->screen, 
+                                       /* same visual as si->splash_dialog */
+                                       DefaultVisualOfScreen (ssi->screen),
+                                       si->splash_dialog, cmap,
+                                       sp->background, 
+                                       &sp->logo_pixels, &sp->logo_npixels,
+                                       &sp->logo_clipmask, True);
 
   XMapRaised (si->dpy, si->splash_dialog);
   XSync (si->dpy, False);
@@ -376,21 +487,6 @@ make_splash_dialog (saver_info *si)
   XSync (si->dpy, False);
 }
 
-void
-draw_logo (saver_info *si, Window win, int x, int y, int w, int h,
-           Bool first_time_p)
-{
-  Colormap cmap = DefaultColormapOfScreen (si->default_screen->screen);
-  Pixmap logo_map = XCreatePixmap (si->dpy, win, w, h, 
-                                   si->default_screen->current_depth);
-  XGCValues gcv;
-  GC gc = XCreateGC (si->dpy, win, 0, &gcv);
-  xscreensaver_logo (si->dpy, logo_map, cmap, !first_time_p);
-  XCopyArea (si->dpy, logo_map, win, gc, 0, 0, w, h, x, y);
-  XFreeGC (si->dpy, gc);
-  XFreePixmap (si->dpy, logo_map);
-}
-
 
 static void
 draw_splash_window (saver_info *si)
@@ -398,10 +494,15 @@ draw_splash_window (saver_info *si)
   splash_dialog_data *sp = si->sp_data;
   XGCValues gcv;
   GC gc1, gc2;
-  int hspacing, vspacing, height;
+  int vspacing, height;
   int x1, x2, x3, y1, y2;
   int sw;
 
+#ifdef PREFS_BUTTON
+  int hspacing;
+  int nbuttons = 3;
+#endif /* !PREFS_BUTTON */
+
   height = (sp->heading_font->ascent + sp->heading_font->descent +
 	    sp->body_font->ascent + sp->body_font->descent +
 	    sp->body_font->ascent + sp->body_font->descent +
@@ -448,6 +549,24 @@ draw_splash_window (saver_info *si)
 	       sp->body2_label, strlen(sp->body2_label));
   y1 += sp->body_font->descent;
 
+  if (sp->body3_label)
+    {
+      XSetFont (si->dpy, gc1, sp->heading_font->fid);
+      y1 += sp->heading_font->ascent + sp->heading_font->descent;
+      y1 += sp->heading_font->ascent;
+      sw = string_width (sp->heading_font, sp->body3_label);
+      x2 = (x1 + ((x3 - x1 - sw) / 2));
+      XDrawString (si->dpy, si->splash_dialog, gc1, x2, y1,
+                   sp->body3_label, strlen(sp->body3_label));
+      y1 += sp->heading_font->descent + sp->heading_font->ascent;
+      sw = string_width (sp->heading_font, sp->body4_label);
+      x2 = (x1 + ((x3 - x1 - sw) / 2));
+      XDrawString (si->dpy, si->splash_dialog, gc1, x2, y1,
+                   sp->body4_label, strlen(sp->body4_label));
+      y1 += sp->heading_font->descent;
+      XSetFont (si->dpy, gc1, sp->body_font->fid);
+    }
+
   /* The buttons
    */
   XSetForeground (si->dpy, gc1, sp->button_foreground);
@@ -461,9 +580,11 @@ draw_splash_window (saver_info *si)
 	       (sp->button_font->ascent + sp->button_font->descent))
 	      / 2)
 	+ sp->button_font->ascent);
+#ifdef PREFS_BUTTON
   hspacing = ((sp->width - x1 - (sp->shadow_width * 2) -
-	       sp->internal_border - (sp->button_width * 3))
+	       sp->internal_border - (sp->button_width * nbuttons))
 	      / 2);
+#endif
 
   x2 = x1 + ((sp->button_width - string_width(sp->button_font, sp->demo_label))
 	     / 2);
@@ -474,6 +595,7 @@ draw_splash_window (saver_info *si)
   sp->demo_button_x = x1;
   sp->demo_button_y = y1;
   
+#ifdef PREFS_BUTTON
   x1 += hspacing + sp->button_width;
   x2 = x1 + ((sp->button_width - string_width(sp->button_font,sp->prefs_label))
 	     / 2);
@@ -483,8 +605,15 @@ draw_splash_window (saver_info *si)
 	       sp->prefs_label, strlen(sp->prefs_label));
   sp->prefs_button_x = x1;
   sp->prefs_button_y = y1;
+#endif /* PREFS_BUTTON */
 
+#ifdef PREFS_BUTTON
   x1 += hspacing + sp->button_width;
+#else  /* !PREFS_BUTTON */
+  x1 = (sp->width - sp->button_width -
+        sp->internal_border - (sp->shadow_width * 2));
+#endif /* !PREFS_BUTTON */
+
   x2 = x1 + ((sp->button_width - string_width(sp->button_font,sp->help_label))
 	     / 2);
   XFillRectangle (si->dpy, si->splash_dialog, gc2, x1, y1,
@@ -495,26 +624,49 @@ draw_splash_window (saver_info *si)
   sp->help_button_y = y1;
 
 
-  /* the logo
+  /* The logo
    */
-  XSetForeground (si->dpy, gc1, sp->logo_foreground);
-  XSetForeground (si->dpy, gc2, sp->logo_background);
-
-  x1 = sp->shadow_width * 3;
-  y1 = sp->shadow_width * 3;
-  x2 = sp->logo_width - (sp->shadow_width * 6);
-  y2 = sp->logo_height - (sp->shadow_width * 6);
+  x1 = sp->shadow_width * 6;
+  y1 = sp->shadow_width * 6;
+  x2 = sp->logo_width - (sp->shadow_width * 12);
+  y2 = sp->logo_height - (sp->shadow_width * 12);
 
-  draw_logo (si, si->splash_dialog, x1, y1, x2, y2, True);
+  if (sp->logo_pixmap)
+    {
+      Window root;
+      int x, y;
+      unsigned int w, h, bw, d;
+      XGetGeometry (si->dpy, sp->logo_pixmap, &root, &x, &y, &w, &h, &bw, &d);
+      XSetForeground (si->dpy, gc1, sp->foreground);
+      XSetBackground (si->dpy, gc1, sp->background);
+      XSetClipMask (si->dpy, gc1, sp->logo_clipmask);
+      XSetClipOrigin (si->dpy, gc1, x1 + ((x2 - (int)w) /2), y1 + ((y2 - (int)h) / 2));
+      if (d == 1)
+        XCopyPlane (si->dpy, sp->logo_pixmap, si->splash_dialog, gc1,
+                    0, 0, w, h,
+                    x1 + ((x2 - (int)w) / 2),
+                    y1 + ((y2 - (int)h) / 2),
+                    1);
+      else
+        XCopyArea (si->dpy, sp->logo_pixmap, si->splash_dialog, gc1,
+                   0, 0, w, h,
+                   x1 + ((x2 - (int)w) / 2),
+                   y1 + ((y2 - (int)h) / 2));
+    }
 
+  /* Solid border inside the logo box. */
+#if 0
+  XSetForeground (si->dpy, gc1, sp->foreground);
+  XDrawRectangle (si->dpy, si->splash_dialog, gc1, x1, y1, x2-1, y2-1);
+#endif
 
   /* The shadow around the logo
    */
   draw_shaded_rectangle (si->dpy, si->splash_dialog,
-			 sp->shadow_width * 2,
-			 sp->shadow_width * 2,
-			 sp->logo_width - (sp->shadow_width * 4),
-			 sp->logo_height - (sp->shadow_width * 4),
+			 sp->shadow_width * 4,
+			 sp->shadow_width * 4,
+			 sp->logo_width - (sp->shadow_width * 8),
+			 sp->logo_height - (sp->shadow_width * 8),
 			 sp->shadow_width,
 			 sp->shadow_bottom, sp->shadow_top);
 
@@ -546,11 +698,13 @@ update_splash_window (saver_info *si)
 			 sp->button_width, sp->button_height, sp->shadow_width,
 			 (pressed == 1 ? sp->shadow_bottom : sp->shadow_top),
 			 (pressed == 1 ? sp->shadow_top : sp->shadow_bottom));
+#ifdef PREFS_BUTTON
   draw_shaded_rectangle (si->dpy, si->splash_dialog,
 			 sp->prefs_button_x, sp->prefs_button_y,
 			 sp->button_width, sp->button_height, sp->shadow_width,
 			 (pressed == 2 ? sp->shadow_bottom : sp->shadow_top),
 			 (pressed == 2 ? sp->shadow_top : sp->shadow_bottom));
+#endif /* PREFS_BUTTON */
   draw_shaded_rectangle (si->dpy, si->splash_dialog,
 			 sp->help_button_x, sp->help_button_y,
 			 sp->button_width, sp->button_height, sp->shadow_width,
@@ -562,10 +716,10 @@ static void
 destroy_splash_window (saver_info *si)
 {
   splash_dialog_data *sp = si->sp_data;
-  Screen *screen = si->default_screen->screen;
-  Colormap cmap = DefaultColormapOfScreen (screen);
-  Pixel black = BlackPixelOfScreen (screen);
-  Pixel white = WhitePixelOfScreen (screen);
+  saver_screen_info *ssi = sp->prompt_screen;
+  Colormap cmap = DefaultColormapOfScreen (ssi->screen);
+  Pixel black = BlackPixelOfScreen (ssi->screen);
+  Pixel white = WhitePixelOfScreen (ssi->screen);
 
   if (sp->timer)
     XtRemoveTimeOut (sp->timer);
@@ -578,8 +732,13 @@ destroy_splash_window (saver_info *si)
   
   if (sp->heading_label) free (sp->heading_label);
   if (sp->body_label)    free (sp->body_label);
+  if (sp->body2_label)   free (sp->body2_label);
+  if (sp->body3_label)   free (sp->body3_label);
+  if (sp->body4_label)   free (sp->body4_label);
   if (sp->demo_label)    free (sp->demo_label);
+#ifdef PREFS_BUTTON
   if (sp->prefs_label)   free (sp->prefs_label);
+#endif /* PREFS_BUTTON */
   if (sp->help_label)    free (sp->help_label);
 
   if (sp->heading_font) XFreeFont (si->dpy, sp->heading_font);
@@ -594,18 +753,26 @@ destroy_splash_window (saver_info *si)
     XFreeColors (si->dpy, cmap, &sp->button_foreground, 1, 0L);
   if (sp->button_background != black && sp->button_background != white)
     XFreeColors (si->dpy, cmap, &sp->button_background, 1, 0L);
-  if (sp->logo_foreground != black && sp->logo_foreground != white)
-    XFreeColors (si->dpy, cmap, &sp->logo_foreground, 1, 0L);
-  if (sp->logo_background != black && sp->logo_background != white)
-    XFreeColors (si->dpy, cmap, &sp->logo_background, 1, 0L);
   if (sp->shadow_top != black && sp->shadow_top != white)
     XFreeColors (si->dpy, cmap, &sp->shadow_top, 1, 0L);
   if (sp->shadow_bottom != black && sp->shadow_bottom != white)
     XFreeColors (si->dpy, cmap, &sp->shadow_bottom, 1, 0L);
 
+  if (sp->logo_pixmap)
+    XFreePixmap (si->dpy, sp->logo_pixmap);
+  if (sp->logo_clipmask)
+    XFreePixmap (si->dpy, sp->logo_clipmask);
+  if (sp->logo_pixels)
+    {
+      if (sp->logo_npixels)
+        XFreeColors (si->dpy, cmap, sp->logo_pixels, sp->logo_npixels, 0L);
+      free (sp->logo_pixels);
+      sp->logo_pixels = 0;
+      sp->logo_npixels = 0;
+    }
+
   memset (sp, 0, sizeof(*sp));
   free (sp);
-
   si->sp_data = 0;
 }
 
@@ -613,8 +780,10 @@ void
 handle_splash_event (saver_info *si, XEvent *event)
 {
   splash_dialog_data *sp = si->sp_data;
+  saver_screen_info *ssi;
   int which = 0;
   if (!sp) return;
+  ssi = sp->prompt_screen;
 
   switch (event->xany.type)
     {
@@ -630,11 +799,13 @@ handle_splash_event (saver_info *si, XEvent *event)
 	  event->xbutton.y < sp->demo_button_y + sp->button_height)
 	which = 1;
 
+#ifdef PREFS_BUTTON
       else if (event->xbutton.x >= sp->prefs_button_x &&
 	       event->xbutton.x < sp->prefs_button_x + sp->button_width &&
 	       event->xbutton.y >= sp->prefs_button_y &&
 	       event->xbutton.y < sp->prefs_button_y + sp->button_height)
 	which = 2;
+#endif /* PREFS_BUTTON */
 
       else if (event->xbutton.x >= sp->help_button_x &&
 	       event->xbutton.x < sp->help_button_x + sp->button_width &&
@@ -654,15 +825,25 @@ handle_splash_event (saver_info *si, XEvent *event)
 	  if (which && sp->pressed == which)
 	    {
 	      destroy_splash_window (si);
+              sp = si->sp_data;
 	      switch (which)
 		{
-		case 1: do_demo (si); break;
-		case 2: do_prefs (si); break;
-		case 3: do_help (si); break;
+		case 1: do_demo (ssi); break;
+#ifdef PREFS_BUTTON
+		case 2: do_prefs (ssi); break;
+#endif /* PREFS_BUTTON */
+		case 3: do_help (ssi); break;
 		default: abort();
 		}
 	    }
-	  sp->pressed = 0;
+          else if (which == 0 && sp->pressed == 0)
+            {
+              /* click and release on the window but not in a button:
+                 treat that as "dismiss the splash dialog." */
+	      destroy_splash_window (si);
+              sp = si->sp_data;
+            }
+	  if (sp) sp->pressed = 0;
 	  update_splash_window (si);
 	}
       break;
@@ -688,74 +869,49 @@ unsplash_timer (XtPointer closure, XtIntervalId *id)
 # define fork  vfork
 #endif /* VMS */
 
+
 static void
-fork_and_exec (saver_info *si, const char *command, const char *desc)
+do_demo (saver_screen_info *ssi)
 {
+  saver_info *si = ssi->global;
   saver_preferences *p = &si->prefs;
-  pid_t forked;
-  char buf [512];
-  char *av[5];
-  int ac;
-
-  if (!command || !*command)
-    {
-      fprintf (stderr, "%s: no %s command has been specified.\n",
-	       blurb(), desc);
-      return;
-    }
+  const char *cmd = p->demo_command;
 
-  switch ((int) (forked = fork ()))
-    {
-    case -1:
-      sprintf (buf, "%s: couldn't fork", blurb());
-      perror (buf);
-      break;
-
-    case 0:
-      close (ConnectionNumber (si->dpy));		/* close display fd */
-      hack_subproc_environment (si->default_screen);	/* set $DISPLAY */
-      ac = 0;
-      av [ac++] = (char *) p->shell;
-      av [ac++] = (char *) "-c";
-      av [ac++] = (char *) command;
-      av [ac]   = 0;
-      execvp (av[0], av);				/* shouldn't return. */
-
-      sprintf (buf, "%s: execvp(\"%s\", \"%s\", \"%s\") failed",
-	       blurb(), av[0], av[1], av[2]);
-      perror (buf);
-      fflush (stderr);
-      fflush (stdout);
-      exit (1);			 /* Note that this only exits a child fork.  */
-      break;
-
-    default:
-      /* parent fork. */
-      break;
-    }
+  if (cmd && *cmd)
+    fork_and_exec (ssi, cmd);
+  else
+    fprintf (stderr, "%s: no demo-mode command has been specified.\n",
+             blurb());
 }
 
-
+#ifdef PREFS_BUTTON
 static void
-do_demo (saver_info *si)
+do_prefs (saver_screen_info *ssi)
 {
+  saver_info *si = ssi->global;
   saver_preferences *p = &si->prefs;
-  fork_and_exec (si, p->demo_command, "demo-mode");
-}
+  const char *cmd = p->prefs_command;
 
-static void
-do_prefs (saver_info *si)
-{
-  saver_preferences *p = &si->prefs;
-  fork_and_exec (si, p->prefs_command, "preferences");
+  if (command && *command)
+    fork_and_exec (ssi, cmd);
+  else
+    fprintf (stderr, "%s: no preferences command has been specified.\n",
+             blurb());
 }
+#endif /* PREFS_BUTTON */
 
 static void
-do_help (saver_info *si)
+do_help (saver_screen_info *ssi)
 {
+  saver_info *si = ssi->global;
   saver_preferences *p = &si->prefs;
-  char *help_command;
+  char *help_command = 0;
 
+  if (!p->load_url_command || !*p->load_url_command)
+    {
+      fprintf (stderr, "%s: no URL command has been specified.\n", blurb());
+      return;
+    }
   if (!p->help_url || !*p->help_url)
     {
       fprintf (stderr, "%s: no Help URL has been specified.\n", blurb());
@@ -763,8 +919,10 @@ do_help (saver_info *si)
     }
 
   help_command = (char *) malloc (strlen (p->load_url_command) +
-				  (strlen (p->help_url) * 2) + 10);
-  sprintf (help_command, p->load_url_command, p->help_url, p->help_url);
-  fork_and_exec (si, help_command, "URL-loading");
+				  (strlen (p->help_url) * 4) + 10);
+  sprintf (help_command, p->load_url_command,
+           p->help_url, p->help_url, p->help_url, p->help_url);
+
+  fork_and_exec (ssi, help_command);
   free (help_command);
 }