external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-06-20 01:25:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix race conditions

Browse source
This commit is contained in:
Kyle Gunger 2023-01-22 19:08:53 -05:00
parent 050439f0d3
commit a81c7f6e3c
5 changed files with 19 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

9
bar/bar.c
View file

@ -181,7 +181,7 @@ begin_expose_mods(const struct section *s)
if (e != NULL)
e->destroy(e);
s->exps[i] = module_begin_expose(m);
assert(s->exps[i]->width >= 0);
assert(s->exps[i]->width >= 0 && s->exps[i]->height >= 0);
}
}
@ -269,7 +269,7 @@ expose(const struct bar *_bar)
bar->width_with_border - bar->border.left_width - bar->border.right_width,
bar->border.bottom_width},
});
/**
pixman_region32_t clip;
pixman_region32_init_rect(
&clip,
@ -282,7 +282,7 @@ expose(const struct bar *_bar)
bar->top_margin - bar->bottom_margin -
bar->border.top_width - bar->border.bottom_width));
pixman_image_set_clip_region32(pix, &clip);
pixman_region32_fini(&clip);*/
pixman_region32_fini(&clip);
int left_width, center_width, right_width;
calculate_widths(bar, &left_width, &center_width, &right_width);
@ -325,8 +325,7 @@ expose(const struct bar *_bar)
static void
refresh(const struct bar *bar)
{
struct private *b = bar->private;
bar_recalc_size(b);
const struct private *b = bar->private;
b->backend.iface->refresh(bar);
}

30
bar/wayland.c
View file

@ -1043,28 +1043,12 @@ update_size(struct wayland_backend *backend)
return true;
backend->scale = scale;
// TODO: Somehow set up width and height properly
// I need to read more to understand how bar->width and bar->height are used
zwlr_layer_surface_v1_set_size(
backend->layer_surface,
(bar->width_with_border % scale + bar->width_with_border) / scale,
(bar->height_with_border % scale + bar->height_with_border) / scale
);
/* Trigger a 'configure' event, after which we'll have the width */
wl_surface_commit(backend->surface);
wl_display_roundtrip(backend->display);
if (backend->width == -1 || backend->height == -1) {
LOG_ERR("failed to get panel size");
return false;
}
LOG_INFO("backend size: %dx%d", backend->width, backend->height);
bar->width = backend->width;
bar->height = backend->height;
if (bar->location & (BAR_TOP | BAR_BOTTOM)) {
zwlr_layer_surface_v1_set_exclusive_zone(
backend->layer_surface,
@ -1089,12 +1073,20 @@ update_size(struct wayland_backend *backend)
bar->border.left_margin / scale
);
zwlr_layer_surface_v1_set_size(
backend->layer_surface,
(bar->width_with_border % scale + bar->width_with_border) / scale,
(bar->height_with_border % scale + bar->height_with_border) / scale
);
/* Trigger a 'configure' event, after which we'll have the width */
wl_surface_commit(backend->surface);
// TODO: Figure out why not setting width & height
// make the bar fail to appear. Don't want to have to do this
wl_display_roundtrip(backend->display);
bar->width_with_border = backend->width;
bar->height_with_border = backend->height;
/* Reload buffers */
if (backend->next_buffer != NULL)
backend->next_buffer->busy = false;