X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fsplash.c;h=02844b58c72b94624c1127c9cb619e774003faf3;hb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;hp=d1cc4de08e9b7f553db74d462405245853e72087;hpb=447db08c956099b3b183886729108bf5b364c4b8;p=xscreensaver

diff --git a/driver/splash.c b/driver/splash.c
index d1cc4de0..02844b58 100644
--- a/driver/splash.c
+++ b/driver/splash.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1991-2005 Jamie Zawinski <jwz@netscape.com>
+/* xscreensaver, Copyright (c) 1991-2008 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));
 }
 
 
@@ -129,6 +126,7 @@ struct splash_dialog_data {
 
   Pixel foreground;
   Pixel background;
+  Pixel border;
   Pixel button_foreground;
   Pixel button_background;
   Pixel shadow_top;
@@ -147,6 +145,7 @@ struct splash_dialog_data {
   Dimension help_button_x, help_button_y;
 
   Pixmap logo_pixmap;
+  Pixmap logo_clipmask;
   int logo_npixels;
   unsigned long *logo_pixels;
 
@@ -172,24 +171,34 @@ make_splash_dialog (saver_info *si)
     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");
 #ifdef PREFS_BUTTON
-  sp->prefs_label = get_string_resource ("splash.prefs.label",
+  sp->prefs_label = get_string_resource (si->dpy,
+                                         "splash.prefs.label",
 					"Dialog.Button.Label");
 #endif /* PREFS_BUTTON */
-  sp->help_label = get_string_resource ("splash.help.label",
+  sp->help_label = get_string_resource (si->dpy,
+                                        "splash.help.label",
 					"Dialog.Button.Label");
 
   if (!sp->heading_label)
@@ -212,27 +221,30 @@ make_splash_dialog (saver_info *si)
     sp->heading_label = s;
   }
 
-  f = get_string_resource ("splash.headingFont", "Dialog.Font");
+  f = get_string_resource (si->dpy, "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");
+  f = get_string_resource(si->dpy, "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");
+  f = get_string_resource(si->dpy, "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->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)
     {
@@ -241,26 +253,30 @@ make_splash_dialog (saver_info *si)
       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->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;
@@ -368,7 +384,7 @@ make_splash_dialog (saver_info *si)
   attrs.event_mask = (ExposureMask | ButtonPressMask | ButtonReleaseMask);
 
   {
-    int sx, sy, w, h;
+    int sx = 0, sy = 0, w, h;
     int mouse_x = 0, mouse_y = 0;
 
     {
@@ -385,7 +401,10 @@ make_splash_dialog (saver_info *si)
         }
     }
 
-    get_screen_viewport (ssi, &sx, &sy, &w, &h, mouse_x, mouse_y, False);
+    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);
@@ -393,7 +412,9 @@ 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,
@@ -403,12 +424,16 @@ make_splash_dialog (saver_info *si)
 		   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, ssi->current_visual,
+  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,
-                                       0, True);
+                                       &sp->logo_clipmask, True);
 
   XMapRaised (si->dpy, si->splash_dialog);
   XSync (si->dpy, False);
@@ -555,6 +580,8 @@ draw_splash_window (saver_info *si)
       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,
@@ -672,6 +699,8 @@ destroy_splash_window (saver_info *si)
 
   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)