ftp://ftp.krokus.ru/pub/OpenBSD/distfiles/xscreensaver-4.21.tar.gz

[xscreensaver] / driver / test-passwd.c

diff --git a/driver/test-passwd.c b/driver/test-passwd.c
index 9ef2cfe190daeb7fd488bffc989975b5819b85f2..4b6476397b0cfa50b712d8f026b45c18ecddbc55 100644 (file)
--- a/driver/test-passwd.c
+++ b/driver/test-passwd.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1998, 2001 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1998-2005 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -75,6 +75,8 @@ get_screen_viewport (saver_screen_info *ssi,
   *y_ret = 0;
   *w_ret = WidthOfScreen (ssi->screen);
   *h_ret = HeightOfScreen (ssi->screen);
+
+  if (*w_ret > *h_ret * 2) *w_ret /= 2;  /* xinerama kludge */
 }
 
 
@@ -90,6 +92,12 @@ idle_timer (XtPointer closure, XtIntervalId *id)
 }
 
 
+#ifdef __GNUC__
+ __extension__     /* shut up about "string length is greater than the length
+                      ISO C89 compilers are required to support" when including
+                      the .ad file... */
+#endif
+
 static char *fallback[] = {
 #include "XScreenSaver_ad.h"
  0
@@ -140,7 +148,7 @@ main (int argc, char **argv)
 
   hack_uid (si);
 
-  if (! lock_init (argc, argv, si->prefs.verbose_p))
+  if (! lock_init (argc, argv, True))
     {
       si->locking_disabled_p = True;
       si->nolock_reason = "error getting password";
@@ -171,7 +179,6 @@ main (int argc, char **argv)
       XtGetApplicationNameAndClass (si->dpy, &progname, &progclass);
 
       load_init_file (&si->prefs);
-
     }
 
   p->verbose_p = True;