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

monitor: Kill off another use of is_native

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-02-17 20:51:35 -05:00
parent 304a525744
commit 4e6321c239
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/monitor.c
View File

@ -356,20 +356,26 @@ make_logical_config (MetaMonitorManager *manager)
static GType static GType
get_default_backend (void) get_default_backend (void)
{ {
if (meta_is_wayland_compositor ()) #if defined(CLUTTER_WINDOWING_EGL)
{ if (clutter_check_windowing_backend (CLUTTER_WINDOWING_EGL))
MetaWaylandCompositor *compositor;
compositor = meta_wayland_compositor_get_default ();
if (meta_wayland_compositor_is_native (compositor))
return META_TYPE_MONITOR_MANAGER_KMS; return META_TYPE_MONITOR_MANAGER_KMS;
else #endif
#if defined(CLUTTER_WINDOWING_X11)
if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
{
/* If we're a Wayland compositor using the X11 backend,
* we're a nested configuration, so return the dummy
* monitor setup. */
if (meta_is_wayland_compositor ())
return META_TYPE_MONITOR_MANAGER; return META_TYPE_MONITOR_MANAGER;
}
else else
return META_TYPE_MONITOR_MANAGER_XRANDR; return META_TYPE_MONITOR_MANAGER_XRANDR;
} }
#endif
g_assert_not_reached ();
}
static MetaMonitorManager * static MetaMonitorManager *
meta_monitor_manager_new (void) meta_monitor_manager_new (void)