|
1 From 404ef6681b57a43c006b92358ff7794867e01239 Mon Sep 17 00:00:00 2001 |
|
2 From: Alan Coopersmith <[email protected]> |
|
3 Date: Sat, 2 Jan 2016 23:13:46 -0800 |
|
4 Subject: [PATCH] bug 15706879 |
|
5 |
|
6 15706879 SUNBT7033508 Xscreensaver "Black Screen Only" module shows |
|
7 portions of display when session is locked |
|
8 |
|
9 Upstream applicability & status unknown. |
|
10 --- |
|
11 driver/lock.c | 4 ++-- |
|
12 driver/xscreensaver.c | 1 - |
|
13 2 files changed, 2 insertions(+), 3 deletions(-) |
|
14 |
|
15 diff --git a/driver/lock.c b/driver/lock.c |
|
16 index 08f0f98..dc40ca4 100644 |
|
17 --- a/driver/lock.c |
|
18 +++ b/driver/lock.c |
|
19 @@ -918,6 +918,7 @@ new_passwd_window (saver_info *si) |
|
20 blurb(), pw->prompt_screen->number); |
|
21 } |
|
22 |
|
23 +#ifdef CR7033508 |
|
24 /* Before mapping the window, save a pixmap of the current screen. |
|
25 When we lower the window, we restore these bits. This works, |
|
26 because the running screenhack has already been sent SIGSTOP, so |
|
27 @@ -939,6 +940,7 @@ new_passwd_window (saver_info *si) |
|
28 0, 0); |
|
29 XFreeGC (si->dpy, gc); |
|
30 } |
|
31 +#endif /*CR7033508*/ |
|
32 |
|
33 si->pw_data = pw; |
|
34 return 0; |
|
35 @@ -3125,8 +3127,6 @@ unlock_p (saver_info *si) |
|
36 return False; |
|
37 } |
|
38 |
|
39 - raise_window (si, True, True, True); |
|
40 - |
|
41 xss_authenticate(si, p->verbose_p); |
|
42 |
|
43 return (si->unlock_state == ul_success); |
|
44 diff --git a/driver/xscreensaver.c b/driver/xscreensaver.c |
|
45 index 926fc63..7ac855f 100644 |
|
46 --- a/driver/xscreensaver.c |
|
47 +++ b/driver/xscreensaver.c |
|
48 @@ -1349,7 +1349,6 @@ main_loop (saver_info *si) |
|
49 for (i = 0; i < si->nscreens; i++) |
|
50 kill_screenhack (&si->screens[i]); |
|
51 |
|
52 - raise_window (si, True, True, False); |
|
53 if (si->throttled_p || getuid () == 0) |
|
54 fprintf (stderr, "%s: not launching hack (throttled.)\n", blurb()); |
|
55 else |
|
56 -- |
|
57 2.6.1 |
|
58 |