isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-05 16:14:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

main: Add a --display-server option

Browse Source 
This is an explicit option to launch mutter as a display server,
rather than relying on weston-launch.
This commit is contained in:
Jasper St. Pierre 2014-03-11 16:32:44 -04:00
parent e34792d9f0
commit fb3df5243f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/main.c
View File

@ -190,6 +190,7 @@ static gboolean opt_replace_wm;
static gboolean opt_disable_sm; static gboolean opt_disable_sm;
static gboolean opt_sync; static gboolean opt_sync;
static gboolean opt_wayland; static gboolean opt_wayland;
static gboolean opt_display_server;
static GOptionEntry meta_options[] = { static GOptionEntry meta_options[] = {
{ {
@ -233,6 +234,11 @@ static GOptionEntry meta_options[] = {
N_("Run as a wayland compositor"), N_("Run as a wayland compositor"),
NULL NULL
}, },
{
"display-server", 0, 0, G_OPTION_ARG_NONE,
&opt_display_server,
N_("Run as a full display server, rather than nested")
},
{NULL} {NULL}
}; };
@ -401,8 +407,7 @@ meta_init (void)
if (g_getenv ("MUTTER_DEBUG")) if (g_getenv ("MUTTER_DEBUG"))
meta_set_debugging (TRUE); meta_set_debugging (TRUE);
/* We consider running from mutter-launch equivalent to running from bare metal. */ if (opt_display_server)
if (getenv ("WESTON_LAUNCHER_SOCK"))
clutter_set_windowing_backend (CLUTTER_WINDOWING_EGL); clutter_set_windowing_backend (CLUTTER_WINDOWING_EGL);
meta_set_is_wayland_compositor (opt_wayland); meta_set_is_wayland_compositor (opt_wayland);

2
src/mutter-wayland.desktop.in
View File

@ -1,7 +1,7 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
_Name=Mutter (wayland compositor) _Name=Mutter (wayland compositor)
Exec=mutter-launch -- mutter --wayland Exec=mutter-launch -- mutter --wayland --display-server
NoDisplay=true NoDisplay=true
# name of loadable control center module # name of loadable control center module
X-GNOME-WMSettingsModule=metacity X-GNOME-WMSettingsModule=metacity