20272N/A/*
20272N/A * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
20272N/A *
20272N/A * Permission is hereby granted, free of charge, to any person obtaining a
20272N/A * copy of this software and associated documentation files (the "Software"),
20272N/A * to deal in the Software without restriction, including without limitation
20272N/A * the rights to use, copy, modify, merge, publish, distribute, sublicense,
20272N/A * and/or sell copies of the Software, and to permit persons to whom the
20272N/A * Software is furnished to do so, subject to the following conditions:
20272N/A *
20272N/A * The above copyright notice and this permission notice (including the next
20272N/A * paragraph) shall be included in all copies or substantial portions of the
20272N/A * Software.
20272N/A *
20272N/A * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
20272N/A * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20272N/A * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
20272N/A * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20272N/A * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
20272N/A * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20272N/A * DEALINGS IN THE SOFTWARE.
20272N/A */
20272N/A
20272N/A
20272N/A--- xscreensaver-5.12/driver/lock.c_org 2011-05-03 22:33:20.519068800 +0530
20272N/A+++ xscreensaver-5.12/driver/lock.c 2011-05-03 22:41:45.786785093 +0530
20272N/A@@ -907,6 +907,7 @@ new_passwd_window (saver_info *si)
20272N/A blurb(), pw->prompt_screen->number);
20272N/A }
20272N/A
20272N/A+#ifdef CR7033508
20272N/A /* Before mapping the window, save a pixmap of the current screen.
20272N/A When we lower the window, we
20272N/A restore these bits. This works, because the running screenhack
20272N/A@@ -929,6 +930,7 @@ new_passwd_window (saver_info *si)
20272N/A 0, 0);
20272N/A XFreeGC (si->dpy, gc);
20272N/A }
20272N/A+#endif /*CR7033508*/
20272N/A
20272N/A si->pw_data = pw;
20272N/A return 0;
20272N/A@@ -3028,8 +3030,6 @@ unlock_p (saver_info *si)
20272N/A return False;
20272N/A }
20272N/A
20272N/A- raise_window (si, True, True, True);
20272N/A-
20272N/A xss_authenticate(si, p->verbose_p);
20272N/A
20272N/A return (si->unlock_state == ul_success);
20272N/A--- xscreensaver-5.12/driver/xscreensaver.c_org 2011-05-03 22:34:12.756063865 +0530
20272N/A+++ xscreensaver-5.12/driver/xscreensaver.c 2011-05-03 22:37:26.784405530 +0530
20272N/A@@ -1283,7 +1283,6 @@ main_loop (saver_info *si)
20272N/A for (i = 0; i < si->nscreens; i++)
20272N/A kill_screenhack (&si->screens[i]);
20272N/A
20272N/A- raise_window (si, True, True, False);
20272N/A if (si->throttled_p || getuid () == 0)
20272N/A fprintf (stderr, "%s: not launching hack (throttled.)\n", blurb());
20272N/A else