[clutter-gtk] Prefer the GDK windowing backend for Clutter



commit 0fc73a07770223964dbf41a20a4b0a8c3ef9a29c
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Aug 18 17:23:18 2014 +0100

    Prefer the GDK windowing backend for Clutter
    
    If Clutter has a GDK backend compiled in, we want to use that to
    minimize the interaction surface between GTK and Clutter.

 clutter-gtk/gtk-clutter-util.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c
index 1a3b398..48bc5d3 100644
--- a/clutter-gtk/gtk-clutter-util.c
+++ b/clutter-gtk/gtk-clutter-util.c
@@ -66,6 +66,9 @@ gtk_clutter_init_internal (void)
   display = gdk_display_get_default ();
 
 #if defined(CLUTTER_WINDOWING_GDK)
+  /* we want the GDK backend by default */
+  clutter_set_windowing_backend (CLUTTER_WINDOWING_GDK);
+
   if (clutter_check_windowing_backend (CLUTTER_WINDOWING_GDK))
     {
       clutter_gdk_set_display (gdk_display_get_default ());
@@ -79,7 +82,7 @@ gtk_clutter_init_internal (void)
   if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11) &&
       GDK_IS_X11_DISPLAY (display))
     {
-      /* enable ARGB visuals by default for Clutter */
+      /* enable ARGB visuals by default for Clutter; this is a no-op */
       clutter_x11_set_use_argb_visual (TRUE);
 
       /* share the X11 Display with GTK+ */
@@ -110,7 +113,9 @@ gtk_clutter_init_internal (void)
     }
   else
 #endif
-    g_error ("*** Unsupported backend.");
+    {
+      g_error ("*** Unsupported backend.");
+    }
 
   /* We disable clutter accessibility support in order to not
    * interfere with gtk accessibility support.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]