/*

 * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice (including the next

 * paragraph) shall be included in all copies or substantial portions of the

 * Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

 * DEALINGS IN THE SOFTWARE.

 */

/* 

 * It fixes bug 6757448 and 6924996

 * 6757448 xscreensaver doesn't notice XRandR resize events

 * 6924996 High volume of error message display in SPARC:

	"Xlib: extension "RANDR" missing on display from screensaver" 

 */

diff --git xscreensaver-5.11/driver/lock.c xscreensaver-5.11/driver/lock.c

--- xscreensaver-5.11/driver/lock.c

+++ xscreensaver-5.11/driver/lock.c

@@ -50,6 +50,9 @@

   static void xfree_lock_grab_smasher (saver_info *si, Bool lock_p);

 #endif /* HAVE_XF86MISCSETGRABKEYSSTATE */

+#ifdef HAVE_RANDR

+#include <X11/extensions/Xrandr.h>

+#endif /* HAVE_RANDR */

 #ifdef _VROOT_H_

 ERROR!  You must not include vroot.h in this file.

@@ -2536,6 +2539,57 @@ passwd_event_loop (saver_info *si)

     {

       XtAppNextEvent (si->app, &event);

+#ifdef HAVE_RANDR

+    /*

+     * 6757448 xscreensaver doesn't notice XRandR resize events.

+     */

+      if (si->using_randr_extension &&

+          (event.type == (si->randr_event_number + RRScreenChangeNotify)))

+        {

+          /* The Resize and Rotate extension sends an event when the

+             size, rotation, or refresh rate of the screen has changed. */

+

+          XRRScreenChangeNotifyEvent *xrr_event =

+            (XRRScreenChangeNotifyEvent *) & event;

+

+          /* XRRRootToScreen is in Xrandr.h 1.4, 2001/06/07 */

+          int screen = XRRRootToScreen(si->dpy, xrr_event->window);

+

+          if (p->verbose_p)

+            {

+              if ((si->screens[screen].width == xrr_event->width) &&

+                  (si->screens[screen].height == xrr_event->height))

+                fprintf(stderr,

+                        "%s: %d: no-op screen size change event (%dx%d)\n",

+                        blurb(), screen,

+                        xrr_event->width, xrr_event->height);

+              else

+                fprintf(stderr,

+                        "%s: %d: screen size changed from %dx%d to %dx%d\n",

+                        blurb(), screen,

+                        si->screens[screen].width,

+                        si->screens[screen].height,

+                        xrr_event->width, xrr_event->height);

+            }

+

+#ifdef RRScreenChangeNotifyMask

+          /* Inform Xlib that it's ok to update its data structures. */

+          XRRUpdateConfiguration(&event); /* Xrandr.h 1.9, 2002/09/29 */

+#endif /* RRScreenChangeNotifyMask */

+

+          /* Resize the existing xscreensaver windows and cached ssi data. */

+          if (update_screen_layout (si))

+            {

+              if (p->verbose_p)

+                {

+                  fprintf (stderr, "%s: new layout:\n", blurb());

+                  describe_monitor_layout (si);

+                }

+              resize_screensaver_window (si);

+            }

+        }

+#endif /* HAVE_RANDR */

+

 #ifndef HAVE_XSCREENSAVER_LOCK

       if (event.xany.window == si->passwd_dialog && event.xany.type == Expose)

 	draw_passwd_window (si);

diff --git xscreensaver-5.11/driver/timers.c xscreensaver-5.11/driver/timers.c

--- xscreensaver-5.11/driver/timers.c

+++ xscreensaver-5.11/driver/timers.c

@@ -1130,7 +1130,8 @@ sleep_until_idle (saver_info *si, Bool until_idle_p)

 	else

 #ifdef HAVE_RANDR

-        if (event.x_event.type == (si->randr_event_number + RRScreenChangeNotify))

+        if (si->using_randr_extension &&

+            (event.x_event.type == (si->randr_event_number + RRScreenChangeNotify)))

           {

             /* The Resize and Rotate extension sends an event when the

                size, rotation, or refresh rate of any screen has changed.

diff --git xscreensaver-5.11/driver/types.h xscreensaver-5.11/driver/types.h

--- xscreensaver-5.11/driver/types.h

+++ xscreensaver-5.11/driver/types.h

@@ -193,6 +193,7 @@ struct saver_info {

 # ifdef HAVE_RANDR

   int randr_event_number;

   int randr_error_number;

+  Bool using_randr_extension;

 # endif

   Bool using_xinput_extension;     /* Note that `p->use_*' is the *request*, */

diff --git xscreensaver-5.11/driver/xscreensaver.c xscreensaver-5.11/driver/xscreensaver.c

--- xscreensaver-5.11/driver/xscreensaver.c

+++ xscreensaver-5.11/driver/xscreensaver.c

@@ -959,6 +959,8 @@ initialize_server_extensions (saver_info *si)

       int nscreens = ScreenCount (si->dpy);  /* number of *real* screens */

       int i;

+      si->using_randr_extension = TRUE;

+

       if (p->verbose_p)

 	fprintf (stderr, "%s: selecting RANDR events\n", blurb());

       for (i = 0; i < nscreens; i++)