Compare commits

...

18 Commits

Author SHA1 Message Date
Chris Michael a2e4502073 xwayland: Add checks for xcb libraries needed for xwayland support 8 years ago
Chris Michael 2061b57089 xwayland: Add code to cleanup xwayland on shutdown 8 years ago
Chris Michael 5ebc4c76b7 xwayland: Check for sigusr1 in event handler 8 years ago
Chris Michael 60090e6065 xwayland: Fix build breakage with recent e_comp_wl changes 8 years ago
Chris Michael 1750da1efd xwayland: Add some debugging code while trying to work out failures 8 years ago
Chris Michael 76c852b66a xwayland: Fix launching of XWayland server and pass proper display to 8 years ago
Chris Michael 22e939c18a Add code to load the new XWayland module during startup 8 years ago
Chris Michael c9ddd86f55 Whitelist the new xwayland module 8 years ago
Chris Michael ab96307ce3 xwayland: Create the wl_client which represents the window manager 8 years ago
Chris Michael ff9bd8395f xwayland: Create and bind to unix & abstract sockets 8 years ago
Chris Michael def3f6b344 xwayland: Fix makefile to use xwayland binary path 8 years ago
Chris Michael 56aea6cea8 xwayland: Fix configure.ac to substitute the xwayland binary path 8 years ago
Chris Michael 030d18c5ff Add start of xwayand module code 8 years ago
Chris Michael 7b5eda1f95 add xwayland module edj file for icon 8 years ago
Chris Michael dd809502ef add xwayland module desktop file 8 years ago
Chris Michael ede2b544e7 Add xwayland Makefile 8 years ago
Chris Michael 02c1532ed3 Add xwayland module to modules Makefile 8 years ago
Chris Michael 809fa93b49 add xwayland to configure.ac 8 years ago
  1. 14
      configure.ac
  2. 26
      src/bin/e_comp_wl.c
  3. 1
      src/bin/e_module.c
  4. 2
      src/modules/Makefile.mk
  5. 26
      src/modules/Makefile_xwayland.mk
  6. BIN
      src/modules/xwayland/e-module-xwayland.edj
  7. 379
      src/modules/xwayland/e_mod_main.c
  8. 7
      src/modules/xwayland/module.desktop.in

@ -915,6 +915,18 @@ define([CHECK_MODULE_WL_DRM],
])
AM_CONDITIONAL([HAVE_WL_DRM], [test "x${WL_DRM}" = "xtrue"])
define([CHECK_MODULE_XWAYLAND],
[
if test "x${e_cv_want_wayland_only}" = "xyes"; then
AC_E_CHECK_PKG(XWAYLAND, [ ecore >= $efl_version eina >= $efl_version xcb xcb-xfixes xcb-composite xcursor ], [HAVE_XWAYLAND_DEPS=true], [HAVE_XWAYLAND_DEPS=false])
AC_PATH_PROG([XWAYLAND_BIN], [Xwayland], [HAVE_XWAYLAND_DEPS=false], [/sbin:/usr/sbin:$PATH])
AC_SUBST(XWAYLAND_BIN)
else
HAVE_XWAYLAND_DEPS=false
fi
])
AM_CONDITIONAL([HAVE_XWAYLAND], [test "x${HAVE_XWAYLAND_DEPS}" = "xtrue"])
AC_E_OPTIONAL_MODULE([ibar], true)
AC_E_OPTIONAL_MODULE([clock], true)
AC_E_OPTIONAL_MODULE([pager], true)
@ -972,6 +984,7 @@ AC_E_OPTIONAL_MODULE([wl_fb], $have_wayland, [CHECK_MODULE_WL_FB])
AC_E_OPTIONAL_MODULE([wl_drm], $have_wayland, [CHECK_MODULE_WL_DRM])
#AC_E_OPTIONAL_MODULE([wl_screenshot], true, [CHECK_MODULE_WL_SCREENSHOT])
AC_E_OPTIONAL_MODULE([policy_mobile], true)
AC_E_OPTIONAL_MODULE([xwayland], $have_wayland, [CHECK_MODULE_XWAYLAND])
HALT="/sbin/shutdown -h now"
REBOOT="/sbin/shutdown -r now"
@ -1086,6 +1099,7 @@ src/modules/packagekit/module.desktop
src/modules/contact/module.desktop
src/modules/wl_desktop_shell/module.desktop
src/modules/wl_screenshot/module.desktop
src/modules/xwayland/module.desktop
data/xsession/enlightenment.desktop
data/etc/sysactions.conf
data/units/enlightenment.service

@ -1321,6 +1321,8 @@ _e_comp_wl_cb_module_idle(void *data)
{
E_Module *mod = NULL;
E_Comp_Data *cdata;
Eina_Bool have_shell = EINA_FALSE;
Eina_Bool have_xwayland = EINA_FALSE;
if (!(cdata = data)) return ECORE_CALLBACK_RENEW;
@ -1328,12 +1330,30 @@ _e_comp_wl_cb_module_idle(void *data)
/* FIXME: make which shell to load configurable */
if (!(mod = e_module_find("wl_desktop_shell")))
mod = e_module_new("wl_desktop_shell");
{
if ((mod = e_module_new("wl_desktop_shell")))
{
e_module_enable(mod);
have_shell = EINA_TRUE;
}
}
else
have_shell = EINA_TRUE;
if (mod)
/* load xwayland module */
if (!(mod = e_module_find("xwayland")))
{
e_module_enable(mod);
if ((mod = e_module_new("xwayland")))
{
e_module_enable(mod);
have_xwayland = EINA_TRUE;
}
}
else
have_xwayland = EINA_TRUE;
if ((have_shell) && (have_xwayland))
{
/* dispatch any pending main loop events */
wl_event_loop_dispatch(cdata->wl.loop, 0);

@ -935,6 +935,7 @@ _e_module_whitelist_check(void)
"appmenu",
"packagekit",
"policy_mobile",
"xwayland",
NULL // end marker
};

@ -128,6 +128,8 @@ include src/modules/Makefile_wl_x11.mk
include src/modules/Makefile_wl_fb.mk
include src/modules/Makefile_xwayland.mk
#if HAVE_WAYLAND_SCREENSHOT
#include src/modules/Makefile_wl_screenshot.mk

@ -0,0 +1,26 @@
EXTRA_DIST += src/modules/xwayland/module.desktop.in \
src/modules/xwayland/e-module-xwayland.edj \
src/modules/xwayland/module.desktop.in
if USE_MODULE_XWAYLAND
xwaylanddir = $(MDIR)/xwayland
xwayland_DATA = src/modules/xwayland/e-module-xwayland.edj \
src/modules/xwayland/module.desktop
xwaylandpkgdir = $(MDIR)/xwayland/$(MODULE_ARCH)
xwaylandpkg_LTLIBRARIES = src/modules/xwayland/module.la
src_modules_xwayland_module_la_DEPENDENCIES = $(MDEPENDENCIES)
src_modules_xwayland_module_la_CPPFLAGS = \
$(MOD_CPPFLAGS) @XWAYLAND_CFLAGS@ @WAYLAND_CFLAGS@ \
-DXWAYLAND_BIN=\"@XWAYLAND_BIN@\"
src_modules_xwayland_module_la_LIBADD = $(LIBS) @XWAYLAND_LIBS@ @WAYLAND_LIBS@
src_modules_xwayland_module_la_LDFLAGS = $(MOD_LDFLAGS)
src_modules_xwayland_module_la_SOURCES = \
src/modules/xwayland/e_mod_main.c
PHONIES += xwayland install-xwayland
xwayland: $(xwaylandpkg_LTLIBRARIES) $(xwayland_DATA)
install-xwayland: install-xwaylandDATA install-xwaylandpkgLTLIBRARIES
endif

@ -0,0 +1,379 @@
#define E_COMP_WL
#include "e.h"
#include <sys/socket.h>
#include <sys/un.h>
/* local structures */
typedef struct _E_XWayland_Server E_XWayland_Server;
struct _E_XWayland_Server
{
int disp;
int abs_fd, unx_fd, wm_fd;
char lock[256];
struct wl_display *wl_disp;
struct wl_event_loop *loop;
struct wl_client *client;
Ecore_Fd_Handler *abs_hdlr, *unx_hdlr;
Ecore_Event_Handler *sig_hdlr;
struct
{
pid_t pid;
/* cleanup_func func; */
} process;
};
/* local variables */
static E_XWayland_Server *exs;
/* local functions */
static Eina_Bool
_lock_create(char *lock)
{
char pid[16], *end;
int fd, size;
pid_t opid;
fd = open(lock, (O_WRONLY | O_CLOEXEC | O_CREAT | O_EXCL), 0444);
if ((fd < 0) && (errno == EEXIST))
{
fd = open(lock, (O_CLOEXEC | O_RDONLY));
if ((fd < 0) || (read(fd, pid, 11) != 11))
{
ERR("Could not read XWayland lock file: %m");
if (fd >= 0) close(fd);
errno = EEXIST;
return EINA_FALSE;
}
opid = strtol(pid, &end, 0);
if ((end != (pid + 10)))
{
if (fd >= 0) close(fd);
errno = EEXIST;
return EINA_FALSE;
}
if ((kill(opid, 0) < 0) && (errno == ESRCH))
{
/* close stale lock file */
if (fd >= 0) close(fd);
if (unlink(lock))
errno = EEXIST;
else
errno = EAGAIN;
return EINA_FALSE;
}
close(fd);
errno = EEXIST;
return EINA_FALSE;
}
else if (fd < 0)
{
ERR("Could not create XWayland lock file: %m");
return EINA_FALSE;
}
/* use the pid of the wayland compositor */
size = snprintf(pid, sizeof(pid), "%10d\n", getpid());
if (write(fd, pid, size) != size)
{
unlink(lock);
close(fd);
return EINA_FALSE;
}
close(fd);
return EINA_TRUE;
}
static int
_abstract_socket_bind(int disp)
{
struct sockaddr_un addr;
socklen_t size, nsize;
int fd;
/* try to create a local socket */
if ((fd = socket(PF_LOCAL, (SOCK_STREAM | SOCK_CLOEXEC), 0)) < 0)
return -1;
addr.sun_family = AF_LOCAL;
nsize = snprintf(addr.sun_path, sizeof(addr.sun_path),
"%c/tmp/.X11-unix/X%d", 0, disp);
size = offsetof(struct sockaddr_un, sun_path) + nsize;
/* try to bind to the socket */
if (bind(fd, (struct sockaddr *)&addr, size) < 0)
{
ERR("Failed to bind to abstract socket %s: %m", addr.sun_path + 1);
goto err;
}
/* try to listen on the bound socket */
if (listen(fd, 1) < 0)
{
ERR("Failed to listen to abstract fd: %d", fd);
goto err;
}
return fd;
err:
close(fd);
return -1;
}
static int
_unix_socket_bind(int disp)
{
struct sockaddr_un addr;
socklen_t size, nsize;
int fd;
/* try to create a local socket */
if ((fd = socket(PF_LOCAL, (SOCK_STREAM | SOCK_CLOEXEC), 0)) < 0)
return -1;
addr.sun_family = AF_LOCAL;
nsize = snprintf(addr.sun_path, sizeof(addr.sun_path),
"/tmp/.X11-unix/X%d", disp) + 1;
size = offsetof(struct sockaddr_un, sun_path) + nsize;
unlink(addr.sun_path);
/* try to bind to the socket */
if (bind(fd, (struct sockaddr *)&addr, size) < 0)
{
ERR("Failed to bind to abstract socket %s: %m", addr.sun_path + 1);
goto err;
}
/* try to listen on the bound socket */
if (listen(fd, 1) < 0)
{
ERR("Failed to listen to unix fd: %d", fd);
goto err;
}
return fd;
err:
close(fd);
return -1;
}
static Eina_Bool
_cb_xserver_event(void *data EINA_UNUSED, Ecore_Fd_Handler *hdlr EINA_UNUSED)
{
int socks[2], wms[2], fd;
char disp[8], s[8], xserver[PATH_MAX];
char abs_fd[8], unx_fd[8], wm_fd[8];
if (socketpair(AF_UNIX, (SOCK_STREAM | SOCK_CLOEXEC), 0, socks) < 0)
{
ERR("XServer Socketpair failed: %m");
return ECORE_CALLBACK_RENEW;
}
if (socketpair(AF_UNIX, (SOCK_STREAM | SOCK_CLOEXEC), 0, wms) < 0)
{
ERR("Window Manager Socketpair failed: %m");
return ECORE_CALLBACK_RENEW;
}
exs->process.pid = fork();
switch (exs->process.pid)
{
case 0:
/* dup will unset CLOEXEC on the client as cloexec closes both ends */
if ((fd = dup(socks[1]) < 0)) goto fail;
snprintf(s, sizeof(s), "%d", fd);
setenv("WAYLAND_SOCKET", s, 1);
if ((fd = dup(exs->abs_fd)) < 0) goto fail;
snprintf(abs_fd, sizeof(abs_fd), "%d", fd);
if ((fd = dup(exs->unx_fd)) < 0) goto fail;
snprintf(unx_fd, sizeof(unx_fd), "%d", fd);
if ((fd = dup(wms[1])) < 0) goto fail;
snprintf(wm_fd, sizeof(wm_fd), "%d", fd);
/* ignore usr1 and have X send it to the parent process */
signal(SIGUSR1, SIG_IGN);
snprintf(disp, sizeof(disp), ":%d", exs->disp);
snprintf(xserver, sizeof(xserver), "%s", XWAYLAND_BIN);
DBG("\tLaunching XWayland: %s: %s", xserver, disp);
if (execl(xserver, xserver, disp, "-rootless", "-listen", abs_fd,
"-listen", unx_fd, "-wm", wm_fd, "-terminate", "-shm",
NULL) < 0)
{
ERR("Failed to exec XWayland: %m");
}
fail:
_exit(EXIT_FAILURE);
default:
close(socks[1]);
exs->client = wl_client_create(exs->wl_disp, socks[0]);
close(wms[1]);
exs->wm_fd = wms[0];
/* TODO: watch process ?? */
if (exs->abs_hdlr)
ecore_main_fd_handler_del(exs->abs_hdlr);
if (exs->unx_hdlr)
ecore_main_fd_handler_del(exs->unx_hdlr);
break;
case -1:
ERR("Failed to fork: %m");
break;
}
return ECORE_CALLBACK_RENEW;
}
static Eina_Bool
_cb_signal_event(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
{
Ecore_Event_Signal_User *ev;
ev = event;
if (ev->number != 1) return ECORE_CALLBACK_RENEW;
/* NB: SIGUSR1 comes from XWayland Server when it has finished
* initialized. */
DBG("XWayland Finished Init");
/* TODO: create "window manager" process */
/* TODO: NB:
*
* Weston creates a smaller window manager process here.
* We Maybe able to just do e_comp_x_init, but will have to test that */
return ECORE_CALLBACK_CANCEL;
}
/* module functions */
EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "XWayland" };
EAPI void *
e_modapi_init(E_Module *m)
{
E_Comp *comp;
char disp[8];
DBG("LOAD XWAYLAND MODULE");
/* try to get the running compositor */
if (!(comp = e_comp_get(NULL))) return NULL;
/* make sure it's a wayland compositor */
if (comp->comp_type != E_PIXMAP_TYPE_WL) return NULL;
/* alloc space for server struct */
if (!(exs = calloc(1, sizeof(E_XWayland_Server))))
return NULL;
/* record wayland display */
exs->wl_disp = comp->wl_comp_data->wl.disp;
/* default display to zero */
exs->disp = 0;
lock:
/* assemble lock file name */
snprintf(exs->lock, sizeof(exs->lock), "/tmp/.X%d-lock", exs->disp);
/* try to create the xserver lock file */
if (!_lock_create(exs->lock))
{
if (errno == EAGAIN)
goto lock;
else if (errno == EEXIST)
{
exs->disp++;
goto lock;
}
else
{
free(exs);
return NULL;
}
}
/* try to bind abstract socket */
exs->abs_fd = _abstract_socket_bind(exs->disp);
if ((exs->abs_fd < 0) && (errno == EADDRINUSE))
{
exs->disp++;
unlink(exs->lock);
goto lock;
}
/* try to bind unix socket */
if ((exs->unx_fd = _unix_socket_bind(exs->disp)) < 0)
{
unlink(exs->lock);
close(exs->abs_fd);
free(exs);
return NULL;
}
/* assemble x11 display name and set it */
snprintf(disp, sizeof(disp), ":%d", exs->disp);
DBG("XWayland Listening on display: %s", disp);
setenv("DISPLAY", disp, 1);
/* setup ecore_fd handlers for abstract and unix socket fds */
exs->abs_hdlr =
ecore_main_fd_handler_add(exs->abs_fd, ECORE_FD_READ,
_cb_xserver_event, NULL, NULL, NULL);
exs->unx_hdlr =
ecore_main_fd_handler_add(exs->unx_fd, ECORE_FD_READ,
_cb_xserver_event, NULL, NULL, NULL);
/* setup listener for SIGUSR1 */
exs->sig_hdlr =
ecore_event_handler_add(ECORE_EVENT_SIGNAL_USER, _cb_signal_event, exs);
return m;
}
EAPI int
e_modapi_shutdown(E_Module *m EINA_UNUSED)
{
char path[256];
if (!exs) return 1;
unlink(exs->lock);
snprintf(path, sizeof(path), "/tmp/.X11-unix/X%d", exs->disp);
unlink(path);
if (exs->abs_hdlr) ecore_main_fd_handler_del(exs->abs_hdlr);
if (exs->unx_hdlr) ecore_main_fd_handler_del(exs->unx_hdlr);
close(exs->abs_fd);
close(exs->unx_fd);
if (exs->sig_hdlr) ecore_event_handler_del(exs->sig_hdlr);
free(exs);
return 1;
}

@ -0,0 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Type=Link
Name=XWayland
Comment=Enlightenment XWayland
Icon=e-module-xwayland
X-Enlightenment-ModuleType=look
Loading…
Cancel
Save