mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-16 08:21:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tray: guard pattern and hotspot allocation

Browse source
This commit is contained in:
Rtur2003 2025-12-09 18:59:38 +03:00
parent f4aba22582
commit c0985ee636
1 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
swaybar/tray/item.c
View file

@ -515,7 +515,15 @@ uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x,
cairo_matrix_t scale_matrix; cairo_matrix_t scale_matrix;
cairo_pattern_t *icon_pattern = cairo_pattern_create_for_surface(icon); cairo_pattern_t *icon_pattern = cairo_pattern_create_for_surface(icon);
// TODO: check cairo_pattern_status for "ENOMEM" cairo_status_t pattern_status = cairo_pattern_status(icon_pattern);
if (pattern_status != CAIRO_STATUS_SUCCESS) {
sway_log(SWAY_ERROR, "Failed to create icon pattern: %s",
cairo_status_to_string(pattern_status));
cairo_set_operator(cairo, op);
cairo_pattern_destroy(icon_pattern);
cairo_surface_destroy(icon);
return output->height;
}
cairo_matrix_init_scale(&scale_matrix, output->scale, output->scale); cairo_matrix_init_scale(&scale_matrix, output->scale, output->scale);
cairo_matrix_translate(&scale_matrix, -(*x + descaled_padding), -(icon_y + descaled_padding)); cairo_matrix_translate(&scale_matrix, -(*x + descaled_padding), -(icon_y + descaled_padding));
cairo_pattern_set_matrix(icon_pattern, &scale_matrix); cairo_pattern_set_matrix(icon_pattern, &scale_matrix);
@ -529,6 +537,10 @@ uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x,
cairo_surface_destroy(icon); cairo_surface_destroy(icon);
struct swaybar_hotspot *hotspot = calloc(1, sizeof(struct swaybar_hotspot)); struct swaybar_hotspot *hotspot = calloc(1, sizeof(struct swaybar_hotspot));
if (!hotspot) {
sway_log(SWAY_ERROR, "Failed to allocate SNI hotspot");
return output->height;
}
hotspot->x = *x; hotspot->x = *x;
hotspot->y = 0; hotspot->y = 0;
hotspot->width = size; hotspot->width = size;
@ -536,6 +548,11 @@ uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x,
hotspot->callback = icon_hotspot_callback; hotspot->callback = icon_hotspot_callback;
hotspot->destroy = free; hotspot->destroy = free;
hotspot->data = strdup(sni->watcher_id); hotspot->data = strdup(sni->watcher_id);
if (!hotspot->data) {
sway_log(SWAY_ERROR, "Failed to copy SNI id for hotspot");
free(hotspot);
return output->height;
}
wl_list_insert(&output->hotspots, &hotspot->link); wl_list_insert(&output->hotspots, &hotspot->link);
return output->height; return output->height;