projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ftp://ftp.krokus.ru/pub/OpenBSD/distfiles/xscreensaver-4.22.tar.gz
[xscreensaver]
/
driver
/
xscreensaver.c
diff --git
a/driver/xscreensaver.c
b/driver/xscreensaver.c
index 1badde0719764cd87c84ecfeac50c88d67363689..058dd86c091b9c52b84387046785b4778cc9122e 100644
(file)
--- a/
driver/xscreensaver.c
+++ b/
driver/xscreensaver.c
@@
-1,4
+1,4
@@
-/* xscreensaver, Copyright (c) 1991-200
3
Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1991-200
5
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
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@
-255,7
+255,7
@@
do_help (saver_info *si)
fflush (stdout);
fflush (stderr);
fprintf (stdout, "\
fflush (stdout);
fflush (stderr);
fprintf (stdout, "\
-xscreensaver %s, copyright (c) 1991-200
4
by Jamie Zawinski <jwz@jwz.org>\n\
+xscreensaver %s, copyright (c) 1991-200
5
by Jamie Zawinski <jwz@jwz.org>\n\
\n\
All xscreensaver configuration is via the `~/.xscreensaver' file.\n\
Rather than editing that file by hand, just run `xscreensaver-demo':\n\
\n\
All xscreensaver configuration is via the `~/.xscreensaver' file.\n\
Rather than editing that file by hand, just run `xscreensaver-demo':\n\
@@
-719,7
+719,7
@@
print_banner (saver_info *si)
if (p->verbose_p)
fprintf (stderr,
if (p->verbose_p)
fprintf (stderr,
- "%s %s, copyright (c) 1991-200
4
"
+ "%s %s, copyright (c) 1991-200
5
"
"by Jamie Zawinski <jwz@jwz.org>.\n",
progname, si->version);
"by Jamie Zawinski <jwz@jwz.org>.\n",
progname, si->version);
@@
-904,6
+904,8
@@
initialize_per_screen_info (saver_info *si, Widget toplevel_shell)
ssi->number = i;
ssi->screen = ScreenOfDisplay (si->dpy, ssi->real_screen_number);
ssi->number = i;
ssi->screen = ScreenOfDisplay (si->dpy, ssi->real_screen_number);
+ ssi->poll_mouse_last_root_x = -1;
+ ssi->poll_mouse_last_root_y = -1;
if (!si->xinerama_p)
{
if (!si->xinerama_p)
{
@@
-1190,8
+1192,13
@@
main_loop (saver_info *si)
/* Go around the loop and wait for the next bout of idleness,
or for the init file to change, or for a remote command to
come in, or something.
/* Go around the loop and wait for the next bout of idleness,
or for the init file to change, or for a remote command to
come in, or something.
+
+ But, if locked_p is true, go ahead. This can only happen
+ if we're in "disabled" mode but a "lock" clientmessage came
+ in: in that case, we should go ahead and blank/lock the screen.
*/
*/
- continue;
+ if (!si->locked_p)
+ continue;
}
/* Since we're about to blank the screen, kill the de-race timer,
}
/* Since we're about to blank the screen, kill the de-race timer,
@@
-1902,11
+1909,7
@@
handle_clientmessage (saver_info *si, XEvent *event, Bool until_idle_p)
"not compiled with support for locking.",
"locking not enabled.");
#else /* !NO_LOCKING */
"not compiled with support for locking.",
"locking not enabled.");
#else /* !NO_LOCKING */
- if (p->mode == DONT_BLANK)
- clientmessage_response(si, window, True,
- "LOCK ClientMessage received in DONT_BLANK mode.",
- "screen blanking is currently disabled.");
- else if (si->locking_disabled_p)
+ if (si->locking_disabled_p)
clientmessage_response (si, window, True,
"LOCK ClientMessage received, but locking is disabled.",
"locking not enabled.");
clientmessage_response (si, window, True,
"LOCK ClientMessage received, but locking is disabled.",
"locking not enabled.");
@@
-2264,7
+2267,7
@@
display_is_on_console_p (saver_info *si)
void
check_for_leaks (const char *where)
{
void
check_for_leaks (const char *where)
{
-#if
def HAVE_SBRK
+#if
defined(HAVE_SBRK) && defined(LEAK_PARANOIA)
static unsigned long last_brk = 0;
int b = (unsigned long) sbrk(0);
if (last_brk && last_brk < b)
static unsigned long last_brk = 0;
int b = (unsigned long) sbrk(0);
if (last_brk && last_brk < b)