mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: remove ported wlr_output functions

Browse source 
We have several wlr_output_* functions which are just wrappers around
corresponding wlr_output_state_* functions and don't actually touch the
wlr_output itself. These probably made some sense historically, but IMHO
they are just confusing now. So remove them and call wlr_output_state_*
directly.

Rename wlr_output_commit() (still useful) to output_state_commit().
This commit is contained in:
John Lindgren 2024-10-20 02:55:12 -04:00 • committed by Johan Malm
parent 45a9bd95e7
commit 7912665b0f
7 changed files with 50 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/labwc.h
View file

@ -549,7 +549,7 @@ struct wlr_box output_usable_area_in_layout_coords(struct output *output);
struct wlr_box output_usable_area_scaled(struct output *output); struct wlr_box output_usable_area_scaled(struct output *output);
void handle_output_power_manager_set_mode(struct wl_listener *listener, void handle_output_power_manager_set_mode(struct wl_listener *listener,
void *data); void *data);
void output_enable_adaptive_sync(struct wlr_output *output, bool enabled); void output_enable_adaptive_sync(struct output *output, bool enabled);
/** /**
* output_max_scale() - get maximum scale factor of all usable outputs. * output_max_scale() - get maximum scale factor of all usable outputs.

23
include/output-state.h
View file

@ -5,30 +5,9 @@
#include <stdbool.h> #include <stdbool.h>
struct output; struct output;
struct wlr_output;
void output_state_init(struct output *output); void output_state_init(struct output *output);
/* Forward port of removed functions */ bool output_state_commit(struct output *output);
bool wlr_output_test(struct wlr_output *wlr_output);
bool wlr_output_commit(struct wlr_output *wlr_output);
void wlr_output_enable(struct wlr_output *wlr_output, bool enabled);
void wlr_output_set_mode(struct wlr_output *wlr_output,
struct wlr_output_mode *mode);
void wlr_output_set_custom_mode(struct wlr_output *wlr_output,
int32_t width, int32_t height, int32_t refresh);
void wlr_output_set_scale(struct wlr_output *wlr_output, float scale);
void wlr_output_set_transform(struct wlr_output *wlr_output,
enum wl_output_transform transform);
void wlr_output_enable_adaptive_sync(struct wlr_output *wlr_output,
bool enabled);
#endif // LABWC_OUTPUT_STATE_H #endif // LABWC_OUTPUT_STATE_H

2
src/common/scene-helpers.c
View file

@ -113,7 +113,7 @@ lab_wlr_scene_output_commit(struct wlr_scene_output *scene_output,
} }
if (state == &output->pending) { if (state == &output->pending) {
if (!wlr_output_commit(wlr_output)) { if (!output_state_commit(output)) {
wlr_log(WLR_INFO, "Failed to commit output %s", wlr_log(WLR_INFO, "Failed to commit output %s",
wlr_output->name); wlr_output->name);
return false; return false;

57
src/output-state.c
View file

@ -27,17 +27,10 @@ output_state_init(struct output *output)
} }
bool bool
wlr_output_test(struct wlr_output *wlr_output) output_state_commit(struct output *output)
{ {
struct output *output = wlr_output->data; bool committed =
return wlr_output_test_state(wlr_output, &output->pending); wlr_output_commit_state(output->wlr_output, &output->pending);
}
bool
wlr_output_commit(struct wlr_output *wlr_output)
{
struct output *output = wlr_output->data;
bool committed = wlr_output_commit_state(wlr_output, &output->pending);
if (committed) { if (committed) {
wlr_output_state_finish(&output->pending); wlr_output_state_finish(&output->pending);
wlr_output_state_init(&output->pending); wlr_output_state_init(&output->pending);
@ -46,47 +39,3 @@ wlr_output_commit(struct wlr_output *wlr_output)
} }
return committed; return committed;
} }
void
wlr_output_enable(struct wlr_output *wlr_output, bool enabled)
{
struct output *output = wlr_output->data;
wlr_output_state_set_enabled(&output->pending, enabled);
}
void
wlr_output_set_mode(struct wlr_output *wlr_output, struct wlr_output_mode *mode)
{
struct output *output = wlr_output->data;
wlr_output_state_set_mode(&output->pending, mode);
}
void
wlr_output_set_custom_mode(struct wlr_output *wlr_output,
int32_t width, int32_t height, int32_t refresh)
{
struct output *output = wlr_output->data;
wlr_output_state_set_custom_mode(&output->pending, width, height, refresh);
}
void
wlr_output_set_scale(struct wlr_output *wlr_output, float scale)
{
struct output *output = wlr_output->data;
wlr_output_state_set_scale(&output->pending, scale);
}
void
wlr_output_set_transform(struct wlr_output *wlr_output,
enum wl_output_transform transform)
{
struct output *output = wlr_output->data;
wlr_output_state_set_transform(&output->pending, transform);
}
void
wlr_output_enable_adaptive_sync(struct wlr_output *wlr_output, bool enabled)
{
struct output *output = wlr_output->data;
wlr_output_state_set_adaptive_sync_enabled(&output->pending, enabled);
}

75
src/output.c
View file

@ -243,10 +243,11 @@ output_request_state_notify(struct wl_listener *listener, void *data)
/* Only the mode has changed */ /* Only the mode has changed */
switch (event->state->mode_type) { switch (event->state->mode_type) {
case WLR_OUTPUT_STATE_MODE_FIXED: case WLR_OUTPUT_STATE_MODE_FIXED:
wlr_output_set_mode(output->wlr_output, event->state->mode); wlr_output_state_set_mode(&output->pending,
event->state->mode);
break; break;
case WLR_OUTPUT_STATE_MODE_CUSTOM: case WLR_OUTPUT_STATE_MODE_CUSTOM:
wlr_output_set_custom_mode(output->wlr_output, wlr_output_state_set_custom_mode(&output->pending,
event->state->custom_mode.width, event->state->custom_mode.width,
event->state->custom_mode.height, event->state->custom_mode.height,
event->state->custom_mode.refresh); event->state->custom_mode.refresh);
@ -269,9 +270,10 @@ output_request_state_notify(struct wl_listener *listener, void *data)
static void do_output_layout_change(struct server *server); static void do_output_layout_change(struct server *server);
static bool static bool
can_reuse_mode(struct wlr_output *wlr_output) can_reuse_mode(struct output *output)
{ {
return wlr_output->current_mode && wlr_output_test(wlr_output); struct wlr_output *wo = output->wlr_output;
return wo->current_mode && wlr_output_test_state(wo, &output->pending);
} }
static void static void
@ -372,19 +374,20 @@ new_output_notify(struct wl_listener *listener, void *data)
output_state_init(output); output_state_init(output);
wlr_log(WLR_DEBUG, "enable output"); wlr_log(WLR_DEBUG, "enable output");
wlr_output_enable(wlr_output, true); wlr_output_state_set_enabled(&output->pending, true);
/* /*
* Try to re-use the existing mode if configured to do so. * Try to re-use the existing mode if configured to do so.
* Failing that, try to set the preferred mode. * Failing that, try to set the preferred mode.
*/ */
struct wlr_output_mode *preferred_mode = NULL; struct wlr_output_mode *preferred_mode = NULL;
if (!rc.reuse_output_mode || !can_reuse_mode(wlr_output)) { if (!rc.reuse_output_mode || !can_reuse_mode(output)) {
wlr_log(WLR_DEBUG, "set preferred mode"); wlr_log(WLR_DEBUG, "set preferred mode");
/* The mode is a tuple of (width, height, refresh rate). */ /* The mode is a tuple of (width, height, refresh rate). */
preferred_mode = wlr_output_preferred_mode(wlr_output); preferred_mode = wlr_output_preferred_mode(wlr_output);
if (preferred_mode) { if (preferred_mode) {
wlr_output_set_mode(wlr_output, preferred_mode); wlr_output_state_set_mode(&output->pending,
preferred_mode);
} }
} }
@ -394,7 +397,7 @@ new_output_notify(struct wl_listener *listener, void *data)
* cases it's better to fallback to lower modes than to end up with * cases it's better to fallback to lower modes than to end up with
* a black screen. See sway@4cdc4ac6 * a black screen. See sway@4cdc4ac6
*/ */
if (!wlr_output_test(wlr_output)) { if (!wlr_output_test_state(wlr_output, &output->pending)) {
wlr_log(WLR_DEBUG, wlr_log(WLR_DEBUG,
"preferred mode rejected, falling back to another mode"); "preferred mode rejected, falling back to another mode");
struct wlr_output_mode *mode; struct wlr_output_mode *mode;
@ -402,18 +405,18 @@ new_output_notify(struct wl_listener *listener, void *data)
if (mode == preferred_mode) { if (mode == preferred_mode) {
continue; continue;
} }
wlr_output_set_mode(wlr_output, mode); wlr_output_state_set_mode(&output->pending, mode);
if (wlr_output_test(wlr_output)) { if (wlr_output_test_state(wlr_output, &output->pending)) {
break; break;
} }
} }
} }
if (rc.adaptive_sync == LAB_ADAPTIVE_SYNC_ENABLED) { if (rc.adaptive_sync == LAB_ADAPTIVE_SYNC_ENABLED) {
output_enable_adaptive_sync(wlr_output, true); output_enable_adaptive_sync(output, true);
} }
wlr_output_commit(wlr_output); output_state_commit(output);
wlr_output_effective_resolution(wlr_output, wlr_output_effective_resolution(wlr_output,
&output->usable_area.width, &output->usable_area.height); &output->usable_area.width, &output->usable_area.height);
@ -548,27 +551,28 @@ output_config_apply(struct server *server,
wl_list_for_each(head, &config->heads, link) { wl_list_for_each(head, &config->heads, link) {
struct wlr_output *o = head->state.output; struct wlr_output *o = head->state.output;
struct output *output = output_from_wlr_output(server, o); struct output *output = output_from_wlr_output(server, o);
struct wlr_output_state *os = &output->pending;
bool output_enabled = head->state.enabled && !output->leased; bool output_enabled = head->state.enabled && !output->leased;
bool need_to_add = output_enabled && !o->enabled; bool need_to_add = output_enabled && !o->enabled;
bool need_to_remove = !output_enabled && o->enabled; bool need_to_remove = !output_enabled && o->enabled;
wlr_output_enable(o, output_enabled); wlr_output_state_set_enabled(os, output_enabled);
if (output_enabled) { if (output_enabled) {
/* Output specific actions only */ /* Output specific actions only */
if (head->state.mode) { if (head->state.mode) {
wlr_output_set_mode(o, head->state.mode); wlr_output_state_set_mode(os, head->state.mode);
} else { } else {
int32_t width = head->state.custom_mode.width; wlr_output_state_set_custom_mode(os,
int32_t height = head->state.custom_mode.height; head->state.custom_mode.width,
int32_t refresh = head->state.custom_mode.refresh; head->state.custom_mode.height,
wlr_output_set_custom_mode(o, width, head->state.custom_mode.refresh);
height, refresh);
} }
wlr_output_set_scale(o, head->state.scale); wlr_output_state_set_scale(os, head->state.scale);
wlr_output_set_transform(o, head->state.transform); wlr_output_state_set_transform(os, head->state.transform);
output_enable_adaptive_sync(o, head->state.adaptive_sync_enabled); output_enable_adaptive_sync(output,
head->state.adaptive_sync_enabled);
} }
if (!wlr_output_commit(o)) { if (!output_state_commit(output)) {
/* /*
* FIXME: This is only part of the story, we should revert * FIXME: This is only part of the story, we should revert
* all previously commited outputs as well here. * all previously commited outputs as well here.
@ -700,7 +704,6 @@ custom_mode_failed:
static void static void
handle_output_manager_test(struct wl_listener *listener, void *data) handle_output_manager_test(struct wl_listener *listener, void *data)
{ {
struct server *server = wl_container_of(listener, server, output_manager_test);
struct wlr_output_configuration_v1 *config = data; struct wlr_output_configuration_v1 *config = data;
if (verify_output_config_v1(config)) { if (verify_output_config_v1(config)) {
@ -810,7 +813,6 @@ handle_output_layout_change(struct wl_listener *listener, void *data)
static void static void
handle_gamma_control_set_gamma(struct wl_listener *listener, void *data) handle_gamma_control_set_gamma(struct wl_listener *listener, void *data)
{ {
struct server *server = wl_container_of(listener, server, gamma_control_set_gamma);
const struct wlr_gamma_control_manager_v1_set_gamma_event *event = data; const struct wlr_gamma_control_manager_v1_set_gamma_event *event = data;
struct output *output = event->output->data; struct output *output = event->output->data;
@ -1036,15 +1038,17 @@ handle_output_power_manager_set_mode(struct wl_listener *listener, void *data)
struct server *server = wl_container_of(listener, server, struct server *server = wl_container_of(listener, server,
output_power_manager_set_mode); output_power_manager_set_mode);
struct wlr_output_power_v1_set_mode_event *event = data; struct wlr_output_power_v1_set_mode_event *event = data;
struct output *output = event->output->data;
assert(output);
switch (event->mode) { switch (event->mode) {
case ZWLR_OUTPUT_POWER_V1_MODE_OFF: case ZWLR_OUTPUT_POWER_V1_MODE_OFF:
wlr_output_enable(event->output, false); wlr_output_state_set_enabled(&output->pending, false);
wlr_output_commit(event->output); output_state_commit(output);
break; break;
case ZWLR_OUTPUT_POWER_V1_MODE_ON: case ZWLR_OUTPUT_POWER_V1_MODE_ON:
wlr_output_enable(event->output, true); wlr_output_state_set_enabled(&output->pending, true);
wlr_output_commit(event->output); output_state_commit(output);
/* /*
* Re-set the cursor image so that the cursor * Re-set the cursor image so that the cursor
* isn't invisible on the newly enabled output. * isn't invisible on the newly enabled output.
@ -1055,16 +1059,17 @@ handle_output_power_manager_set_mode(struct wl_listener *listener, void *data)
} }
void void
output_enable_adaptive_sync(struct wlr_output *output, bool enabled) output_enable_adaptive_sync(struct output *output, bool enabled)
{ {
wlr_output_enable_adaptive_sync(output, enabled); wlr_output_state_set_adaptive_sync_enabled(&output->pending, enabled);
if (!wlr_output_test(output)) { if (!wlr_output_test_state(output->wlr_output, &output->pending)) {
wlr_output_enable_adaptive_sync(output, false); wlr_output_state_set_adaptive_sync_enabled(&output->pending, false);
wlr_log(WLR_DEBUG, wlr_log(WLR_DEBUG,
"failed to enable adaptive sync for output %s", output->name); "failed to enable adaptive sync for output %s",
output->wlr_output->name);
} else { } else {
wlr_log(WLR_INFO, "adaptive sync %sabled for output %s", wlr_log(WLR_INFO, "adaptive sync %sabled for output %s",
enabled ? "en" : "dis", output->name); enabled ? "en" : "dis", output->wlr_output->name);
} }
} }

4
src/server.c
View file

@ -178,8 +178,8 @@ handle_drm_lease_request(struct wl_listener *listener, void *data)
continue; continue;
} }
wlr_output_enable(output->wlr_output, false); wlr_output_state_set_enabled(&output->pending, false);
wlr_output_commit(output->wlr_output); output_state_commit(output);
wlr_output_layout_remove(output->server->output_layout, wlr_output_layout_remove(output->server->output_layout,
output->wlr_output); output->wlr_output);

4
src/view.c
View file

@ -375,8 +375,8 @@ set_adaptive_sync_fullscreen(struct view *view)
return; return;
} }
/* Enable adaptive sync if view is fullscreen */ /* Enable adaptive sync if view is fullscreen */
output_enable_adaptive_sync(view->output->wlr_output, view->fullscreen); output_enable_adaptive_sync(view->output, view->fullscreen);
wlr_output_commit(view->output->wlr_output); output_state_commit(view->output);
} }
void void