mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/output.c: refactor virtual output related functions

Browse source 
This commit moves the virtual output related functions
into their own file at `src/output-virtual.c` with its
own include file to reduce `include/labwc.h` bit by bit.

Additionally, it removes the need to keep the
`server->headless.pending_output_name` char array around
by temporarily disconnecting the handler when creating a
new virtual output. This allows to set the output name
right in the `output_virtual_add()` call rather than to
store the pending name until the new output event handler
has been called.

It also makes adding a virtual fallback output easier in
a follow-up PR.
This commit is contained in:
Consolatis 2024-03-07 00:22:51 +01:00 • committed by Johan Malm
parent 40ce95a68c
commit 95e8573388
6 changed files with 132 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

73
src/output.c
View file

@ -10,7 +10,6 @@
#include <assert.h>
#include <strings.h>
#include <wlr/backend/drm.h>
#include <wlr/backend/headless.h>
#include <wlr/backend/wayland.h>
#include <wlr/types/wlr_buffer.h>
#include <wlr/types/wlr_drm_lease_v1.h>
@ -227,15 +226,22 @@ new_output_notify(struct wl_listener *listener, void *data)
struct server *server = wl_container_of(listener, server, new_output);
struct wlr_output *wlr_output = data;
/* Name virtual output */
if (wlr_output_is_headless(wlr_output) && server->headless.pending_output_name[0] != '\0') {
wlr_output_set_name(wlr_output, server->headless.pending_output_name);
server->headless.pending_output_name[0] = '\0';
struct output *output;
wl_list_for_each(output, &server->outputs, link) {
if (output->wlr_output == wlr_output) {
/*
* This is a duplicated notification.
* We may end up here when a virtual output
* was added before the headless backend was
* started up.
*/
return;
}
}
/*
* We offer any display as available for lease, some apps like
* gamescope, want to take ownership of a display when they can
* gamescope want to take ownership of a display when they can
* to use planes and present directly.
* This is also useful for debugging the DRM parts of
* another compositor.
@ -305,7 +311,7 @@ new_output_notify(struct wl_listener *listener, void *data)
wlr_output_commit(wlr_output);
struct output *output = znew(*output);
output = znew(*output);
output->wlr_output = wlr_output;
wlr_output->data = output;
output->server = server;
@ -894,59 +900,6 @@ handle_output_power_manager_set_mode(struct wl_listener *listener, void *data)
}
}
void
output_add_virtual(struct server *server, const char *output_name)
{
if (output_name) {
/* Prevent creating outputs with the same name */
struct output *output;
wl_list_for_each(output, &server->outputs, link) {
if (wlr_output_is_headless(output->wlr_output) &&
!strcmp(output->wlr_output->name, output_name)) {
wlr_log(WLR_DEBUG,
"refusing to create virtual output with duplicate name");
return;
}
}
snprintf(server->headless.pending_output_name,
sizeof(server->headless.pending_output_name), "%s", output_name);
} else {
server->headless.pending_output_name[0] = '\0';
}
/*
* Setting it to (0, 0) here disallows changing resolution from tools like
* wlr-randr (returns error)
*/
wlr_headless_add_output(server->headless.backend, 1920, 1080);
}
void
output_remove_virtual(struct server *server, const char *output_name)
{
struct output *output;
wl_list_for_each(output, &server->outputs, link) {
if (wlr_output_is_headless(output->wlr_output)) {
if (output_name) {
/*
* Given virtual output name, find and destroy virtual output by
* that name.
*/
if (!strcmp(output->wlr_output->name, output_name)) {
wlr_output_destroy(output->wlr_output);
return;
}
} else {
/*
* When virtual output name was no supplied by user, simply
* destroy the first virtual output found.
*/
wlr_output_destroy(output->wlr_output);
return;
}
}
}
}
void
output_enable_adaptive_sync(struct wlr_output *output, bool enabled)
{