Merge lp:~sil2100/compiz-core/cherry_3246 into lp:compiz-core

[Łukasz Zemczak]

Cherry-picked from compiz trunk (rev 3246):
Fall back to a refresh rate that is more likely to look correct; 60Hz. (LP: #1009338)

The fallback is still only used if sync-to-vblank is not available (disabled in the driver) AND if xrandr doesn't provide a refresh rate.

Cherry-picked from trunk:

Fall back to a refresh rate that is more likely to look correct; 60Hz.
(LP: #1009338)

The fallback is still only used if sync-to-vblank is not available (disabled
in the driver) AND if xrandr doesn't provide a refresh rate.

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'plugins/composite/composite.xml.in'
--- plugins/composite/composite.xml.in	2012-02-08 10:54:35 +0000
+++ plugins/composite/composite.xml.in	2012-06-20 13:05:26 +0000
@@ -16,7 +16,7 @@
 	    <option name="refresh_rate" type="int">
 		<_short>Refresh Rate</_short>
 		<_long>The rate at which the screen is redrawn (times/second)</_long>
-		<default>50</default>
+		<default>60</default>
 		<min>1</min>
 		<max>200</max>
 	    </option>

=== modified file 'plugins/composite/src/screen.cpp'
--- plugins/composite/src/screen.cpp	2012-03-27 12:14:56 +0000
+++ plugins/composite/src/screen.cpp	2012-06-20 13:05:26 +0000
@@ -45,6 +45,8 @@
 
 #include <core/timer.h>
 
+static const int FALLBACK_REFRESH_RATE = 60;   /* if all else fails */
+
 CompWindow *lastDamagedWindow = 0;
 
 void
@@ -274,8 +276,8 @@
     exposeRects (),
     windowPaintOffset (0, 0),
     overlayWindowCount (0),
-    redrawTime (1000 / 50),
-    optimalRedrawTime (1000 / 50),
+    redrawTime (1000 / FALLBACK_REFRESH_RATE),
+    optimalRedrawTime (1000 / FALLBACK_REFRESH_RATE),
     scheduled (false),
     painting (false),
     reschedule (false),
@@ -651,7 +653,7 @@
 	}
 
 	if (value.i () == 0)
-	    value.set ((int) 50);
+	    value.set ((int) FALLBACK_REFRESH_RATE);
 
 	mOptions[CompositeOptions::DetectRefreshRate].value ().set (false);
 	screen->setOptionForPlugin ("composite", "refresh_rate", value);