X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fsplash.c;h=e715f4fc5921b983cd5c5e17ed1bd47f42d3589a;hp=630c44d7e522c3009596c58fbd034ce80e023167;hb=2a991a811de4c7b22f812682b267b616a809fd9a;hpb=ce3185de9d9705e259f2b60dd4b5509007fa17d4

diff --git a/driver/splash.c b/driver/splash.c
index 630c44d7..e715f4fc 100644
--- a/driver/splash.c
+++ b/driver/splash.c
@@ -14,92 +14,83 @@
 #endif
 
 #include <X11/Intrinsic.h>
-#include <X11/StringDefs.h>
-
-#ifdef HAVE_MOTIF
-# include <Xm/Xm.h>
-
-#else  /* HAVE_ATHENA */
-# include <X11/Shell.h>
-# include <X11/Xaw/Form.h>
-# include <X11/Xaw/Box.h>
-# include <X11/Xaw/Command.h>
-# include <X11/Xaw/Dialog.h>
-#endif /* HAVE_ATHENA */
 
 #include "xscreensaver.h"
-#include "visual.h"
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
+#include "resources.h"
 
-extern void skull (Display *, Window, GC, GC, int, int, int, int);
+#undef MAX
+#define MAX(a,b) ((a)>(b)?(a):(b))
 
 void
-roger (Widget button, XtPointer client_data, XtPointer call_data)
+draw_shaded_rectangle (Display *dpy, Window window,
+		       int x, int y,
+		       int width, int height,
+		       int thickness,
+		       unsigned long top_color,
+		       unsigned long bottom_color)
 {
-  Display *dpy = XtDisplay (button);
-  Screen *screen = XtScreen (button);
-  Window window = XtWindow (button);
-  Arg av [10];
-  int ac = 0;
+  XPoint points[4];
   XGCValues gcv;
-  Colormap cmap;
-  GC draw_gc, erase_gc;
-  unsigned int fg, bg;
-  int x, y, size;
-  XWindowAttributes xgwa;
-  XGetWindowAttributes (dpy, window, &xgwa);
-  cmap = xgwa.colormap;
-  if (xgwa.width > xgwa.height) size = xgwa.height;
-  else size = xgwa.width;
-  if (size > 40) size -= 30;
-  x = (xgwa.width - size) / 2;
-  y = (xgwa.height - size) / 2;
-  XtSetArg (av [ac], XtNforeground, &fg); ac++;
-  XtSetArg (av [ac], XtNbackground, &bg); ac++;
-  XtGetValues (button, av, ac);
-  /* if it's black on white, swap it cause it looks better (hack hack) */
-  if (fg == BlackPixelOfScreen (screen) && bg == WhitePixelOfScreen (screen))
-    fg = WhitePixelOfScreen (screen), bg = BlackPixelOfScreen (screen);
-  gcv.foreground = bg;
-  erase_gc = XCreateGC (dpy, window, GCForeground, &gcv);
-  gcv.foreground = fg;
-  draw_gc = XCreateGC (dpy, window, GCForeground, &gcv);
-  XFillRectangle (dpy, window, erase_gc, 0, 0, xgwa.width, xgwa.height);
-  skull (dpy, window, draw_gc, erase_gc, x, y, size, size);
-  XFreeGC (dpy, draw_gc);
-  XFreeGC (dpy, erase_gc);
+  GC gc1, gc2;
+  if (thickness == 0) return;
+
+  gcv.foreground = top_color;
+  gc1 = XCreateGC (dpy, window, GCForeground, &gcv);
+  gcv.foreground = bottom_color;
+  gc2 = XCreateGC (dpy, window, GCForeground, &gcv);
+
+  points [0].x = x;
+  points [0].y = y;
+  points [1].x = x + width;
+  points [1].y = y;
+  points [2].x = x + width - thickness;
+  points [2].y = y + thickness;
+  points [3].x = x;
+  points [3].y = y + thickness;
+  XFillPolygon (dpy, window, gc1, points, 4, Convex, CoordModeOrigin);
+
+  points [0].x = x;
+  points [0].y = y + thickness;
+  points [1].x = x;
+  points [1].y = y + height;
+  points [2].x = x + thickness;
+  points [2].y = y + height - thickness;
+  points [3].x = x + thickness;
+  points [3].y = y + thickness;
+  XFillPolygon (dpy, window, gc1, points, 4, Convex, CoordModeOrigin);
+
+  points [0].x = x + width;
+  points [0].y = y;
+  points [1].x = x + width - thickness;
+  points [1].y = y + thickness;
+  points [2].x = x + width - thickness;
+  points [2].y = y + height - thickness;
+  points [3].x = x + width;
+  points [3].y = y + height - thickness;
+  XFillPolygon (dpy, window, gc2, points, 4, Convex, CoordModeOrigin);
+
+  points [0].x = x;
+  points [0].y = y + height;
+  points [1].x = x + width;
+  points [1].y = y + height;
+  points [2].x = x + width;
+  points [2].y = y + height - thickness;
+  points [3].x = x + thickness;
+  points [3].y = y + height - thickness;
+  XFillPolygon (dpy, window, gc2, points, 4, Convex, CoordModeOrigin);
+
+  XFreeGC (dpy, gc1);
+  XFreeGC (dpy, gc2);
 }
 
 
-static Widget splash_shell;
-extern Widget splash_dialog;
-extern Widget splash_form;
-extern Widget splash_roger_label;
-extern Widget splash_label1;
-extern Widget splash_label3;
-extern Widget splash_demo;
-extern Widget splash_prefs;
-extern Widget splash_help;
-
-static void
-splash_sink(saver_info *si)
-{
-  if (si->splash_dialog)
-    {
-      XtDestroyWidget(si->splash_dialog);
-      XtDestroyWidget(splash_shell);
-      si->splash_dialog = 0;
-      splash_shell = 0;
-    }
-}
-
-static void
-splash_sink_timer (XtPointer closure, XtIntervalId *id)
+int
+string_width (XFontStruct *font, char *s)
 {
-  saver_info *si = (saver_info *) closure;
-  splash_sink(si);
+  int direction, ascent, descent;
+  XCharStruct overall;
+  XTextExtents (font, s, strlen(s), &direction, &ascent, &descent, &overall);
+  return overall.width;
 }
 
 
@@ -114,132 +105,597 @@ send_self_clientmessage (saver_info *si, Atom command)
   event.xclient.window = window;
   event.xclient.message_type = XA_SCREENSAVER;
   event.xclient.format = 32;
+  memset (&event.xclient.data, 0, sizeof(event.xclient.data));
   event.xclient.data.l[0] = (long) command;
   if (! XSendEvent (dpy, window, False, 0L, &event))
     fprintf (stderr, "%s: XSendEvent(dpy, 0x%x ...) failed.\n",
 	     progname, (unsigned int) window);
 }
 
-static void
-splash_demo_cb (Widget button, XtPointer client_data, XtPointer call_data)
-{
-  saver_info *si = (saver_info *) client_data;
-  splash_sink(si);
-  send_self_clientmessage (si, XA_DEMO);
-}
 
 static void
-splash_prefs_cb (Widget button, XtPointer client_data, XtPointer call_data)
+get_help (saver_info *si)
 {
-  saver_info *si = (saver_info *) client_data;
-  splash_sink(si);
-  send_self_clientmessage (si, XA_PREFS);
-}
-
-static void
-splash_help_cb (Widget button, XtPointer client_data, XtPointer call_data)
-{
-  saver_info *si = (saver_info *) client_data;
   saver_preferences *p = &si->prefs;
 
-  splash_sink(si);
-
   if (!p->help_url || !*p->help_url)
-    fprintf(stderr, "%s: no Help URL has been specified.\n");
+    fprintf (stderr, "%s: no Help URL has been specified.\n", blurb());
   else if (!p->load_url_command || !*p->load_url_command)
-    fprintf(stderr, "%s: no URL-loading command has been specified.\n");
+    fprintf (stderr, "%s: no URL-loading command has been specified.\n",
+	     blurb());
   else
     {
       char *buf = (char *) malloc (strlen(p->load_url_command) +
 				   (strlen(p->help_url) * 2) + 10);
-      sprintf(buf, p->load_url_command, p->help_url, p->help_url);
-      system(buf);
+      sprintf (buf, p->load_url_command, p->help_url, p->help_url);
+      system (buf);
     }
 }
 
-static void
+static void update_splash_window (saver_info *si);
+static void draw_splash_window (saver_info *si);
+static void destroy_splash_window (saver_info *si);
+static void unsplash_timer (XtPointer closure, XtIntervalId *id);
+
+
+struct splash_dialog_data {
+  XtIntervalId timer;
+
+  Dimension width;
+  Dimension height;
+
+  char *heading_label;
+  char *body_label;
+  char *body2_label;
+  char *demo_label;
+  char *prefs_label;
+  char *help_label;
+
+  XFontStruct *heading_font;
+  XFontStruct *body_font;
+  XFontStruct *button_font;
+
+  Pixel foreground;
+  Pixel background;
+  Pixel button_foreground;
+  Pixel button_background;
+  Pixel logo_foreground;
+  Pixel logo_background;
+  Pixel shadow_top;
+  Pixel shadow_bottom;
+
+  Dimension logo_width;
+  Dimension logo_height;
+  Dimension internal_border;
+  Dimension shadow_width;
+
+  Dimension button_width, button_height;
+  Dimension demo_button_x, demo_button_y;
+  Dimension prefs_button_x, prefs_button_y;
+  Dimension help_button_x, help_button_y;
+
+  int pressed;
+};
+
+
+void
 make_splash_dialog (saver_info *si)
 {
-  saver_screen_info *ssi = si->default_screen;
-  Visual *v = DefaultVisualOfScreen(ssi->screen);
+  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;
+
+  if (si->sp_data)
+    return;
+  if (si->prefs.splash_duration <= 0)
+    return;
 
-  /* The splash dialog must always be created on the default visual and
-     with the default colormap, so that it shows up in the right colors
-     when viewed along with the rest of the desktop.  The other xscreensaver
-     dialogs don't have this constraint, since they are only seen when the
-     blackout window is also exposed.
+  sp = (splash_dialog_data *) calloc (1, sizeof(*sp));
+
+  sp->heading_label = get_string_resource ("splash.heading.label",
+					   "Dialog.Label.Label");
+  sp->body_label = get_string_resource ("splash.body.label",
+					"Dialog.Label.Label");
+  sp->body2_label = get_string_resource ("splash.body2.label",
+					 "Dialog.Label.Label");
+  sp->demo_label = get_string_resource ("splash.demo.label",
+					"Dialog.Button.Label");
+  sp->prefs_label = get_string_resource ("splash.prefs.label",
+					"Dialog.Button.Label");
+  sp->help_label = get_string_resource ("splash.help.label",
+					"Dialog.Button.Label");
+
+  if (!sp->heading_label)
+    sp->heading_label = strdup("ERROR: REESOURCES NOT INSTALLED CORRECTLY");
+  if (!sp->body_label)
+    sp->body_label = strdup("ERROR: REESOURCES NOT INSTALLED CORRECTLY");
+  if (!sp->body2_label)
+    sp->body2_label = strdup("ERROR: REESOURCES NOT INSTALLED CORRECTLY");
+  if (!sp->demo_label) sp->demo_label = strdup("ERROR");
+  if (!sp->prefs_label) sp->prefs_label = strdup("ERROR");
+  if (!sp->help_label) sp->help_label = strdup("ERROR");
+
+  /* Put the version number in the label. */
+  {
+    char *s = (char *) malloc (strlen(sp->heading_label) + 20);
+    sprintf(s, sp->heading_label, si->version);
+    free (sp->heading_label);
+    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);
+
+  if (sp->foreground == sp->background)
+    {
+      /* Make sure the error messages show up. */
+      sp->foreground = BlackPixelOfScreen (screen);
+      sp->background = WhitePixelOfScreen (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",
+					 "Dialog.Logo.Width");
+  sp->logo_height = get_integer_resource ("splash.logo.height",
+					  "Dialog.Logo.Height");
+  sp->internal_border = get_integer_resource ("splash.internalBorderWidth",
+					      "Dialog.InternalBorderWidth");
+  sp->shadow_width = get_integer_resource ("splash.shadowThickness",
+					   "Dialog.ShadowThickness");
+
+  if (sp->logo_width == 0)  sp->logo_width = 150;
+  if (sp->logo_height == 0) sp->logo_height = 150;
+  if (sp->internal_border == 0) sp->internal_border = 15;
+  if (sp->shadow_width == 0) sp->shadow_width = 4;
+
+  {
+    int direction, ascent, descent;
+    XCharStruct overall;
+
+    sp->width = 0;
+    sp->height = 0;
+
+    /* Measure the heading_label. */
+    XTextExtents (sp->heading_font,
+		  sp->heading_label, strlen(sp->heading_label),
+		  &direction, &ascent, &descent, &overall);
+    if (overall.width > sp->width) sp->width = overall.width;
+    sp->height += ascent + descent;
+
+    /* Measure the body_label. */
+    XTextExtents (sp->body_font,
+		  sp->body_label, strlen(sp->body_label),
+		  &direction, &ascent, &descent, &overall);
+    if (overall.width > sp->width) sp->width = overall.width;
+    sp->height += ascent + descent;
+
+    /* Measure the body2_label. */
+    XTextExtents (sp->body_font,
+		  sp->body2_label, strlen(sp->body2_label),
+		  &direction, &ascent, &descent, &overall);
+    if (overall.width > sp->width) sp->width = overall.width;
+    sp->height += ascent + descent;
+
+    {
+      Dimension w2 = 0, w3 = 0, w4 = 0;
+      Dimension h2 = 0, h3 = 0, h4 = 0;
+
+      /* Measure the Demo button. */
+      XTextExtents (sp->button_font,
+		    sp->demo_label, strlen(sp->demo_label),
+		    &direction, &ascent, &descent, &overall);
+      w2 = overall.width;
+      h2 = ascent + descent;
+
+      /* 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;
+
+      /* Measure the Help button. */
+      XTextExtents (sp->button_font,
+		    sp->help_label, strlen(sp->help_label),
+		    &direction, &ascent, &descent, &overall);
+      w4 = overall.width;
+      h4 = ascent + descent;
+
+      w2 = MAX(w2, w3); w2 = MAX(w2, w4);
+      h2 = MAX(h2, h3); h2 = MAX(h2, h4);
+
+      w2 += ((ascent + descent) / 2) + (sp->shadow_width * 2);
+      h2 += ((ascent + descent) / 2) + (sp->shadow_width * 2);
+
+      sp->button_width = w2;
+      sp->button_height = h2;
+
+      w2 *= 3;
+
+      w2 += ((ascent + descent) * 2);  /* for space between buttons */
+
+      if (w2 > sp->width) sp->width = w2;
+      sp->height += h2;
+    }
+
+    sp->width  += (sp->internal_border * 2);
+    sp->height += (sp->internal_border * 3);
+
+    if (sp->logo_height > sp->height)
+      sp->height = sp->logo_height;
+    else if (sp->height > sp->logo_height)
+      sp->logo_height = sp->height;
+
+    sp->logo_width = sp->logo_height;
+
+    sp->width += sp->logo_width;
+  }
+
+  attrmask |= CWOverrideRedirect; attrs.override_redirect = True;
+  attrmask |= CWEventMask;
+  attrs.event_mask = (ExposureMask | ButtonPressMask | ButtonReleaseMask);
 
-     To accomplish this, we need our own ApplicationShell, since the shell
-     in si->default_screen->toplevel_shell might have a non-default visual.
-   */
-  splash_shell = XtVaAppCreateShell (progname, progclass,
-				     applicationShellWidgetClass,
-				     si->dpy,
-				     XtNscreen, ssi->screen,
-				     XtNvisual, v,
-				     XtNdepth,  visual_depth(ssi->screen, v),
-				     0);
-
-  create_splash_dialog (splash_shell, v,
-			DefaultColormapOfScreen (ssi->screen));
-  si->splash_dialog = splash_dialog; /* gaaah... */
-
-#ifdef HAVE_ATHENA
-  XawDialogAddButton(splash_form,"demo",  splash_demo_cb, si);
-  XawDialogAddButton(splash_form,"prefs", splash_prefs_cb, si);
-  XawDialogAddButton(splash_form,"help",  splash_help_cb, si);
-  splash_demo  = XtNameToWidget(splash_form,"demo");
-  splash_prefs = XtNameToWidget(splash_form,"prefs");
-  splash_help  = XtNameToWidget(splash_form,"help");
-
-  /* Lose the label on the inner dialog. */
   {
-    Widget w = XtNameToWidget(splash_form, "label");
-    if (w) XtUnmanageChild(w);
+    Dimension w = WidthOfScreen(screen);
+    Dimension h = HeightOfScreen(screen);
+    if (si->prefs.debug_p) w /= 2;
+    x = ((w + sp->width) / 2) - sp->width;
+    y = ((h + sp->height) / 2) - sp->height;
+    if (x < 0) x = 0;
+    if (y < 0) y = 0;
   }
 
-#else  /* HAVE_MOTIF */
-  /* Another random thing necessary in 1.2.1 but not 1.1.5... */
-  XtVaSetValues (splash_roger_label, XmNborderWidth, 1, 0);
+  bw = get_integer_resource ("splash.borderWidth", "Dialog.BorderWidth");
 
-  XtAddCallback (splash_demo, XmNactivateCallback, splash_demo_cb, si);
-  XtAddCallback (splash_prefs, XmNactivateCallback, splash_prefs_cb, si);
-  XtAddCallback (splash_help, XmNactivateCallback, splash_help_cb, si);
-  XtAddCallback (splash_roger_label, XmNexposeCallback, roger, si);
+  si->splash_dialog =
+    XCreateWindow (si->dpy,
+		   RootWindowOfScreen(screen),
+		   x, y, sp->width, sp->height, bw,
+		   DefaultDepthOfScreen (screen), InputOutput,
+		   DefaultVisualOfScreen(screen),
+		   attrmask, &attrs);
+  XSetWindowBackground (si->dpy, si->splash_dialog, sp->background);
 
-#endif /* HAVE_MOTIF */
+  XMapRaised (si->dpy, si->splash_dialog);
+  XSync (si->dpy, False);
 
-  format_into_label (splash_label1, si->version);
+  si->sp_data = sp;
 
-  XtRealizeWidget(splash_dialog);
+  sp->timer = XtAppAddTimeOut (si->app, si->prefs.splash_duration,
+			       unsplash_timer, (XtPointer) si);
+
+  draw_splash_window (si);
+  XSync (si->dpy, False);
 }
 
-void
-pop_splash_dialog (saver_info *si)
+static void
+draw_splash_window (saver_info *si)
 {
-  XtIntervalId splash_sink_id;
+  splash_dialog_data *sp = si->sp_data;
+  XGCValues gcv;
+  GC gc1, gc2;
+  int hspacing, vspacing, height;
+  int x1, x2, x3, y1, y2;
+  int sw;
+
+  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 +
+	    sp->button_font->ascent + sp->button_font->descent);
+  vspacing = ((sp->height
+	       - (4 * sp->shadow_width)
+	       - (2 * sp->internal_border)
+	       - height) / 5);
+  if (vspacing < 0) vspacing = 0;
+  if (vspacing > (sp->heading_font->ascent * 2))
+    vspacing = (sp->heading_font->ascent * 2);
+	    
+  gcv.foreground = sp->foreground;
+  gc1 = XCreateGC (si->dpy, si->splash_dialog, GCForeground, &gcv);
+  gc2 = XCreateGC (si->dpy, si->splash_dialog, GCForeground, &gcv);
+  x1 = sp->logo_width;
+  x3 = sp->width - (sp->shadow_width * 2);
+  y1 = sp->internal_border;
+
+  /* top heading
+   */
+  XSetFont (si->dpy, gc1, sp->heading_font->fid);
+  sw = string_width (sp->heading_font, sp->heading_label);
+  x2 = (x1 + ((x3 - x1 - sw) / 2));
+  y1 += sp->heading_font->ascent;
+  XDrawString (si->dpy, si->splash_dialog, gc1, x2, y1,
+	       sp->heading_label, strlen(sp->heading_label));
+  y1 += sp->heading_font->descent;
+
+  /* text below top heading
+   */
+  XSetFont (si->dpy, gc1, sp->body_font->fid);
+  y1 += vspacing + sp->body_font->ascent;
+  sw = string_width (sp->body_font, sp->body_label);
+  x2 = (x1 + ((x3 - x1 - sw) / 2));
+  XDrawString (si->dpy, si->splash_dialog, gc1, x2, y1,
+	       sp->body_label, strlen(sp->body_label));
+  y1 += sp->body_font->descent;
+
+  y1 += sp->body_font->ascent;
+  sw = string_width (sp->body_font, sp->body2_label);
+  x2 = (x1 + ((x3 - x1 - sw) / 2));
+  XDrawString (si->dpy, si->splash_dialog, gc1, x2, y1,
+	       sp->body2_label, strlen(sp->body2_label));
+  y1 += sp->body_font->descent;
+
+  /* The buttons
+   */
+  XSetForeground (si->dpy, gc1, sp->button_foreground);
+  XSetForeground (si->dpy, gc2, sp->button_background);
+
+/*  y1 += (vspacing * 2);*/
+  y1 = sp->height - sp->internal_border - sp->button_height;
+
+  x1 += sp->internal_border;
+  y2 = (y1 + ((sp->button_height -
+	       (sp->button_font->ascent + sp->button_font->descent))
+	      / 2)
+	+ sp->button_font->ascent);
+  hspacing = ((sp->width - x1 - (sp->shadow_width * 2) -
+	       sp->internal_border - (sp->button_width * 3))
+	      / 2);
+
+  x2 = x1 + ((sp->button_width - string_width(sp->button_font, sp->demo_label))
+	     / 2);
+  XFillRectangle (si->dpy, si->splash_dialog, gc2, x1, y1,
+		  sp->button_width, sp->button_height);
+  XDrawString (si->dpy, si->splash_dialog, gc1, x2, y2,
+	       sp->demo_label, strlen(sp->demo_label));
+  sp->demo_button_x = x1;
+  sp->demo_button_y = y1;
+  
+  x1 += hspacing + sp->button_width;
+  x2 = x1 + ((sp->button_width - string_width(sp->button_font,sp->prefs_label))
+	     / 2);
+  XFillRectangle (si->dpy, si->splash_dialog, gc2, x1, y1,
+		  sp->button_width, sp->button_height);
+  XDrawString (si->dpy, si->splash_dialog, gc1, x2, y2,
+	       sp->prefs_label, strlen(sp->prefs_label));
+  sp->prefs_button_x = x1;
+  sp->prefs_button_y = y1;
+
+  x1 += hspacing + sp->button_width;
+  x2 = x1 + ((sp->button_width - string_width(sp->button_font,sp->help_label))
+	     / 2);
+  XFillRectangle (si->dpy, si->splash_dialog, gc2, x1, y1,
+		  sp->button_width, sp->button_height);
+  XDrawString (si->dpy, si->splash_dialog, gc1, x2, y2,
+	       sp->help_label, strlen(sp->help_label));
+  sp->help_button_x = x1;
+  sp->help_button_y = y1;
+
+
+  /* the logo
+   */
+  XSetForeground (si->dpy, gc1, sp->logo_foreground);
+  XSetForeground (si->dpy, gc2, sp->logo_background);
 
-  if (si->prefs.splash_duration <= 0)
-    return;
+  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);
 
-  if (! si->splash_dialog)
-    make_splash_dialog (si);
+  XFillRectangle (si->dpy, si->splash_dialog, gc2, x1, y1, x2, y2);
+  skull (si->dpy, si->splash_dialog, gc1, gc2,
+	 x1 + sp->shadow_width, y1 + sp->shadow_width,
+	 x2 - (sp->shadow_width * 2), y2 - (sp->shadow_width * 2));
 
-#ifdef HAVE_ATHENA
-  splash_form = splash_dialog; /* kludge */
-#endif
 
-  pop_up_dialog_box (splash_dialog, splash_form,
-		     /* for debugging -- don't ask */
-		     (si->prefs.debug_p ? 69 : 0) +
-		     3);
-  XtManageChild (splash_form);
+  /* 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,
+			 sp->shadow_bottom, sp->shadow_top);
+
+  /* The shadow around the whole window
+   */
+  draw_shaded_rectangle (si->dpy, si->splash_dialog,
+			 0, 0, sp->width, sp->height, sp->shadow_width,
+			 sp->shadow_top, sp->shadow_bottom);
+
+  XFreeGC (si->dpy, gc1);
+  XFreeGC (si->dpy, gc2);
+
+  update_splash_window (si);
+}
 
-#ifdef HAVE_ATHENA
-  if (splash_roger_label)
-    roger (splash_roger_label, 0, 0);
-#endif /* HAVE_ATHENA */
 
-  splash_sink_id = XtAppAddTimeOut (si->app, si->prefs.splash_duration,
-				    splash_sink_timer, (XtPointer) si);
+static void
+update_splash_window (saver_info *si)
+{
+  splash_dialog_data *sp = si->sp_data;
+  int pressed;
+  if (!sp) return;
+  pressed = sp->pressed;
+
+  /* The shadows around the buttons
+   */
+  draw_shaded_rectangle (si->dpy, si->splash_dialog,
+			 sp->demo_button_x, sp->demo_button_y,
+			 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));
+  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));
+  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,
+			 (pressed == 3 ? sp->shadow_bottom : sp->shadow_top),
+			 (pressed == 3 ? sp->shadow_top : sp->shadow_bottom));
+}
+
+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);
+
+  if (sp->timer)
+    XtRemoveTimeOut (sp->timer);
+
+  if (si->splash_dialog)
+    {
+      XDestroyWindow (si->dpy, si->splash_dialog);
+      si->splash_dialog = 0;
+    }
+  
+  if (sp->heading_label) free (sp->heading_label);
+  if (sp->body_label)    free (sp->body_label);
+  if (sp->demo_label)    free (sp->demo_label);
+  if (sp->prefs_label)   free (sp->prefs_label);
+  if (sp->help_label)    free (sp->help_label);
+
+  if (sp->heading_font) XFreeFont (si->dpy, sp->heading_font);
+  if (sp->body_font)    XFreeFont (si->dpy, sp->body_font);
+  if (sp->button_font)  XFreeFont (si->dpy, sp->button_font);
+
+  if (sp->foreground != black && sp->foreground != white)
+    XFreeColors (si->dpy, cmap, &sp->foreground, 1, 0L);
+  if (sp->background != black && sp->background != white)
+    XFreeColors (si->dpy, cmap, &sp->background, 1, 0L);
+  if (sp->button_foreground != black && sp->button_foreground != white)
+    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);
+
+  memset (sp, 0, sizeof(*sp));
+  free (sp);
+
+  si->sp_data = 0;
+}
+
+void
+handle_splash_event (saver_info *si, XEvent *event)
+{
+  splash_dialog_data *sp = si->sp_data;
+  int which = 0;
+  if (!sp) return;
+
+  switch (event->xany.type)
+    {
+    case Expose:
+      draw_splash_window (si);
+      break;
+
+    case ButtonPress: case ButtonRelease:
+
+      if (event->xbutton.x >= sp->demo_button_x &&
+	  event->xbutton.x < sp->demo_button_x + sp->button_width &&
+	  event->xbutton.y >= sp->demo_button_y &&
+	  event->xbutton.y < sp->demo_button_y + sp->button_height)
+	which = 1;
+
+      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;
+
+      else if (event->xbutton.x >= sp->help_button_x &&
+	       event->xbutton.x < sp->help_button_x + sp->button_width &&
+	       event->xbutton.y >= sp->help_button_y &&
+	       event->xbutton.y < sp->help_button_y + sp->button_height)
+	which = 3;
+
+      if (event->xany.type == ButtonPress)
+	{
+	  sp->pressed = which;
+	  update_splash_window (si);
+	  if (which == 0)
+	    XBell (si->dpy, False);
+	}
+      else if (event->xany.type == ButtonRelease)
+	{
+	  if (which && sp->pressed == which)
+	    {
+	      destroy_splash_window (si);
+	      switch (which)
+		{
+		case 1: send_self_clientmessage (si, XA_DEMO); break;
+		case 2: send_self_clientmessage (si, XA_PREFS); break;
+		case 3: get_help (si); break;
+		default: abort();
+		}
+	    }
+	  sp->pressed = 0;
+	  update_splash_window (si);
+	}
+      break;
+
+    default:
+      break;
+    }
+}
+
+static void
+unsplash_timer (XtPointer closure, XtIntervalId *id)
+{
+  saver_info *si = (saver_info *) closure;
+  if (si && si->sp_data)
+    destroy_splash_window (si);
 }