mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2025-12-15 08:56:26 -05:00
x11 -> xwayland, window -> surface, fix some calloc sizes and wrong types
This commit is contained in:
parent
c92199a953
commit
b7927078e9
7 changed files with 159 additions and 140 deletions
|
|
@ -86,7 +86,7 @@ static void exec_xwayland(struct wlr_xwayland *wlr_xwayland) {
|
|||
_exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (clearenv()) {
|
||||
if (clearenv()) {
|
||||
wlr_log_errno(L_ERROR, "clearenv failed");
|
||||
_exit(EXIT_FAILURE);
|
||||
}
|
||||
|
|
@ -105,7 +105,7 @@ static void exec_xwayland(struct wlr_xwayland *wlr_xwayland) {
|
|||
}
|
||||
|
||||
static bool wlr_xwayland_init(struct wlr_xwayland *wlr_xwayland,
|
||||
struct wl_display *wl_display, struct wlr_compositor *compositor);
|
||||
struct wl_display *wl_display, struct wlr_compositor *compositor);
|
||||
static void wlr_xwayland_finish(struct wlr_xwayland *wlr_xwayland);
|
||||
|
||||
static void xwayland_destroy_event(struct wl_listener *listener, void *data) {
|
||||
|
|
@ -193,7 +193,7 @@ static bool wlr_xwayland_init(struct wlr_xwayland *wlr_xwayland,
|
|||
wlr_xwayland->x_fd[0] = wlr_xwayland->x_fd[1] = -1;
|
||||
wlr_xwayland->wl_fd[0] = wlr_xwayland->wl_fd[1] = -1;
|
||||
wlr_xwayland->wm_fd[0] = wlr_xwayland->wm_fd[1] = -1;
|
||||
wl_list_init(&wlr_xwayland->displayable_windows);
|
||||
wl_list_init(&wlr_xwayland->displayable_surfaces);
|
||||
wl_signal_init(&wlr_xwayland->events.new_surface);
|
||||
|
||||
wlr_xwayland->display = open_display_sockets(wlr_xwayland->x_fd);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue