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

rootston: update output-management-v1 state when output is modeset

This commit is contained in:
emersion 2019-03-08 17:11:19 +01:00 committed by Drew DeVault
parent ef68d7d4d1
commit ee77a65fe3
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/rootston/output.h
View File

@ -22,6 +22,7 @@ struct roots_output {
struct wlr_box usable_area; struct wlr_box usable_area;
struct wl_listener destroy; struct wl_listener destroy;
struct wl_listener enable;
struct wl_listener mode; struct wl_listener mode;
struct wl_listener transform; struct wl_listener transform;
struct wl_listener present; struct wl_listener present;

15
rootston/output.c
View File

@ -443,23 +443,27 @@ static void output_destroy(struct roots_output *output) {
//example_config_configure_cursor(sample->config, sample->cursor, //example_config_configure_cursor(sample->config, sample->cursor,
// sample->compositor); // sample->compositor);
struct roots_desktop *desktop = output->desktop;
wl_list_remove(&output->link); wl_list_remove(&output->link);
wl_list_remove(&output->destroy.link); wl_list_remove(&output->destroy.link);
wl_list_remove(&output->enable.link);
wl_list_remove(&output->mode.link); wl_list_remove(&output->mode.link);
wl_list_remove(&output->transform.link); wl_list_remove(&output->transform.link);
wl_list_remove(&output->present.link); wl_list_remove(&output->present.link);
wl_list_remove(&output->damage_frame.link); wl_list_remove(&output->damage_frame.link);
wl_list_remove(&output->damage_destroy.link); wl_list_remove(&output->damage_destroy.link);
free(output); free(output);
update_output_manager_config(desktop);
} }
static void output_handle_destroy(struct wl_listener *listener, void *data) { static void output_handle_destroy(struct wl_listener *listener, void *data) {
struct roots_output *output = wl_container_of(listener, output, destroy); struct roots_output *output = wl_container_of(listener, output, destroy);
struct roots_desktop *desktop = output->desktop;
output_destroy(output); output_destroy(output);
update_output_manager_config(desktop);
}
static void output_handle_enable(struct wl_listener *listener, void *data) {
struct roots_output *output = wl_container_of(listener, output, enable);
update_output_manager_config(output->desktop);
} }
static void output_damage_handle_frame(struct wl_listener *listener, static void output_damage_handle_frame(struct wl_listener *listener,
@ -480,6 +484,7 @@ static void output_handle_mode(struct wl_listener *listener, void *data) {
struct roots_output *output = struct roots_output *output =
wl_container_of(listener, output, mode); wl_container_of(listener, output, mode);
arrange_layers(output); arrange_layers(output);
update_output_manager_config(output->desktop);
} }
static void output_handle_transform(struct wl_listener *listener, void *data) { static void output_handle_transform(struct wl_listener *listener, void *data) {
@ -537,6 +542,8 @@ void handle_new_output(struct wl_listener *listener, void *data) {
output->destroy.notify = output_handle_destroy; output->destroy.notify = output_handle_destroy;
wl_signal_add(&wlr_output->events.destroy, &output->destroy); wl_signal_add(&wlr_output->events.destroy, &output->destroy);
output->enable.notify = output_handle_enable;
wl_signal_add(&wlr_output->events.enable, &output->enable);
output->mode.notify = output_handle_mode; output->mode.notify = output_handle_mode;
wl_signal_add(&wlr_output->events.mode, &output->mode); wl_signal_add(&wlr_output->events.mode, &output->mode);
output->transform.notify = output_handle_transform; output->transform.notify = output_handle_transform;