brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement multi-backend support

Browse Source 
The Clutter backend split is opaque enough that should allow us to just
build all possible backends inside the same shared object, and select
the wanted backend at initialization time.

This requires some work in the build system, as well as the
initialization code, to remove duplicate functions that might cause
conflicts at build and link time. We also need to defer all the checks
of the internal state of the platform-specific API to run-time type
checks.
This commit is contained in:
Emmanuele Bassi
2011-09-21 18:05:03 +01:00
parent 9c102b7c51
commit a09bbffd92
25 changed files with 591 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
clutter/x11/clutter-backend-x11.c
View File

@ -875,9 +875,15 @@ clutter_x11_get_default_display (void)
{
ClutterBackend *backend = clutter_get_default_backend ();
if (!backend || !CLUTTER_IS_BACKEND_X11 (backend))
if (backend == NULL)
{
g_critical ("X11 backend has not been initialised");
g_critical ("The Clutter backend has not been initialised");
return NULL;
}
if (!CLUTTER_IS_BACKEND_X11 (backend))
{
g_critical ("The Clutter backend is not a X11 backend");
return NULL;
}
@ -1006,9 +1012,15 @@ clutter_x11_get_default_screen (void)
{
ClutterBackend *backend = clutter_get_default_backend ();
if (!backend || !CLUTTER_IS_BACKEND_X11 (backend))
if (backend == NULL)
{
g_critical ("X11 backend has not been initialised");
g_critical ("The Clutter backend has not been initialised");
return 0;
}
if (!CLUTTER_IS_BACKEND_X11 (backend))
{
g_critical ("The Clutter backend is not a X11 backend");
return 0;
}
@ -1029,9 +1041,15 @@ clutter_x11_get_root_window (void)
{
ClutterBackend *backend = clutter_get_default_backend ();
if (!backend || !CLUTTER_IS_BACKEND_X11 (backend))
if (backend == NULL)
{
g_critical ("X11 backend has not been initialised");
g_critical ("The Clutter backend has not been initialised");
return None;
}
if (!CLUTTER_IS_BACKEND_X11 (backend))
{
g_critical ("The Clutter backend is not a X11 backend");
return None;
}
@ -1057,9 +1075,15 @@ clutter_x11_add_filter (ClutterX11FilterFunc func,
g_return_if_fail (func != NULL);
if (!backend || !CLUTTER_IS_BACKEND_X11 (backend))
if (backend == NULL)
{
g_critical ("X11 backend has not been initialised");
g_critical ("The Clutter backend has not been initialised");
return;
}
if (!CLUTTER_IS_BACKEND_X11 (backend))
{
g_critical ("The Clutter backend is not a X11 backend");
return;
}
@ -1095,9 +1119,15 @@ clutter_x11_remove_filter (ClutterX11FilterFunc func,
g_return_if_fail (func != NULL);
if (!backend || !CLUTTER_IS_BACKEND_X11 (backend))
if (backend == NULL)
{
g_critical ("X11 backend has not been initialised");
g_critical ("The Clutter backend has not been initialised");
return;
}
if (!CLUTTER_IS_BACKEND_X11 (backend))
{
g_critical ("The Clutter backend is not a X11 backend");
return;
}
@ -1163,9 +1193,15 @@ clutter_x11_has_xinput (void)
#if defined(HAVE_XINPUT) || defined(HAVE_XINPUT_2)
ClutterBackend *backend = clutter_get_default_backend ();
if (!backend || !CLUTTER_IS_BACKEND_X11 (backend))
if (backend == NULL)
{
g_critical ("X11 backend has not been initialised");
g_critical ("The Clutter backend has not been initialised");
return FALSE;
}
if (!CLUTTER_IS_BACKEND_X11 (backend))
{
g_critical ("The Clutter backend is not a X11 backend.");
return FALSE;
}
@ -1201,6 +1237,8 @@ clutter_x11_has_composite_extension (void)
}
dpy = clutter_x11_get_default_display();
if (dpy == NULL)
return FALSE;
if (XCompositeQueryExtension (dpy, &event, &error))
{
@ -1292,8 +1330,16 @@ XVisualInfo *
clutter_x11_get_visual_info (void)
{
ClutterBackendX11 *backend_x11;
ClutterBackend *backend;
backend_x11 = CLUTTER_BACKEND_X11 (clutter_get_default_backend ());
backend = clutter_get_default_backend ();
if (!CLUTTER_IS_BACKEND_X11 (backend))
{
g_critical ("The Clutter backend is not a X11 backend.");
return NULL;
}
backend_x11 = CLUTTER_BACKEND_X11 (backend);
return _clutter_backend_x11_get_visual_info (backend_x11);
}
@ -1348,9 +1394,3 @@ _clutter_x11_input_device_translate_screen_coord (ClutterInputDevice *device,
return TRUE;
}
GType
_clutter_backend_impl_get_type (void)
{
return _clutter_backend_x11_get_type ();
}