mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add node-descriptor for wlr_scene_nodes

Browse source 
Support identification of wlr_scene_node role to enable simplification
of codebase including the avoidance of iterating over lists of
layer-surface, menuitems, and so on.

Use node-descriptors for xdg toplevels and popups
This commit is contained in:
Johan Malm 2022-02-25 22:31:24 +00:00
parent 4c981b845f
commit 2891ff245e
7 changed files with 92 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/desktop.c
View file

@ -3,6 +3,7 @@
#include <assert.h>
#include "labwc.h"
#include "layers.h"
#include "node-descriptor.h"
#include "ssd.h"
static void
@ -285,7 +286,21 @@ desktop_node_and_view_at(struct server *server, double lx, double ly,
}
struct wlr_scene_node *osd = &server->osd_tree->node;
struct wlr_scene_node *menu = &server->menu_tree->node;
while (node && !node->data) {
while (node) {
struct node_descriptor *desc = node->data;
if (desc) {
if (desc->type == LAB_NODE_DESC_VIEW) {
goto has_view_data;
}
if (desc->type == LAB_NODE_DESC_XDG_POPUP) {
goto has_view_data;
}
if (desc->type == LAB_NODE_DESC_LAYER_POPUP) {
/* FIXME: we shouldn't have to set *view_area */
*view_area = LAB_SSD_LAYER_SURFACE;
return NULL;
}
}
if (node == osd) {
*view_area = LAB_SSD_OSD;
return NULL;
@ -297,10 +312,13 @@ desktop_node_and_view_at(struct server *server, double lx, double ly,
}
if (!node) {
wlr_log(WLR_ERROR, "Unknown node detected");
*view_area = LAB_SSD_NONE;
return NULL;
}
struct view *view = node->data;
*view_area = LAB_SSD_NONE;
return NULL;
has_view_data:
struct node_descriptor *desc = node->data;
struct view *view = desc->data;
*view_area = ssd_get_part_type(view, *scene_node);
return view;
}