isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-07-23 10:01:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make mutter manage its own clutter backends

Browse Source 
Introduce two new clutter backends: MetaClutterBackendX11 and
MetaClutterBackendNative. They are so far only wrap ClutterBackendX11
and ClutterBackendEglNative respectively, but the aim is to move things
from the original clutter backends when needed.

https://bugzilla.gnome.org/show_bug.cgi?id=768976
This commit is contained in:
Jonas Ådahl
2016-05-04 16:19:23 +08:00
parent a1bedd4b1c
commit 90de521799
18 changed files with 353 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/main.c
View File

@ -82,6 +82,8 @@
#include "wayland/meta-wayland.h"
# endif
#include "backends/meta-backend-private.h"
#if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND)
#include <systemd/sd-login.h>
#endif
@ -371,7 +373,8 @@ check_for_wayland_session_type (void)
#endif
static void
init_backend (void)
calculate_compositor_configuration (MetaCompositorType *compositor_type,
MetaBackendType *backend_type)
{
#ifdef HAVE_WAYLAND
gboolean run_as_wayland_compositor = opt_wayland;
@ -388,16 +391,19 @@ init_backend (void)
#ifdef CLUTTER_WINDOWING_EGL
if (opt_display_server || (run_as_wayland_compositor && !opt_nested))
clutter_set_windowing_backend (CLUTTER_WINDOWING_EGL);
*backend_type = META_BACKEND_TYPE_NATIVE;
else
#endif
#endif
#endif
clutter_set_windowing_backend (CLUTTER_WINDOWING_X11);
*backend_type = META_BACKEND_TYPE_X11;
#ifdef HAVE_WAYLAND
meta_set_is_wayland_compositor (run_as_wayland_compositor);
if (run_as_wayland_compositor)
*compositor_type = META_COMPOSITOR_TYPE_WAYLAND;
else
#endif
*compositor_type = META_COMPOSITOR_TYPE_X11;
}
/**
@ -411,6 +417,8 @@ meta_init (void)
{
struct sigaction act;
sigset_t empty_mask;
MetaCompositorType compositor_type;
MetaBackendType backend_type;
sigemptyset (&empty_mask);
act.sa_handler = SIG_IGN;
@ -432,7 +440,10 @@ meta_init (void)
if (g_getenv ("MUTTER_DEBUG"))
meta_set_debugging (TRUE);
init_backend ();
calculate_compositor_configuration (&compositor_type, &backend_type);
if (compositor_type == META_COMPOSITOR_TYPE_WAYLAND)
meta_set_is_wayland_compositor (TRUE);
if (g_get_home_dir ())
if (chdir (g_get_home_dir ()) < 0)
@ -455,6 +466,8 @@ meta_init (void)
if (!meta_is_wayland_compositor ())
meta_select_display (opt_display_name);
meta_init_backend (backend_type);
meta_clutter_init ();
#ifdef HAVE_WAYLAND