From 6cd00909e084160b66dee32ce87e14211abbba48 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop+hg@gmail.com>
Date: Sat, 27 Nov 2010 17:04:35 -0500
Subject: [PATCH] GnomeScreensaver: aspect ratio is for entire virtual screen,
 not just one monitor

---
 GnomeScreensaver.cc | 2 +-
 modes/Spin.cc       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/GnomeScreensaver.cc b/GnomeScreensaver.cc
index 19f0e77..6cf1c6f 100644
--- a/GnomeScreensaver.cc
+++ b/GnomeScreensaver.cc
@@ -150,7 +150,7 @@ gboolean GnomeScreensaver::configureCB(GtkWidget *da, GdkEventConfigure *event)
          m_n_monitors++)
         ;
 
-    m_aspect_ratio = (float)m_width / (float)m_n_monitors / (float)m_height;
+    m_aspect_ratio = (float)m_width / (float)m_height;
 
     gboolean rc = m_configure_callback(*this);
 
diff --git a/modes/Spin.cc b/modes/Spin.cc
index f3c08cf..8783289 100644
--- a/modes/Spin.cc
+++ b/modes/Spin.cc
@@ -29,7 +29,8 @@ bool Spin::configure (GnomeScreensaver & gs)
 {
     glMatrixMode(GL_PROJECTION);
     glLoadIdentity();
-    gluPerspective(60.0, gs.getAspectRatio(), 0.01, 1000.0);
+    gluPerspective(60.0, gs.getAspectRatio() / gs.getNumMonitors(),
+            0.01, 1000.0);
 
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();