mirror of
https://github.com/swaywm/sway.git
synced 2024-10-22 09:12:43 +00:00
f855b0898b
in pr https://github.com/swaywm/sway/pull/8196, when im_popup_surface is unmapped, author set the popup->relative to NULL, butt popup is still in popup groups, where assert the relative is not NULL, this cause the panic Take the suggestion of Nefsen402, remove the line where set relative to NULL, and add NULL check in scene_descriptor_destory
70 lines
1.8 KiB
C
70 lines
1.8 KiB
C
#include <stdlib.h>
|
|
#include <wlr/util/addon.h>
|
|
#include "log.h"
|
|
#include "sway/scene_descriptor.h"
|
|
|
|
struct scene_descriptor {
|
|
void *data;
|
|
struct wlr_addon addon;
|
|
};
|
|
|
|
static const struct wlr_addon_interface addon_interface;
|
|
|
|
static struct scene_descriptor *scene_node_get_descriptor(
|
|
struct wlr_scene_node *node, enum sway_scene_descriptor_type type) {
|
|
struct wlr_addon *addon = wlr_addon_find(&node->addons, (void *)type, &addon_interface);
|
|
if (!addon) {
|
|
return NULL;
|
|
}
|
|
|
|
struct scene_descriptor *desc = wl_container_of(addon, desc, addon);
|
|
return desc;
|
|
}
|
|
|
|
static void descriptor_destroy(struct scene_descriptor *desc) {
|
|
wlr_addon_finish(&desc->addon);
|
|
free(desc);
|
|
}
|
|
|
|
void *scene_descriptor_try_get(struct wlr_scene_node *node,
|
|
enum sway_scene_descriptor_type type) {
|
|
struct scene_descriptor *desc = scene_node_get_descriptor(node, type);
|
|
if (!desc) {
|
|
return NULL;
|
|
}
|
|
|
|
return desc->data;
|
|
}
|
|
|
|
void scene_descriptor_destroy(struct wlr_scene_node *node,
|
|
enum sway_scene_descriptor_type type) {
|
|
struct scene_descriptor *desc = scene_node_get_descriptor(node, type);
|
|
if (!desc) {
|
|
return;
|
|
}
|
|
descriptor_destroy(desc);
|
|
}
|
|
|
|
static void addon_handle_destroy(struct wlr_addon *addon) {
|
|
struct scene_descriptor *desc = wl_container_of(addon, desc, addon);
|
|
descriptor_destroy(desc);
|
|
}
|
|
|
|
static const struct wlr_addon_interface addon_interface = {
|
|
.name = "sway_scene_descriptor",
|
|
.destroy = addon_handle_destroy,
|
|
};
|
|
|
|
bool scene_descriptor_assign(struct wlr_scene_node *node,
|
|
enum sway_scene_descriptor_type type, void *data) {
|
|
struct scene_descriptor *desc = calloc(1, sizeof(*desc));
|
|
if (!desc) {
|
|
sway_log(SWAY_ERROR, "Could not allocate a scene descriptor");
|
|
return false;
|
|
}
|
|
|
|
wlr_addon_init(&desc->addon, &node->addons, (void *)type, &addon_interface);
|
|
desc->data = data;
|
|
return true;
|
|
}
|