projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://ftp.x.org/contrib/applications/xscreensaver-3.23.tar.gz
[xscreensaver]
/
driver
/
timers.c
diff --git
a/driver/timers.c
b/driver/timers.c
index 5ffc63ed0641efeab11818b6a5697bdb29899b4a..1dbdeff6706481a32ba9a99697a26cf44284bf06 100644
(file)
--- a/
driver/timers.c
+++ b/
driver/timers.c
@@
-230,8
+230,6
@@
cycle_timer (XtPointer closure, XtIntervalId *id)
else
{
maybe_reload_init_file (si);
else
{
maybe_reload_init_file (si);
- if (p->verbose_p)
- fprintf (stderr, "%s: changing graphics hacks.\n", blurb());
kill_screenhack (si);
if (!si->throttled_p)
kill_screenhack (si);
if (!si->throttled_p)
@@
-348,6
+346,16
@@
check_pointer_timer (XtPointer closure, XtIntervalId *id)
else
fprintf (stderr, "%s: pointer moved at %s on screen %d.\n",
blurb(), timestring(), i);
else
fprintf (stderr, "%s: pointer moved at %s on screen %d.\n",
blurb(), timestring(), i);
+
+# if 0
+ fprintf (stderr, "%s: old: %d %d 0x%x ; new: %d %d 0x%x\n",
+ blurb(),
+ ssi->poll_mouse_last_root_x,
+ ssi->poll_mouse_last_root_y,
+ (unsigned int) ssi->poll_mouse_last_child,
+ root_x, root_y, (unsigned int) child);
+# endif /* 0 */
+
#endif /* DEBUG_TIMERS */
si->last_activity_screen = ssi;
#endif /* DEBUG_TIMERS */
si->last_activity_screen = ssi;
@@
-456,7
+464,7
@@
swallow_unlock_typeahead_events (saver_info *si, XEvent *e)
if (event.xany.type == KeyPress)
{
char s[2];
if (event.xany.type == KeyPress)
{
char s[2];
- int size = XLookupString (&event, s, 1, 0, 0);
+ int size = XLookupString (
(XKeyEvent *)
&event, s, 1, 0, 0);
if (size != 1) continue;
switch (*s)
{
if (size != 1) continue;
switch (*s)
{
@@
-1089,11
+1097,12
@@
watchdog_timer (XtPointer closure, XtIntervalId *id)
raise_window (si, True, True, running_p);
}
raise_window (si, True, True, running_p);
}
- if (!monitor_powered_on_p (si))
+ if (screenhack_running_p (si) &&
+ !monitor_powered_on_p (si))
{
if (si->prefs.verbose_p)
fprintf (stderr,
{
if (si->prefs.verbose_p)
fprintf (stderr,
- "%s:
server reports that
monitor has powered down; "
+ "%s:
X says
monitor has powered down; "
"killing running hacks.\n", blurb());
kill_screenhack (si);
}
"killing running hacks.\n", blurb());
kill_screenhack (si);
}