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

Some layer shell fixes

Browse source 
Based on the corresponding rootston changes
This commit is contained in:
Drew DeVault 2018-03-29 12:19:20 -04:00
parent 531c175d3e
commit a76829f375
4 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/layers.h
View file

@ -14,8 +14,6 @@ struct sway_layer_surface {
struct wl_listener unmap; struct wl_listener unmap;
struct wl_listener surface_commit; struct wl_listener surface_commit;
struct wl_listener output_destroy; struct wl_listener output_destroy;
struct wl_listener output_mode;
struct wl_listener output_transform;
bool configured; bool configured;
struct wlr_box geo; struct wlr_box geo;

1
include/sway/output.h
View file

@ -21,6 +21,7 @@ struct sway_output {
struct wl_listener frame; struct wl_listener frame;
struct wl_listener destroy; struct wl_listener destroy;
struct wl_listener mode; struct wl_listener mode;
struct wl_listener transform;
pid_t bg_pid; pid_t bg_pid;
}; };

22
sway/desktop/layer_shell.c
View file

@ -193,22 +193,10 @@ static void handle_output_destroy(struct wl_listener *listener, void *data) {
struct sway_layer_surface *sway_layer = struct sway_layer_surface *sway_layer =
wl_container_of(listener, sway_layer, output_destroy); wl_container_of(listener, sway_layer, output_destroy);
wl_list_remove(&sway_layer->output_destroy.link); wl_list_remove(&sway_layer->output_destroy.link);
wl_list_remove(&sway_layer->output_mode.link);
wl_list_remove(&sway_layer->output_transform.link);
sway_layer->layer_surface->output = NULL; sway_layer->layer_surface->output = NULL;
wlr_layer_surface_close(sway_layer->layer_surface); wlr_layer_surface_close(sway_layer->layer_surface);
} }
static void handle_output_mode(struct wl_listener *listener, void *data) {
struct wlr_output *output = data;
arrange_layers((struct sway_output *)output->data);
}
static void handle_output_transform(struct wl_listener *listener, void *data) {
struct wlr_output *output = data;
arrange_layers((struct sway_output *)output->data);
}
static void handle_surface_commit(struct wl_listener *listener, void *data) { static void handle_surface_commit(struct wl_listener *listener, void *data) {
struct sway_layer_surface *layer = struct sway_layer_surface *layer =
wl_container_of(listener, layer, surface_commit); wl_container_of(listener, layer, surface_commit);
@ -243,8 +231,6 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&sway_layer->surface_commit.link); wl_list_remove(&sway_layer->surface_commit.link);
if (sway_layer->layer_surface->output != NULL) { if (sway_layer->layer_surface->output != NULL) {
wl_list_remove(&sway_layer->output_destroy.link); wl_list_remove(&sway_layer->output_destroy.link);
wl_list_remove(&sway_layer->output_mode.link);
wl_list_remove(&sway_layer->output_transform.link);
} }
struct sway_output *output = sway_layer->layer_surface->output->data; struct sway_output *output = sway_layer->layer_surface->output->data;
arrange_layers(output); arrange_layers(output);
@ -289,14 +275,6 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
wl_signal_add(&layer_surface->output->events.destroy, wl_signal_add(&layer_surface->output->events.destroy,
&sway_layer->output_destroy); &sway_layer->output_destroy);
sway_layer->output_mode.notify = handle_output_mode;
wl_signal_add(&layer_surface->output->events.mode,
&sway_layer->output_mode);
sway_layer->output_transform.notify = handle_output_transform;
wl_signal_add(&layer_surface->output->events.transform,
&sway_layer->output_transform);
sway_layer->destroy.notify = handle_destroy; sway_layer->destroy.notify = handle_destroy;
wl_signal_add(&layer_surface->events.destroy, &sway_layer->destroy); wl_signal_add(&layer_surface->events.destroy, &sway_layer->destroy);
sway_layer->map.notify = handle_map; sway_layer->map.notify = handle_map;

8
sway/desktop/output.c
View file

@ -268,6 +268,12 @@ static void handle_output_mode(struct wl_listener *listener, void *data) {
arrange_windows(output->swayc, -1, -1); arrange_windows(output->swayc, -1, -1);
} }
static void handle_output_transform(struct wl_listener *listener, void *data) {
struct sway_output *output = wl_container_of(listener, output, transform);
arrange_layers(output);
arrange_windows(output->swayc, -1, -1);
}
void handle_new_output(struct wl_listener *listener, void *data) { void handle_new_output(struct wl_listener *listener, void *data) {
struct sway_server *server = wl_container_of(listener, server, new_output); struct sway_server *server = wl_container_of(listener, server, new_output);
struct wlr_output *wlr_output = data; struct wlr_output *wlr_output = data;
@ -306,6 +312,8 @@ void handle_new_output(struct wl_listener *listener, void *data) {
output->destroy.notify = handle_output_destroy; output->destroy.notify = handle_output_destroy;
wl_signal_add(&wlr_output->events.mode, &output->mode); wl_signal_add(&wlr_output->events.mode, &output->mode);
output->mode.notify = handle_output_mode; output->mode.notify = handle_output_mode;
wl_signal_add(&wlr_output->events.transform, &output->transform);
output->transform.notify = handle_output_transform;
arrange_layers(output); arrange_layers(output);
arrange_windows(&root_container, -1, -1); arrange_windows(&root_container, -1, -1);