mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-26 01:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update output manager on layout change

Browse source 
The output manager config was not properly updated if the position
of the output got changed.
This commit is contained in:
Josef Gajdusek 2019-07-16 20:58:14 +02:00 committed by Simon Ser
parent 9af0b4d2ea
commit ac87df23ea
4 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/output.h
View file

@ -154,6 +154,8 @@ void scale_box(struct wlr_box *box, float scale);
enum wlr_direction opposite_direction(enum wlr_direction d); enum wlr_direction opposite_direction(enum wlr_direction d);
void handle_output_layout_change(struct wl_listener *listener, void *data);
void handle_output_manager_apply(struct wl_listener *listener, void *data); void handle_output_manager_apply(struct wl_listener *listener, void *data);
void handle_output_manager_test(struct wl_listener *listener, void *data); void handle_output_manager_test(struct wl_listener *listener, void *data);

1
include/sway/server.h
View file

@ -34,6 +34,7 @@ struct sway_server {
struct sway_input_manager *input; struct sway_input_manager *input;
struct wl_listener new_output; struct wl_listener new_output;
struct wl_listener output_layout_change;
struct wlr_idle *idle; struct wlr_idle *idle;
struct sway_idle_inhibit_manager_v1 *idle_inhibit_manager_v1; struct sway_idle_inhibit_manager_v1 *idle_inhibit_manager_v1;

7
sway/desktop/output.c
View file

@ -688,6 +688,13 @@ void handle_new_output(struct wl_listener *listener, void *data) {
update_output_manager_config(server); update_output_manager_config(server);
} }
void handle_output_layout_change(struct wl_listener *listener,
void *data) {
struct sway_server *server =
wl_container_of(listener, server, output_layout_change);
update_output_manager_config(server);
}
void handle_output_manager_apply(struct wl_listener *listener, void *data) { void handle_output_manager_apply(struct wl_listener *listener, void *data) {
struct sway_server *server = struct sway_server *server =
wl_container_of(listener, server, output_manager_apply); wl_container_of(listener, server, output_manager_apply);

3
sway/server.c
View file

@ -66,6 +66,9 @@ bool server_init(struct sway_server *server) {
server->new_output.notify = handle_new_output; server->new_output.notify = handle_new_output;
wl_signal_add(&server->backend->events.new_output, &server->new_output); wl_signal_add(&server->backend->events.new_output, &server->new_output);
server->output_layout_change.notify = handle_output_layout_change;
wl_signal_add(&root->output_layout->events.change,
&server->output_layout_change);
wlr_xdg_output_manager_v1_create(server->wl_display, root->output_layout); wlr_xdg_output_manager_v1_create(server->wl_display, root->output_layout);