From: Zygo Blaxell Date: Mon, 2 Mar 2009 05:43:03 +0000 (-0500) Subject: http://www.mirrorservice.org/sites/master.us.finkmirrors.net/distfiles/md5/fa43fdd68d... X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=commitdiff_plain;h=40eacb5812ef7c0e3374fb139afbb4f5bc8bbfb5 mirrorservice.org/sites/master.us.finkmirrors.net/distfiles/md5/fa43fdd68d75a1d2fa08afb8b0d9fa8e/xscreensaver-4.09.tar.gz -rw-r--r-- 1 zblaxell zblaxell 3503133 May 10 2003 xscreensaver-4.09.tar.gz c5fa5ecd102cf7f157d7a0927b08905cb80b5bf4 xscreensaver-4.09.tar.gz --- diff --git a/README b/README index 339c03f0..2c8e5ddf 100644 --- a/README +++ b/README @@ -70,6 +70,13 @@ the XScreenSaver FAQ about that: http://www.jwz.org/xscreensaver/faq.html ============ +Changes since 4.08: * New hacks, `flyingtoasters', `bouncingcow', + `jigglypuff', and `glslideshow'. + * More models in `engine'. + * Rewrote `xscreensaver-getimage' to remove reliance on + external image loaders (xv, chbg, xloadimage, etc.) + and to reduce flicker when loading files. + * Made `gflux' and `flipscreen3d' be mouse-spinnable. Changes since 4.07: * New hacks, `atunnels' and `piecewise'. * Physics improvement in `fluidballs'. * Various fixes for XDarwin systems (X11 on MacOS X.) diff --git a/config.h.in b/config.h.in index 98d8560c..463963e1 100644 --- a/config.h.in +++ b/config.h.in @@ -19,7 +19,8 @@ */ #undef HAVE_READ_DISPLAY_EXTENSION -/* Define this if you have the XHPDisableReset function (an HP only thing.) +/* Define this if you have the XHPDisableReset function (an HP only thing + which allows the Ctrl-Sh-Reset key sequence to be temporarily disabled.) */ #undef HAVE_XHPDISABLERESET @@ -120,6 +121,12 @@ */ #undef HAVE_XINERAMA +/* Define this if you have the XF86MiscSetGrabKeysState function (which allows + the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key sequences to be temporarily + disabled. Sadly, it doesn't affect Ctrl-Alt-BS or Ctrl-Alt-F1.) + */ +#undef HAVE_XF86MISCSETGRABKEYSSTATE + /* Define this if you have a Linux-like /proc/interrupts file which can be * examined to determine when keyboard activity has occurred. */ diff --git a/configure b/configure index be20bf30..dc1a7e47 100755 --- a/configure +++ b/configure @@ -896,9 +896,7 @@ Graphics options: demos, which will make it possible for them to read GIF, JPEG, and PNG files as well. (The path here is ignored if GTK 2.x is being used.) - --with-jpeg Include support for the JPEG library in some demos. - (If this library is available, webcollage will be a - . lot faster.) + --with-jpeg Include support for the JPEG library. --with-xshm-ext Include support for the Shared Memory extension. --with-xdbe-ext Include support for the DOUBLE-BUFFER extension. --with-readdisplay Include support for the XReadDisplay extension. @@ -10417,12 +10415,115 @@ elif test "$with_xf86gamma" != no; then fi +############################################################################### +# +# Check for XF86MiscSetGrabKeysState (but only bother if we are already +# using other XF86 stuff.) +# +############################################################################### + +have_xf86miscsetgrabkeysstate=no +if test "$have_xf86gamma" = yes -o "$have_xf86vmode" = yes; then + + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" +# ac_save_LIBS="$LIBS" + + if test \! -z "$includedir" ; then + CPPFLAGS="$CPPFLAGS -I$includedir" + fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + + if test \! -z "$libdir" ; then + LDFLAGS="$LDFLAGS -L$libdir" + fi + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $X_LIBS $X_EXTRA_LIBS" + + echo "$as_me:$LINENO: checking for XF86MiscSetGrabKeysState in -lXxf86misc" >&5 +echo $ECHO_N "checking for XF86MiscSetGrabKeysState in -lXxf86misc... $ECHO_C" >&6 +if test "${ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXxf86misc -lXext -lX11 $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char XF86MiscSetGrabKeysState (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +XF86MiscSetGrabKeysState (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&5 +echo "${ECHO_T}$ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState" >&6 +if test $ac_cv_lib_Xxf86misc_XF86MiscSetGrabKeysState = yes; then + have_xf86miscsetgrabkeysstate=yes +else + true +fi + + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" +# LIBS="$ac_save_LIBS" + + if test "$have_xf86miscsetgrabkeysstate" = yes ; then + SAVER_LIBS="$SAVER_LIBS -lXxf86misc" + cat >>confdefs.h <<\_ACEOF +#define HAVE_XF86MISCSETGRABKEYSSTATE 1 +_ACEOF + + fi +fi + + ############################################################################### # # Check for HP XHPDisableReset and XHPEnableReset. # ############################################################################### +echo "$as_me:$LINENO: checking for XHPDisableReset in X11/XHPlib.h" >&5 +echo $ECHO_N "checking for XHPDisableReset in X11/XHPlib.h... $ECHO_C" >&6 ac_save_CPPFLAGS="$CPPFLAGS" if test \! -z "$includedir" ; then @@ -10442,6 +10543,11 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | _ACEOF SAVER_LIBS="-lXhp11 $SAVER_LIBS" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi rm -f conftest* @@ -14654,7 +14760,7 @@ if test "${ac_cv_mesagl_version_string+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat > conftest.$ac_ext < #ifndef MESA_MAJOR_VERSION @@ -19315,7 +19421,13 @@ if test "$have_jpeg" = no ; then echo '' fi - warn2 "This means the \`webcollage' program will be much slower." + if test "$have_gdk_pixbuf" = no ; then + warn2 "This means that it won't be possible for the image-manipulating" + warn2 "display modes to load files from disk; and it also means that" + warn2 "the \`webcollage' program will be much slower." + else + warn2 "This means the \`webcollage' program will be much slower." + fi fi diff --git a/configure.in b/configure.in index dc100ebc..f9ba1a78 100644 --- a/configure.in +++ b/configure.in @@ -1358,15 +1358,37 @@ elif test "$with_xf86gamma" != no; then fi +############################################################################### +# +# Check for XF86MiscSetGrabKeysState (but only bother if we are already +# using other XF86 stuff.) +# +############################################################################### + +have_xf86miscsetgrabkeysstate=no +if test "$have_xf86gamma" = yes -o "$have_xf86vmode" = yes; then + AC_CHECK_X_LIB(Xxf86misc, XF86MiscSetGrabKeysState, + [have_xf86miscsetgrabkeysstate=yes], + [true], -lXext -lX11) + if test "$have_xf86miscsetgrabkeysstate" = yes ; then + SAVER_LIBS="$SAVER_LIBS -lXxf86misc" + AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE) + fi +fi + + ############################################################################### # # Check for HP XHPDisableReset and XHPEnableReset. # ############################################################################### +AC_MSG_CHECKING([for XHPDisableReset in X11/XHPlib.h]) AC_EGREP_X_HEADER(XHPDisableReset, X11/XHPlib.h, [AC_DEFINE(HAVE_XHPDISABLERESET) - SAVER_LIBS="-lXhp11 $SAVER_LIBS"]) + SAVER_LIBS="-lXhp11 $SAVER_LIBS" + AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no)]) ############################################################################### @@ -3025,9 +3047,7 @@ have_jpeg=no with_jpeg_req=unspecified jpeg_halfassed=no AC_ARG_WITH(jpeg, -[ --with-jpeg Include support for the JPEG library in some demos. - (If this library is available, webcollage will be a - . lot faster.)], +[ --with-jpeg Include support for the JPEG library.], [with_jpeg="$withval"; with_jpeg_req="$withval"], [with_jpeg=yes]) @@ -3829,7 +3849,13 @@ if test "$have_jpeg" = no ; then echo '' fi - warn2 "This means the \`webcollage' program will be much slower." + if test "$have_gdk_pixbuf" = no ; then + warn2 "This means that it won't be possible for the image-manipulating" + warn2 "display modes to load files from disk; and it also means that" + warn2 "the \`webcollage' program will be much slower." + else + warn2 "This means the \`webcollage' program will be much slower." + fi fi diff --git a/driver/Makefile.in b/driver/Makefile.in index c4d9c5d5..4e0977c6 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -45,6 +45,7 @@ CONF_DEFS = -DHACK_CONFIGURATION_PATH='"$(HACK_CONF_DIR)"' LIBS = @LIBS@ INTL_LIBS = @INTLLIBS@ +JPEG_LIBS = @JPEG_LIBS@ PERL = @PERL@ DEPEND = @DEPEND@ @@ -198,7 +199,7 @@ SAVER_LIBS = $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \ CMD_LIBS = $(LIBS) $(X_LIBS) \ $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) -GETIMG_LIBS = $(LIBS) $(X_LIBS) $(XPM_LIBS) \ +GETIMG_LIBS = $(LIBS) $(X_LIBS) $(XPM_LIBS) $(JPEG_LIBS) \ $(X_PRE_LIBS) -lXt -lX11 $(XMU_LIBS) -lXext $(X_EXTRA_LIBS) EXES = xscreensaver xscreensaver-command xscreensaver-demo \ diff --git a/driver/XScreenSaver.ad.in b/driver/XScreenSaver.ad.in index 00afdb06..28763d8f 100644 --- a/driver/XScreenSaver.ad.in +++ b/driver/XScreenSaver.ad.in @@ -4,8 +4,8 @@ ! a screen saver and locker for the X window system ! by Jamie Zawinski ! -! version 4.08 -! 18-Feb-2003 +! version 4.09 +! 17-Mar-2003 ! ! See "man xscreensaver" for more info. The latest version is always ! available at http://www.jwz.org/xscreensaver/ @@ -341,8 +341,12 @@ @GL_KLUDGE@ GL: lavalite -root \n\ @GL_KLUDGE@ GL: queens -root \n\ @GL_KLUDGE@ GL: endgame -root \n\ -@GL_KLUDGE@ GL: atunnel -root \n\ - GL: glblur -root \n\ +@GL_KLUDGE@ GL: atunnel -root \n\ +@GL_KLUDGE@ GL: flyingtoasters -root \n\ +@GL_KLUDGE@ GL: bouncingcow -root \n\ +@GL_KLUDGE@ GL: jigglypuff -root \n\ +- GL: glslideshow -root \n\ \ - xdaliclock -root -builtin3 -cycle \n\ - default-n: xearth -nofork -nostars -ncolors 50 \ @@ -637,6 +641,10 @@ XScreenSaver*doc.fontList: *-helvetica-medium-r-*-*-*-100-*-*-*-iso8859-1 *hacks.electricsheep.name: ElectricSheep *hacks.sphereEversion.name: SphereEversion *hacks.fluidballs.name: FluidBalls +*hacks.flyingtoasters.name: FlyingToasters +*hacks.bouncingcow.name: BouncingCow +*hacks.jigglypuff.name: JigglyPuff +*hacks.glslideshow.name: GLSlideshow ! obsolete, but still used by xscreensaver-demo-Xm. *hacks.documentation.isInstalled: True diff --git a/driver/XScreenSaver_ad.h b/driver/XScreenSaver_ad.h index eb21a2f5..e524b955 100644 --- a/driver/XScreenSaver_ad.h +++ b/driver/XScreenSaver_ad.h @@ -243,8 +243,12 @@ GL: lavalite -root \\n\ GL: queens -root \\n\ GL: endgame -root \\n\ - GL: atunnel -root \\n\ - GL: glblur -root \\n\ + GL: atunnel -root \\n\ + GL: flyingtoasters -root \\n\ + GL: bouncingcow -root \\n\ + GL: jigglypuff -root \\n\ +- GL: glslideshow -root \\n\ \ - xdaliclock -root -builtin3 -cycle \\n\ - default-n: xearth -nofork -nostars -ncolors 50 \ @@ -448,4 +452,8 @@ "*hacks.electricsheep.name: ElectricSheep", "*hacks.sphereEversion.name: SphereEversion", "*hacks.fluidballs.name: FluidBalls", +"*hacks.flyingtoasters.name: FlyingToasters", +"*hacks.bouncingcow.name: BouncingCow", +"*hacks.jigglypuff.name: JigglyPuff", +"*hacks.glslideshow.name: GLSlideshow", "*hacks.documentation.isInstalled: True", diff --git a/driver/demo-Gtk-conf.c b/driver/demo-Gtk-conf.c index 9a3bbfc8..23f5944d 100644 --- a/driver/demo-Gtk-conf.c +++ b/driver/demo-Gtk-conf.c @@ -1,5 +1,5 @@ /* demo-Gtk-conf.c --- implements the dynamic configuration dialogs. - * xscreensaver, Copyright (c) 2001 Jamie Zawinski + * xscreensaver, Copyright (c) 2001, 2003 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -669,17 +669,17 @@ make_adjustment (const char *filename, parameter *p) } #endif /* 0 */ - if (p->integer_p) - { - si = (int) (si + 0.5); - pi = (int) (pi + 0.5); - if (si < 1) si = 1; - if (pi < 1) pi = 1; + si = (int) (si + 0.5); + pi = (int) (pi + 0.5); + if (si < 1) si = 1; + if (pi < 1) pi = 1; - if (range <= 500) si = 1; - } - return GTK_ADJUSTMENT (gtk_adjustment_new (value, p->low, p->high, - si, pi, pi)); + if (range <= 500) si = 1; + + return GTK_ADJUSTMENT (gtk_adjustment_new (value, + p->low, + p->high + 1, + si, pi, 1)); } @@ -840,7 +840,7 @@ make_parameter_widget (const char *filename, } gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_BOTTOM); - gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE); + gtk_scale_set_draw_value (GTK_SCALE (scale), debug_p); gtk_scale_set_digits (GTK_SCALE (scale), (p->integer_p ? 0 : 2)); if (row) gtk_table_attach (GTK_TABLE (parent), scale, 1, 2, @@ -906,7 +906,7 @@ make_parameter_widget (const char *filename, } case BOOLEAN: { - p->widget = gtk_check_button_new_with_label (label); + p->widget = gtk_check_button_new_with_label (_(label)); if (row) gtk_table_attach (GTK_TABLE (parent), p->widget, 0, 3, *row, *row + 1, @@ -935,7 +935,7 @@ make_parameter_widget (const char *filename, for (opts = p->options; opts; opts = opts->next) { parameter *s = (parameter *) opts->data; - GtkWidget *i = gtk_menu_item_new_with_label (s->label); + GtkWidget *i = gtk_menu_item_new_with_label (_(s->label)); gtk_widget_show (i); gtk_menu_append (GTK_MENU (menu), i); } @@ -1186,7 +1186,7 @@ parameter_to_switch (parameter *p) char buf[255]; char *s1; float value = (p->invert_p - ? invert_range (adj->lower, adj->upper, adj->value) + ? invert_range (adj->lower, adj->upper, adj->value) - 1 : adj->value); if (value == p->value) /* same as default */ @@ -1544,7 +1544,7 @@ parameter_set_switch (parameter *p, gpointer value) if (1 == sscanf ((char *) value, "%f %c", &f, &c)) { if (p->invert_p) - f = invert_range (adj->lower, adj->upper, f); + f = invert_range (adj->lower, adj->upper, f) - 1; gtk_adjustment_set_value (adj, f); } break; @@ -1686,7 +1686,7 @@ get_description (GList *parms) d[--L] = 0; } - return d; + return _(d); } } @@ -1835,6 +1835,7 @@ load_configurator (const char *full_command_line, gboolean verbose_p) char *prog; char *args; conf_data *cd; + debug_p = verbose_p; split_command_line (full_command_line, &prog, &args); cd = load_configurator_1 (prog, args, verbose_p); free (prog); diff --git a/driver/demo-Gtk.c b/driver/demo-Gtk.c index 159595b3..a85bdbc0 100644 --- a/driver/demo-Gtk.c +++ b/driver/demo-Gtk.c @@ -642,9 +642,9 @@ about_menu_cb (GtkMenuItem *menuitem, gpointer user_data) look as good in the plain-old default Latin1 "C" locale.) */ #ifdef HAVE_GTK2 - sprintf(copy, ("Copyright \xC2\xA9 1991-2002 %s"), s); + sprintf(copy, ("Copyright \xC2\xA9 1991-2003 %s"), s); #else /* !HAVE_GTK2 */ - sprintf(copy, ("Copyright \251 1991-2002 %s"), s); + sprintf(copy, ("Copyright \251 1991-2003 %s"), s); #endif /* !HAVE_GTK2 */ sprintf (msg, "%s\n\n%s", copy, desc); diff --git a/driver/lock.c b/driver/lock.c index 03890a90..47c1b4ee 100644 --- a/driver/lock.c +++ b/driver/lock.c @@ -47,6 +47,11 @@ static void xfree_lock_mode_switch (saver_info *si, Bool lock_p); #endif /* HAVE_XF86VMODE */ +#ifdef HAVE_XF86MISCSETGRABKEYSSTATE +# include + static void xfree_lock_grab_smasher (saver_info *si, Bool lock_p); +#endif /* HAVE_XF86MISCSETGRABKEYSSTATE */ + #ifdef _VROOT_H_ ERROR! You must not include vroot.h in this file. @@ -150,8 +155,9 @@ make_passwd_window (saver_info *si) Screen *screen; Colormap cmap; char *f; + saver_screen_info *ssi = &si->screens [mouse_screen (si)]; - pw->prompt_screen = &si->screens [mouse_screen (si)]; + pw->prompt_screen = ssi; if (si->prefs.verbose_p) fprintf (stderr, "%s: %d: creating password dialog.\n", blurb(), pw->prompt_screen->number); @@ -401,7 +407,8 @@ make_passwd_window (saver_info *si) attrmask, &attrs); XSetWindowBackground (si->dpy, si->passwd_dialog, pw->background); - pw->logo_pixmap = xscreensaver_logo (si->dpy, si->passwd_dialog, cmap, + pw->logo_pixmap = xscreensaver_logo (ssi->screen, ssi->current_visual, + si->passwd_dialog, cmap, pw->background, &pw->logo_pixels, &pw->logo_npixels, 0, True); @@ -897,6 +904,38 @@ hp_lock_reset (saver_info *si, Bool lock_p) } #endif /* HAVE_XHPDISABLERESET */ + +#ifdef HAVE_XF86MISCSETGRABKEYSSTATE + +/* This function enables and disables the Ctrl-Alt-KP_star and + Ctrl-Alt-KP_slash hot-keys, which (in XFree86 4.2) break any + grabs and/or kill the grabbing client. That would effectively + unlock the screen, so we don't like that. + + The Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash hot-keys only exist + if AllowDeactivateGrabs and/or AllowClosedownGrabs are turned on + in XF86Config. I believe they are disabled by default. + + This does not affect any other keys (specifically Ctrl-Alt-BS or + Ctrl-Alt-F1) but I wish it did. Maybe it will someday. + */ +static void +xfree_lock_grab_smasher (saver_info *si, Bool lock_p) +{ + saver_preferences *p = &si->prefs; + int status = XF86MiscSetGrabKeysState (si->dpy, !lock_p); + + if (p->verbose_p && status != MiscExtGrabStateSuccess) + fprintf (stderr, "%s: error: XF86MiscSetGrabKeysState returned %s\n", + blurb(), + (status == MiscExtGrabStateSuccess ? "MiscExtGrabStateSuccess" : + status == MiscExtGrabStateLocked ? "MiscExtGrabStateLocked" : + status == MiscExtGrabStateAlready ? "MiscExtGrabStateAlready" : + "unknown value")); +} +#endif /* HAVE_XF86MISCSETGRABKEYSSTATE */ + + /* This function enables and disables the C-Sh-F1 ... F12 hot-keys, @@ -1357,6 +1396,9 @@ set_locked_p (saver_info *si, Bool locked_p) #ifdef HAVE_XF86VMODE xfree_lock_mode_switch (si, locked_p); /* turn off/on C-Alt-Plus */ #endif +#ifdef HAVE_XF86MISCSETGRABKEYSSTATE + xfree_lock_grab_smasher (si, locked_p); /* turn off/on C-Alt-KP-*,/ */ +#endif store_saver_status (si); /* store locked-p */ } diff --git a/driver/splash.c b/driver/splash.c index 4a5ff733..debeaff4 100644 --- a/driver/splash.c +++ b/driver/splash.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 1991-2002 Jamie Zawinski +/* xscreensaver, Copyright (c) 1991-2003 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -404,7 +404,8 @@ make_splash_dialog (saver_info *si) attrmask, &attrs); XSetWindowBackground (si->dpy, si->splash_dialog, sp->background); - sp->logo_pixmap = xscreensaver_logo (si->dpy, si->splash_dialog, cmap, + sp->logo_pixmap = xscreensaver_logo (ssi->screen, ssi->current_visual, + si->splash_dialog, cmap, sp->background, &sp->logo_pixels, &sp->logo_npixels, 0, True); diff --git a/driver/xscreensaver-command.c b/driver/xscreensaver-command.c index 16eb4e19..41613c7d 100644 --- a/driver/xscreensaver-command.c +++ b/driver/xscreensaver-command.c @@ -1,5 +1,4 @@ -/* xscreensaver-command, Copyright (c) 1991-2002 - * by Jamie Zawinski +/* xscreensaver-command, Copyright (c) 1991-2003 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -53,7 +52,7 @@ static char *usage = "\n\ usage: %s -