mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2026-04-09 08:21:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: implement CAGE_MULTI_OUTPUT_MODE_LAST

Browse source 
In this mode, only the last connected output will be used. If that one
is unplugged, the previously last connected output will be enabled. This
for example allows one to switch between two outputs, e.g. on a handheld
device such as a mobile phone.
This commit is contained in:
Jente Hidskes 2020-05-31 16:04:01 +02:00
parent c09dec7cc7
commit 1f11ad113d
No known key found for this signature in database
GPG key ID: 04BE5A29F32D91EA
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
output.c
View file

@ -404,15 +404,20 @@ output_destroy(struct cg_output *output)
wlr_output_layout_remove(server->output_layout, output->wlr_output); wlr_output_layout_remove(server->output_layout, output->wlr_output);
struct cg_view *view;
wl_list_for_each (view, &output->server->views, link) {
view_position(view);
}
free(output); free(output);
if (wl_list_empty(&server->outputs)) { if (wl_list_empty(&server->outputs)) {
wl_display_terminate(server->wl_display); wl_display_terminate(server->wl_display);
} else if (server->output_mode == CAGE_MULTI_OUTPUT_MODE_LAST) {
struct cg_output *prev = wl_container_of(server->outputs.next, prev, link);
if (prev) {
output_enable(prev);
struct cg_view *view;
wl_list_for_each (view, &server->views, link) {
view_position(view);
}
}
} }
} }
@ -465,6 +470,12 @@ handle_new_output(struct wl_listener *listener, void *data)
} }
wlr_output_set_transform(wlr_output, output->server->output_transform); wlr_output_set_transform(wlr_output, output->server->output_transform);
if (server->output_mode == CAGE_MULTI_OUTPUT_MODE_LAST) {
struct cg_output *next = wl_container_of(output->link.next, next, link);
if (next) {
output_disable(next);
}
}
if (wlr_xcursor_manager_load(server->seat->xcursor_manager, wlr_output->scale)) { if (wlr_xcursor_manager_load(server->seat->xcursor_manager, wlr_output->scale)) {
wlr_log(WLR_ERROR, "Cannot load XCursor theme for output '%s' with scale %f", wlr_output->name, wlr_log(WLR_ERROR, "Cannot load XCursor theme for output '%s' with scale %f", wlr_output->name,

4
server.h
View file

@ -33,7 +33,9 @@ struct cg_server {
enum cg_multi_output_mode output_mode; enum cg_multi_output_mode output_mode;
struct wlr_output_layout *output_layout; struct wlr_output_layout *output_layout;
struct wl_list outputs; /* Includes disabled outputs; depending on the output_mode
* some outputs may be disabled. */
struct wl_list outputs; // cg_output::link
struct wl_listener new_output; struct wl_listener new_output;
struct wl_listener xdg_toplevel_decoration; struct wl_listener xdg_toplevel_decoration;