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

Merge d07f58265a into dcd64ae48b

Browse source
This commit is contained in:
Sungjoon Moon 2026-02-27 14:59:35 +00:00 • committed by GitHub
commit 01d7e210e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 5 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View file

@ -6,7 +6,7 @@ on:
branches: [ master ] branches: [ master ]
env: env:
WLROOTS_VERSION: 0.19 WLROOTS_VERSION: 0.20.0-rc3
jobs: jobs:
compile: compile:

2
README.md
View file

@ -21,7 +21,7 @@ All releases are published on [GitHub](https://github.com/cage-kiosk/cage/releas
You can build Cage with the [meson](https://mesonbuild.com/) build system. It You can build Cage with the [meson](https://mesonbuild.com/) build system. It
requires wayland, wlroots, and xkbcommon to be installed. Optionally, install requires wayland, wlroots, and xkbcommon to be installed. Optionally, install
scdoc for manual pages. Cage is currently based on branch 0.18 of wlroots. scdoc for manual pages. Cage is currently based on branch 0.20 of wlroots.
Simply execute the following steps to build Cage: Simply execute the following steps to build Cage:

4
cage.c
View file

@ -588,8 +588,8 @@ main(int argc, char *argv[])
struct wlr_xcursor *xcursor = wlr_xcursor_manager_get_xcursor(xcursor_manager, DEFAULT_XCURSOR, 1); struct wlr_xcursor *xcursor = wlr_xcursor_manager_get_xcursor(xcursor_manager, DEFAULT_XCURSOR, 1);
if (xcursor) { if (xcursor) {
struct wlr_xcursor_image *image = xcursor->images[0]; struct wlr_xcursor_image *image = xcursor->images[0];
wlr_xwayland_set_cursor(xwayland, image->buffer, image->width * 4, image->width, image->height, wlr_xwayland_set_cursor(xwayland, wlr_xcursor_image_get_buffer(image), image->hotspot_x,
image->hotspot_x, image->hotspot_y); image->hotspot_y);
} }
} }
#endif #endif

27
meson.build
View file

@ -35,35 +35,11 @@ if is_freebsd
) )
endif endif
wlroots = dependency('wlroots-0.19', fallback: ['wlroots', 'wlroots']) wlroots = dependency('wlroots-0.20', fallback: ['wlroots', 'wlroots'])
wayland_protos = dependency('wayland-protocols', version: '>=1.14')
wayland_server = dependency('wayland-server') wayland_server = dependency('wayland-server')
xkbcommon = dependency('xkbcommon') xkbcommon = dependency('xkbcommon')
math = cc.find_library('m') math = cc.find_library('m')
wl_protocol_dir = wayland_protos.get_variable('pkgdatadir')
wayland_scanner = find_program('wayland-scanner')
wayland_scanner_server = generator(
wayland_scanner,
output: '@BASENAME@-protocol.h',
arguments: ['server-header', '@INPUT@', '@OUTPUT@'],
)
server_protocols = [
[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
]
server_protos_headers = []
foreach p : server_protocols
xml = join_paths(p)
server_protos_headers += wayland_scanner_server.process(xml)
endforeach
server_protos = declare_dependency(
sources: server_protos_headers,
)
have_xwayland = wlroots.get_variable(pkgconfig: 'have_xwayland', internal: 'have_xwayland') == 'true' have_xwayland = wlroots.get_variable(pkgconfig: 'have_xwayland', internal: 'have_xwayland') == 'true'
version = '@0@'.format(meson.project_version()) version = '@0@'.format(meson.project_version())
@ -140,7 +116,6 @@ executable(
meson.project_name(), meson.project_name(),
cage_sources + cage_headers, cage_sources + cage_headers,
dependencies: [ dependencies: [
server_protos,
wayland_server, wayland_server,
wlroots, wlroots,
xkbcommon, xkbcommon,