mirror of
https://github.com/labwc/labwc.git
synced 2025-11-02 09:01:47 -05:00
src/output.c: refactor virtual output related functions
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:
parent
40ce95a68c
commit
95e8573388
6 changed files with 132 additions and 65 deletions
102
src/output-virtual.c
Normal file
102
src/output-virtual.c
Normal file
|
|
@ -0,0 +1,102 @@
|
|||
// SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
#include <wlr/backend/headless.h>
|
||||
#include <wlr/types/wlr_output.h>
|
||||
#include "labwc.h"
|
||||
#include "output-virtual.h"
|
||||
|
||||
void
|
||||
output_virtual_add(struct server *server, const char *output_name,
|
||||
struct wlr_output **store_wlr_output)
|
||||
{
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* The headless backend will always emit the new output signal (and
|
||||
* thus call our handler) before `wlr_headless_add_output()` returns.
|
||||
*
|
||||
* This makes it impossible to
|
||||
* - modify the output before it gets enabled in the handler
|
||||
* - use a pointer of the new wlr_output within the handler
|
||||
*
|
||||
* So we temporarily disconnect the handler when creating the output
|
||||
* and then call the handler manually.
|
||||
*
|
||||
* This is important because some operations like `wlr_output_set_name()`
|
||||
* can only be done before the output has been enabled.
|
||||
*
|
||||
* If we add a virtual output before the headless backend has been started
|
||||
* we may end up calling the new output handler twice, one time manually
|
||||
* and one time by the headless backend when it starts up and sends the
|
||||
* signal for all its configured outputs. Rather than keeping a global
|
||||
* server->headless.started state around that we could check here we just
|
||||
* ignore duplicated new output calls in new_output_notify().
|
||||
*/
|
||||
wl_list_remove(&server->new_output.link);
|
||||
|
||||
struct wlr_output *wlr_output = wlr_headless_add_output(
|
||||
server->headless.backend, 1920, 1080);
|
||||
|
||||
if (!wlr_output) {
|
||||
wlr_log(WLR_ERROR, "Failed to create virtual output %s",
|
||||
output_name ? output_name : "");
|
||||
goto restore_handler;
|
||||
}
|
||||
|
||||
if (output_name) {
|
||||
wlr_output_set_name(wlr_output, output_name);
|
||||
}
|
||||
if (store_wlr_output) {
|
||||
/* Ensures that we can use the new wlr_output pointer within new_output_nofity() */
|
||||
*store_wlr_output = wlr_output;
|
||||
}
|
||||
|
||||
/* Notify about the new output manually */
|
||||
if (server->new_output.notify) {
|
||||
server->new_output.notify(&server->new_output, wlr_output);
|
||||
}
|
||||
|
||||
restore_handler:
|
||||
/* And finally restore output notifications */
|
||||
wl_signal_add(&server->backend->events.new_output, &server->new_output);
|
||||
}
|
||||
|
||||
void
|
||||
output_virtual_remove(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)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
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 not supplied by user,
|
||||
* simply destroy the first virtual output found.
|
||||
*/
|
||||
wlr_output_destroy(output->wlr_output);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue