blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

output: rename resolution event to mode

This commit is contained in:
emersion 2018-01-06 12:42:32 +01:00
parent 6fe380a176
commit 8ebd7d4dbe
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/support/shared.c
View File

@ -425,7 +425,7 @@ static void output_add_notify(struct wl_listener *listener, void *data) {
ostate->frame.notify = output_frame_notify;
ostate->resolution.notify = output_resolution_notify;
wl_signal_add(&output->events.frame, &ostate->frame);
wl_signal_add(&output->events.resolution, &ostate->resolution);
wl_signal_add(&output->events.mode, &ostate->resolution);
wl_list_insert(&state->outputs, &ostate->link);
if (state->output_add_cb) {
state->output_add_cb(ostate);

2
include/wlr/types/wlr_output.h
View File

@ -65,7 +65,7 @@ struct wlr_output {
struct wl_signal frame;
struct wl_signal swap_buffers;
struct wl_signal enable;
struct wl_signal resolution;
struct wl_signal mode;
struct wl_signal scale;
struct wl_signal transform;
struct wl_signal destroy;

4
types/wlr_output.c
View File

@ -202,7 +202,7 @@ void wlr_output_update_custom_mode(struct wlr_output *output, int32_t width,
wlr_output_send_current_mode_to_resource(resource);
}
wl_signal_emit(&output->events.resolution, output);
wl_signal_emit(&output->events.mode, output);
}
void wlr_output_set_transform(struct wlr_output *output,
@ -270,8 +270,8 @@ void wlr_output_init(struct wlr_output *output, struct wlr_backend *backend,
wl_list_init(&output->wl_resources);
wl_signal_init(&output->events.frame);
wl_signal_init(&output->events.swap_buffers);
wl_signal_init(&output->events.resolution);
wl_signal_init(&output->events.enable);
wl_signal_init(&output->events.mode);
wl_signal_init(&output->events.scale);
wl_signal_init(&output->events.transform);
wl_signal_init(&output->events.destroy);

12
types/wlr_output_layout.c
View File

@ -19,7 +19,7 @@ struct wlr_output_layout_output_state {
bool auto_configured;
struct wl_listener enable;
struct wl_listener resolution;
struct wl_listener mode;
struct wl_listener scale;
struct wl_listener transform;
struct wl_listener output_destroy;
@ -49,7 +49,7 @@ static void wlr_output_layout_output_destroy(
struct wlr_output_layout_output *l_output) {
wl_signal_emit(&l_output->events.destroy, l_output);
wl_list_remove(&l_output->state->enable.link);
wl_list_remove(&l_output->state->resolution.link);
wl_list_remove(&l_output->state->mode.link);
wl_list_remove(&l_output->state->scale.link);
wl_list_remove(&l_output->state->transform.link);
wl_list_remove(&l_output->state->output_destroy.link);
@ -150,9 +150,9 @@ static void handle_output_enable(struct wl_listener *listener, void *data) {
wlr_output_layout_reconfigure(state->layout);
}
static void handle_output_resolution(struct wl_listener *listener, void *data) {
static void handle_output_mode(struct wl_listener *listener, void *data) {
struct wlr_output_layout_output_state *state =
wl_container_of(listener, state, resolution);
wl_container_of(listener, state, mode);
wlr_output_layout_reconfigure(state->layout);
}
@ -196,8 +196,8 @@ static struct wlr_output_layout_output *wlr_output_layout_output_create(
wl_signal_add(&output->events.enable, &l_output->state->enable);
l_output->state->enable.notify = handle_output_enable;
wl_signal_add(&output->events.resolution, &l_output->state->resolution);
l_output->state->resolution.notify = handle_output_resolution;
wl_signal_add(&output->events.mode, &l_output->state->mode);
l_output->state->mode.notify = handle_output_mode;
wl_signal_add(&output->events.scale, &l_output->state->scale);
l_output->state->scale.notify = handle_output_scale;
wl_signal_add(&output->events.transform, &l_output->state->transform);