mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wlr_output: Make wlr_output_update_{custom,}_mode private

Browse source 
Backends should be using wlr_output_send_request_state to request
modesets to the compositor. This will be inlined and removed next commit.
This commit is contained in:
Alexander Orzechowski 2023-06-26 18:33:42 -04:00 • committed by Simon Ser
parent 8f0d4c9332
commit f1ba70ffa6
2 changed files with 12 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/wlr/interfaces/wlr_output.h
View file

@ -103,22 +103,6 @@ struct wlr_output_impl {
void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend, void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
const struct wlr_output_impl *impl, struct wl_display *display, const struct wlr_output_impl *impl, struct wl_display *display,
const struct wlr_output_state *state); const struct wlr_output_state *state);
/**
* Update the current output mode.
*
* The backend must call this function when the mode is updated to notify
* compositors about the change.
*/
void wlr_output_update_mode(struct wlr_output *output,
struct wlr_output_mode *mode);
/**
* Update the current output custom mode.
*
* The backend must call this function when the mode is updated to notify
* compositors about the change.
*/
void wlr_output_update_custom_mode(struct wlr_output *output, int32_t width,
int32_t height, int32_t refresh);
/** /**
* Update the current output status. * Update the current output status.
* *

24
types/output/output.c
View file

@ -224,18 +224,7 @@ void wlr_output_set_custom_mode(struct wlr_output *output, int32_t width,
wlr_output_state_set_custom_mode(&output->pending, width, height, refresh); wlr_output_state_set_custom_mode(&output->pending, width, height, refresh);
} }
void wlr_output_update_mode(struct wlr_output *output, static void wlr_output_update_custom_mode(struct wlr_output *output, int32_t width,
struct wlr_output_mode *mode) {
output->current_mode = mode;
if (mode != NULL) {
wlr_output_update_custom_mode(output, mode->width, mode->height,
mode->refresh);
} else {
wlr_output_update_custom_mode(output, 0, 0, 0);
}
}
void wlr_output_update_custom_mode(struct wlr_output *output, int32_t width,
int32_t height, int32_t refresh) { int32_t height, int32_t refresh) {
if (output->width == width && output->height == height && if (output->width == width && output->height == height &&
output->refresh == refresh) { output->refresh == refresh) {
@ -262,6 +251,17 @@ void wlr_output_update_custom_mode(struct wlr_output *output, int32_t width,
wlr_output_schedule_done(output); wlr_output_schedule_done(output);
} }
static void wlr_output_update_mode(struct wlr_output *output,
struct wlr_output_mode *mode) {
output->current_mode = mode;
if (mode != NULL) {
wlr_output_update_custom_mode(output, mode->width, mode->height,
mode->refresh);
} else {
wlr_output_update_custom_mode(output, 0, 0, 0);
}
}
void wlr_output_set_transform(struct wlr_output *output, void wlr_output_set_transform(struct wlr_output *output,
enum wl_output_transform transform) { enum wl_output_transform transform) {
wlr_output_state_set_transform(&output->pending, transform); wlr_output_state_set_transform(&output->pending, transform);