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

updates from PR comment

Browse source
This commit is contained in:
Troye Stonich 2026-02-14 19:58:03 -05:00
parent c050f2484c
commit 25e4d1938b
2 changed files with 464 additions and 464 deletions
Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

@ -41,10 +41,6 @@ wayland_server = dependency('wayland-server')
xkbcommon = dependency('xkbcommon') xkbcommon = dependency('xkbcommon')
math = cc.find_library('m') math = cc.find_library('m')
# Add wlroots protocol directory to include path
wlroots_incdir = wlroots.get_variable('includedir', default_value: '/usr/local/include')
add_project_arguments('-I' + wlroots_incdir + '/wlroots-0.19/protocol', language: 'c')
wl_protocol_dir = wayland_protos.get_variable('pkgdatadir') wl_protocol_dir = wayland_protos.get_variable('pkgdatadir')
wayland_scanner = find_program('wayland-scanner') wayland_scanner = find_program('wayland-scanner')
wayland_scanner_server = generator( wayland_scanner_server = generator(

8
output.c
View file

@ -59,12 +59,17 @@ update_output_manager_config(struct cg_server *server)
wlr_output_configuration_head_v1_create(config, wlr_output); wlr_output_configuration_head_v1_create(config, wlr_output);
struct wlr_box output_box; struct wlr_box output_box;
bool in_layout = wlr_output_layout_get(server->output_layout, wlr_output) != NULL;
config_head->state.enabled = in_layout;
if (in_layout) {
wlr_output_layout_get_box(server->output_layout, wlr_output, &output_box); wlr_output_layout_get_box(server->output_layout, wlr_output, &output_box);
if (!wlr_box_empty(&output_box)) { if (!wlr_box_empty(&output_box)) {
config_head->state.x = output_box.x; config_head->state.x = output_box.x;
config_head->state.y = output_box.y; config_head->state.y = output_box.y;
} }
} }
}
wlr_output_manager_v1_set_configuration(server->output_manager_v1, config); wlr_output_manager_v1_set_configuration(server->output_manager_v1, config);
} }
@ -454,7 +459,6 @@ handle_output_power_manager_set_mode(struct wl_listener *listener, void *data)
break; break;
} }
if (wlr_output_test_state(event->output, &state)) {
wlr_output_commit_state(event->output, &state); wlr_output_commit_state(event->output, &state);
} wlr_output_state_finish(&state);
} }