From 35aedd7aaa186ded99dde4b0d2f3d0f6c2252c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 20 Feb 2015 17:51:15 +0100 Subject: initialization: add support for Mir clutter backend --- clutter-gtk/gtk-clutter-util.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c index f66f8a9..f4acfdf 100644 --- a/clutter-gtk/gtk-clutter-util.c +++ b/clutter-gtk/gtk-clutter-util.c @@ -39,6 +39,10 @@ #include #endif +#if defined(GDK_WINDOWING_MIR) +#include +#endif + /** * SECTION:gtk-clutter-util * @Title: Utility Functions @@ -109,6 +113,19 @@ gtk_clutter_init_internal (void) clutter_wayland_set_display (gdk_wayland_display_get_wl_display (display)); } else +#endif +#if defined(GDK_WINDOWING_MIR) && defined(CLUTTER_WINDOWING_MIR) + if (clutter_check_windowing_backend (CLUTTER_WINDOWING_MIR) && + GDK_IS_MIR_DISPLAY (display)) + { + /* let GTK+ be in charge of the event handling */ + /* This is disabled until Mir does not support sub-surfaces. + clutter_mir_disable_event_retrieval (); + */ + + clutter_mir_set_connection (gdk_mir_display_get_mir_connection (display)); + } + else #endif g_error ("*** Unsupported backend."); -- cgit v1.2.1