mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

xwayland: don't set DISPLAY

Browse source 
Let the compositor set it. This allows for multiple Xwayland instances to run
at the same time.

Fixes https://github.com/swaywm/wlroots/issues/1442
This commit is contained in:
emersion 2019-03-02 15:14:23 +01:00 • committed by Drew DeVault
parent fb106eb979
commit 9601019192
3 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/wlr/xwayland.h
View file

@ -24,7 +24,6 @@ struct wlr_xwayland {
pid_t pid;
struct wl_client *client;
struct wl_event_source *sigusr1_source;
struct wl_listener client_destroy;
struct wlr_xwm *xwm;
struct wlr_xwayland_cursor *cursor;
int wm_fd[2], wl_fd[2];
@ -34,10 +33,9 @@ struct wlr_xwayland {
/* Anything above display is reset on Xwayland restart, rest is conserved */
int display;
char display_name[16];
int x_fd[2];
struct wl_event_source *x_fd_read_event[2];
struct wl_listener display_destroy;
bool lazy;
struct wl_display *wl_display;
@ -49,8 +47,6 @@ struct wlr_xwayland {
struct wl_signal new_surface;
} events;
struct wl_listener seat_destroy;
/**
* Add a custom event handler to xwayland. Return 1 if the event was
* handled or 0 to use the default wlr-xwayland handler. wlr-xwayland will
@ -58,6 +54,10 @@ struct wlr_xwayland {
*/
int (*user_event_handler)(struct wlr_xwm *xwm, xcb_generic_event_t *event);
struct wl_listener client_destroy;
struct wl_listener display_destroy;
struct wl_listener seat_destroy;
void *data;
};