projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://packetstormsecurity.org/UNIX/admin/xscreensaver-4.14.tar.gz
[xscreensaver]
/
driver
/
xscreensaver.c
diff --git
a/driver/xscreensaver.c
b/driver/xscreensaver.c
index de42a100c9980e0ae03fc68f087f24d4c392dc27..09665b665de43e7c4cff488992de83749510e1a2 100644
(file)
--- a/
driver/xscreensaver.c
+++ b/
driver/xscreensaver.c
@@
-1667,6
+1667,14
@@
handle_clientmessage (saver_info *si, XEvent *event, Bool until_idle_p)
{
if (until_idle_p)
{
{
if (until_idle_p)
{
+ if (p->mode == DONT_BLANK)
+ {
+ clientmessage_response(si, window, True,
+ "ACTIVATE ClientMessage received in DONT_BLANK mode.",
+ "screen blanking is currently disabled.");
+ return False;
+ }
+
clientmessage_response(si, window, False,
"ACTIVATE ClientMessage received.",
"activating.");
clientmessage_response(si, window, False,
"ACTIVATE ClientMessage received.",
"activating.");
@@
-1771,6
+1779,14
@@
handle_clientmessage (saver_info *si, XEvent *event, Bool until_idle_p)
char buf2 [255];
long which = event->xclient.data.l[1];
char buf2 [255];
long which = event->xclient.data.l[1];
+ if (p->mode == DONT_BLANK)
+ {
+ clientmessage_response(si, window, True,
+ "SELECT ClientMessage received in DONT_BLANK mode.",
+ "screen blanking is currently disabled.");
+ return False;
+ }
+
sprintf (buf, "SELECT %ld ClientMessage received.", which);
sprintf (buf2, "activating (%ld).", which);
clientmessage_response (si, window, False, buf, buf2);
sprintf (buf, "SELECT %ld ClientMessage received.", which);
sprintf (buf2, "activating (%ld).", which);
clientmessage_response (si, window, False, buf, buf2);
@@
-1890,7
+1906,11
@@
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 (si->locking_disabled_p)
+ 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)
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.");