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

swaybar: remove swaybar_output.input_region

Browse source 
No need to keep the region around, we can immediately destroy it
after the wl_surface.set_input_region request.
This commit is contained in:
Simon Ser 2022-03-14 17:48:39 +01:00 committed by Simon Zeni
parent f614f35e73
commit dd8b6f5e68
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/swaybar/bar.h
View file

@ -58,7 +58,6 @@ struct swaybar_output {
struct zxdg_output_v1 *xdg_output; struct zxdg_output_v1 *xdg_output;
struct wl_surface *surface; struct wl_surface *surface;
struct zwlr_layer_surface_v1 *layer_surface; struct zwlr_layer_surface_v1 *layer_surface;
struct wl_region *input_region;
uint32_t wl_name; uint32_t wl_name;
struct wl_list workspaces; // swaybar_workspace::link struct wl_list workspaces; // swaybar_workspace::link

10
swaybar/bar.c
View file

@ -51,9 +51,6 @@ static void swaybar_output_free(struct swaybar_output *output) {
if (output->surface != NULL) { if (output->surface != NULL) {
wl_surface_destroy(output->surface); wl_surface_destroy(output->surface);
} }
if (output->input_region != NULL) {
wl_region_destroy(output->input_region);
}
wl_output_destroy(output->output); wl_output_destroy(output->output);
destroy_buffer(&output->buffers[0]); destroy_buffer(&output->buffers[0]);
destroy_buffer(&output->buffers[1]); destroy_buffer(&output->buffers[1]);
@ -113,10 +110,9 @@ static void add_layer_surface(struct swaybar_output *output) {
if (overlay) { if (overlay) {
// Empty input region // Empty input region
output->input_region = wl_compositor_create_region(bar->compositor); struct wl_region *region = wl_compositor_create_region(bar->compositor);
assert(output->input_region); wl_surface_set_input_region(output->surface, region);
wl_region_destroy(region);
wl_surface_set_input_region(output->surface, output->input_region);
} }
zwlr_layer_surface_v1_set_anchor(output->layer_surface, config->position); zwlr_layer_surface_v1_set_anchor(output->layer_surface, config->position);