mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2026-03-17 05:34:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cage: update for wlroots 0.5.0

Browse source
This commit is contained in:
Jente Hidskes 2019-03-23 16:42:31 +01:00
parent eee63b8001
commit d855ea6718
No known key found for this signature in database
GPG key ID: 04BE5A29F32D91EA
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cage.c
View file

@ -270,6 +270,15 @@ main(int argc, char *argv[])
ret = 1; ret = 1;
goto end; goto end;
} }
int rc = setenv("DISPLAY", xwayland->display_name, true);
if (rc < 0) {
wlr_log_errno(WLR_ERROR, "Unable to set DISPLAY for XWayland.",
"Clients may not be able to connect");
} else {
wlr_log(WLR_DEBUG, "XWayland is running on display %s", socket);
}
if (wlr_xcursor_manager_load(xcursor_manager, 1)) { if (wlr_xcursor_manager_load(xcursor_manager, 1)) {
wlr_log(WLR_ERROR, "Cannot load XWayland XCursor theme"); wlr_log(WLR_ERROR, "Cannot load XWayland XCursor theme");
} }
@ -296,7 +305,7 @@ main(int argc, char *argv[])
goto end; goto end;
} }
int rc = setenv("WAYLAND_DISPLAY", socket, true); rc = setenv("WAYLAND_DISPLAY", socket, true);
if (rc < 0) { if (rc < 0) {
wlr_log_errno(WLR_ERROR, "Unable to set WAYLAND_DISPLAY.", wlr_log_errno(WLR_ERROR, "Unable to set WAYLAND_DISPLAY.",
"Clients may not be able to connect"); "Clients may not be able to connect");

2
meson.build
View file

@ -24,7 +24,7 @@ endif
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
wlroots = dependency('wlroots', version: '>= 0.4.1') wlroots = dependency('wlroots', version: '>= 0.5.0')
wayland_protos = dependency('wayland-protocols', version: '>=1.14') wayland_protos = dependency('wayland-protocols', version: '>=1.14')
wayland_server = dependency('wayland-server') wayland_server = dependency('wayland-server')
pixman = dependency('pixman-1') pixman = dependency('pixman-1')