X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Ftest-passwd.c;h=42e2e280fb83e9a43c5541cc0dac225def5f6ced;hp=ac5bf99213873d24138e800e23a45283b9695aad;hb=de460e831dc8578acfa8b72251ab9346c99c1f96;hpb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b diff --git a/driver/test-passwd.c b/driver/test-passwd.c index ac5bf992..42e2e280 100644 --- a/driver/test-passwd.c +++ b/driver/test-passwd.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 1998-2007 Jamie Zawinski +/* xscreensaver, Copyright (c) 1998-2008 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 @@ -64,21 +64,6 @@ void shutdown_stderr (saver_info *si) { } const char *blurb(void) { return progname; } Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS; -void -get_screen_viewport (saver_screen_info *ssi, - int *x_ret, int *y_ret, - int *w_ret, int *h_ret, - int tx, int ty, - Bool verbose_p) -{ - *x_ret = 0; - *y_ret = 0; - *w_ret = WidthOfScreen (ssi->screen); - *h_ret = HeightOfScreen (ssi->screen); - - if (*w_ret > *h_ret * 2) *w_ret /= 2; /* xinerama kludge */ -} - void idle_timer (XtPointer closure, XtIntervalId *id) { @@ -230,8 +215,6 @@ main (int argc, char **argv) visual_depth(si->default_screen->screen, si->default_screen->current_visual); - /* I could call get_screen_viewport(), but it is not worthwhile. - * These are used by the save_under pixmap. */ ssip.width = WidthOfScreen(ssip.screen); ssip.height = HeightOfScreen(ssip.screen); @@ -246,6 +229,9 @@ main (int argc, char **argv) pw = getpwuid (getuid ()); si->user = strdup (pw->pw_name); +/* si->nscreens = 0; + si->screens = si->default_screen = 0; */ + while (1) { #ifndef NO_LOCKING