[Xfce4-commits] <xfwm4:master> Bring refresh_rate stuff outside of LIBDRM checks.

[Alistair Buxton]

Updating branch refs/heads/master
         to ab3de90429ae015e7f657f44f10f281120bbbe7a (commit)
       from f7fcb87de1f90210258026592dab472b14e189c1 (commit)

commit ab3de90429ae015e7f657f44f10f281120bbbe7a
Author: Alistair Buxton <a.j.buxton at gmail.com>
Date:   Mon Nov 25 17:33:26 2013 +0000

    Bring refresh_rate stuff outside of LIBDRM checks.
    
    We want to know the refresh rate even if libdrm is not used.

 src/compositor.c |   12 ++++--------
 src/screen.h     |    2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/compositor.c b/src/compositor.c
index 62196bf..5709d38 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1332,6 +1332,10 @@ wait_vblank (ScreenInfo *screen_info)
     }
 }
 
+#endif /* TIMEOUT_REPAINT */
+
+#endif /* HAVE_LIBDRM */
+
 #ifdef HAVE_RANDR
 static void
 get_refresh_rate (ScreenInfo* screen_info)
@@ -1351,10 +1355,6 @@ get_refresh_rate (ScreenInfo* screen_info)
 }
 #endif /* HAVE_RANDR */
 
-#endif /* TIMEOUT_REPAINT */
-
-#endif /* HAVE_LIBDRM */
-
 static void
 paint_all (ScreenInfo *screen_info, XserverRegion region)
 {
@@ -2724,7 +2724,6 @@ compositorHandleShapeNotify (DisplayInfo *display_info, XShapeEvent *ev)
     }
 }
 
-#ifdef HAVE_LIBDRM
 #ifdef HAVE_RANDR
 static void
 compositorHandleRandrNotify (DisplayInfo *display_info, XRRScreenChangeNotifyEvent *ev)
@@ -2742,7 +2741,6 @@ compositorHandleRandrNotify (DisplayInfo *display_info, XRRScreenChangeNotifyEve
     XRRUpdateConfiguration ((XEvent *) ev);
 }
 #endif /* HAVE_RANDR */
-#endif /* HAVE_LIBDRM */
 
 static void
 compositorSetCMSelection (ScreenInfo *screen_info, Window w)
@@ -2954,14 +2952,12 @@ compositorHandleEvent (DisplayInfo *display_info, XEvent *ev)
     {
         compositorHandleShapeNotify (display_info, (XShapeEvent *) ev);
     }
-#ifdef HAVE_LIBDRM
 #ifdef HAVE_RANDR
     else if (ev->type == (display_info->xrandr_event_base + RRScreenChangeNotify))
     {
         compositorHandleRandrNotify (display_info, (XRRScreenChangeNotifyEvent *) ev);
     }
 #endif /* HAVE_RANDR */
-#endif /* HAVE_LIBDRM */
 
 #if TIMEOUT_REPAINT == 0
     repair_display (display_info);
diff --git a/src/screen.h b/src/screen.h
index a2b25c0..8589374 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -188,11 +188,11 @@ struct _ScreenInfo
     gboolean dri_success;
     gint64 dri_time;
     gint64 vblank_time;
+#endif /* HAVE_LIBDRM */
 
 #ifdef HAVE_RANDR
     gint refresh_rate;
 #endif /* HAVE_RANDR */
-#endif /* HAVE_LIBDRM */
 
 #endif /* HAVE_COMPOSITOR */
 };