diff options
| -rw-r--r-- | render/wlr_renderer.c | 5 | ||||
| -rw-r--r-- | xwayland/xwayland.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/render/wlr_renderer.c b/render/wlr_renderer.c index a41ae388..700da05b 100644 --- a/render/wlr_renderer.c +++ b/render/wlr_renderer.c @@ -168,6 +168,9 @@ void wlr_renderer_init_wl_shm(struct wlr_renderer *r, } for (size_t i = 0; i < len; ++i) { - wl_display_add_shm_format(display, formats[i]); + if (formats[i] != WL_SHM_FORMAT_ARGB8888 && + formats[i] != WL_SHM_FORMAT_XRGB8888) { + wl_display_add_shm_format(display, formats[i]); + } } } diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c index bdb2c0d6..04f4f6f9 100644 --- a/xwayland/xwayland.c +++ b/xwayland/xwayland.c @@ -103,6 +103,7 @@ static void exec_xwayland(struct wlr_xwayland *wlr_xwayland) { } const char *xdg_runtime = getenv("XDG_RUNTIME_DIR"); + const char *path_var = getenv("PATH"); if (!xdg_runtime) { wlr_log(L_ERROR, "XDG_RUNTIME_DIR is not set"); _exit(EXIT_FAILURE); @@ -113,6 +114,7 @@ static void exec_xwayland(struct wlr_xwayland *wlr_xwayland) { _exit(EXIT_FAILURE); } setenv("XDG_RUNTIME_DIR", xdg_runtime, true); + setenv("PATH", path_var, true); char wayland_socket_str[16]; snprintf(wayland_socket_str, sizeof(wayland_socket_str), "%d", wlr_xwayland->wl_fd[1]); setenv("WAYLAND_SOCKET", wayland_socket_str, true); |