summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Coval <philippe.coval@open.eurogiciel.org>2014-12-05 14:02:16 -0500
committerChris Michael <cp.michael@samsung.com>2014-12-05 14:09:17 -0500
commit37bb746da5a519e33c3ddd285331a04c1b0994e9 (patch)
tree1987beb2b9241bf9fe8753236e2f991f3942d07a
parent8ffd784c9ed1d229c8d820c62631d81d16bb720f (diff)
ecore-wayland: make possible to disable xdg-shell at runtime
Summary: Since xdg-shell is not yet supported officialy by wayland It makes sense to have it disabled by default and enable it on purpose. Using env variable : EFL_WAYLAND_DONT_USE_XDG_SHELL (name is inspired from Qt implementation of xdg-shell but in the opposite way) There is no EFL_WAYLAND_USE_XDG_SHELL in efl, please use EFL_WAYLAND_DONT_USE_XDG_SHELL instead. By default xdg-shell is enabled since it's supported by efl Since there is only one shell supported at runtime it's easier to switch to wl-shell (wayland's fallback shell) by change this env variable. Note, this patch can be reverted once xdg-shell replaces wl-shell in wayland which is not the case in weston-1.6 but could integrated into upcoming wayland-1.7 (to be confirmed on release) Change-Id: Id3732492397df9abe4a7c9e6e92a8f2c993c8395 Bug: https://phab.enlightenment.org/T1901 Bug-Tizen: TC-1353/part Forwarded: https://phab.enlightenment.org/T1901 Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org> Tizen Test Plan: echo 'export EFL_WAYLAND_DONT_USE_XDG_SHELL=defined' > /etc/profile.d/ecore.sh Reviewers: seoz, devilhorns Reviewed By: devilhorns Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D1734
-rw-r--r--src/lib/ecore_wayland/ecore_wl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c
index 9699a7944c..1467411d7c 100644
--- a/src/lib/ecore_wayland/ecore_wl.c
+++ b/src/lib/ecore_wayland/ecore_wl.c
@@ -643,7 +643,7 @@ _ecore_wl_cb_handle_global(void *data, struct wl_registry *registry, unsigned in
643 wl_registry_bind(registry, id, &ivi_application_interface, 1); 643 wl_registry_bind(registry, id, &ivi_application_interface, 1);
644 } 644 }
645#endif 645#endif
646 else if (!strcmp(interface, "xdg_shell")) 646 else if (!strcmp(interface, "xdg_shell") && !getenv("EFL_WAYLAND_DONT_USE_XDG_SHELL"))
647 { 647 {
648 ewd->wl.xdg_shell = 648 ewd->wl.xdg_shell =
649 wl_registry_bind(registry, id, &xdg_shell_interface, 1); 649 wl_registry_bind(registry, id, &xdg_shell_interface, 1);