mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-19 06:46:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: use data to find sway_layer_surface

Browse source
This commit is contained in:
ShootingStarDragons 2024-02-17 21:50:39 +08:00 • committed by Access
parent e236ea4d1b
commit 329c2a74e9
2 changed files with 4 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sway/desktop/layer_shell.c
View file

@ -137,6 +137,7 @@ static struct sway_layer_surface *sway_layer_surface_create(
surface->scene = scene; surface->scene = scene;
surface->layer_surface = scene->layer_surface; surface->layer_surface = scene->layer_surface;
surface->popups = popups; surface->popups = popups;
surface->layer_surface->data = surface;
return surface; return surface;
} }
@ -210,6 +211,8 @@ static void handle_node_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&layer->node_destroy.link); wl_list_remove(&layer->node_destroy.link);
wl_list_remove(&layer->output_destroy.link); wl_list_remove(&layer->output_destroy.link);
layer->layer_surface->data = NULL;
free(layer); free(layer);
} }

42
sway/input/text_input.c
View file

@ -267,46 +267,6 @@ static void relay_handle_text_input(struct wl_listener *listener,
sway_text_input_create(relay, wlr_text_input); sway_text_input_create(relay, wlr_text_input);
} }
static struct sway_layer_surface *loop_layer_surface(struct wl_list children,
struct wlr_layer_surface_v1 *layer)
{
struct wlr_scene_node *node;
wl_list_for_each (node, &children, link) {
struct sway_layer_surface *surface = scene_descriptor_try_get(node,
SWAY_SCENE_DESC_LAYER_SHELL);
if (!surface) {
continue;
}
if (surface->layer_surface == layer) {
return surface;
}
}
return NULL;
}
static struct sway_layer_surface *find_layer_by_surface(
struct wlr_layer_surface_v1 *layer) {
for (int i = 0; i < root->outputs->length; ++i) {
struct sway_output *output = root->outputs->items[i];
// For now we'll only check the overlay, top layer and bottom layer
struct sway_layer_surface *surface;
surface = loop_layer_surface(output->layers.shell_top->children, layer);
if (surface != NULL) {
return surface;
}
surface = loop_layer_surface(output->layers.shell_overlay->children, layer);
if (surface != NULL) {
return surface;
}
surface = loop_layer_surface(output->layers.shell_bottom->children, layer);
if (surface != NULL) {
return surface;
}
}
return NULL;
}
static void input_popup_update(struct sway_input_popup *popup) { static void input_popup_update(struct sway_input_popup *popup) {
struct sway_text_input *text_input = struct sway_text_input *text_input =
relay_get_focused_text_input(popup->relay); relay_get_focused_text_input(popup->relay);
@ -338,7 +298,7 @@ static void input_popup_update(struct sway_input_popup *popup) {
struct wlr_scene_tree *relative; struct wlr_scene_tree *relative;
if (layer_surface != NULL) { if (layer_surface != NULL) {
struct sway_layer_surface *layer = struct sway_layer_surface *layer =
find_layer_by_surface(layer_surface); layer_surface->data;
if (layer == NULL) { if (layer == NULL) {
return; return;
} }