[Xfce4-commits] [xfce/xfwm4] 05/05: compositor: warn if XPresent requested but unusable

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

olivier pushed a commit to branch master
in repository xfce/xfwm4.

commit 0a27a43cefe9b6f1672a814065d312feb7e74bcd
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Wed Jan 18 15:00:42 2017 +0100

    compositor: warn if XPresent requested but unusable
    
    Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
---
 src/compositor.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/compositor.c b/src/compositor.c
index cf67264..aa658d6 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -4262,6 +4262,7 @@ compositorManageScreen (ScreenInfo *screen_info)
     gushort buffer;
 #ifdef HAVE_PRESENT_EXTENSION
     const gchar *use_present_env;
+    gboolean present_requested;
 #endif /* HAVE_PRESENT_EXTENSION */
 
     g_return_val_if_fail (screen_info != NULL, FALSE);
@@ -4386,7 +4387,8 @@ compositorManageScreen (ScreenInfo *screen_info)
     screen_info->texture_filter = GL_LINEAR;
 #ifdef HAVE_PRESENT_EXTENSION
     use_present_env = g_getenv ("XFWM4_USE_PRESENT");
-    if (g_strcmp0 (use_present_env, "1") == 0)
+    present_requested = (g_strcmp0 (use_present_env, "1") == 0);
+    if (present_requested)
     {
         screen_info->use_glx = FALSE;
     }
@@ -4409,6 +4411,10 @@ compositorManageScreen (ScreenInfo *screen_info)
                              screen_info->output,
                              PresentCompleteNotifyMask);
     }
+    else if (present_requested)
+    {
+        g_warning ("XPresent requested but unavailable");
+    }
 #else /* HAVE_PRESENT_EXTENSION */
     screen_info->use_present = FALSE;
 #endif /* HAVE_PRESENT_EXTENSION */

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.