mirror of
https://github.com/labwc/labwc.git
synced 2026-02-17 22:05:30 -05:00
ssd: unify struct ssd_part with struct node_descriptor
struct ssd_part and struct node_descriptor seem to have essentially the same purpose: tag a wlr_scene_node with some extra data indicating what we're using it for. Also, as with enum ssd_part_type (now lab_node_type), ssd_part is used for several types of nodes that are not part of SSD. So instead of the current chaining (node_descriptor -> ssd_part), let's flatten/unify the two structs. In detail: - First, merge node_descriptor_type into lab_node_type. - Add a separate view pointer in node_descriptor, since in the case of SSD buttons we need separate view and button data pointers. - Rename ssd_part_button to simply ssd_button. It no longer contains an ssd_part as base. - Add node_try_ssd_button_from_node() which replaces node_ssd_part_from_node() + button_try_from_ssd_part(). - Factor out ssd_button_free() to be called in node descriptor destroy. - Finally, get_cursor_context() needs a little reorganization to handle the unified structs. Overall, this simplifies the code a bit, and in my opinion makes it easier to understand. No functional change intended.
This commit is contained in:
John Lindgren
parent
ba426e2271
commit
f129571779
22 changed files with 169 additions and 239 deletions
|
|
@ -46,12 +46,23 @@ enum lab_node_type {
|
|||
LAB_NODE_CLIENT,
|
||||
LAB_NODE_FRAME,
|
||||
LAB_NODE_ROOT,
|
||||
LAB_NODE_MENU,
|
||||
LAB_NODE_MENUITEM,
|
||||
LAB_NODE_OSD,
|
||||
LAB_NODE_LAYER_SURFACE,
|
||||
LAB_NODE_LAYER_SUBSURFACE,
|
||||
LAB_NODE_UNMANAGED,
|
||||
LAB_NODE_ALL,
|
||||
|
||||
/* translated to LAB_NODE_CLIENT by get_cursor_context() */
|
||||
LAB_NODE_VIEW,
|
||||
LAB_NODE_XDG_POPUP,
|
||||
LAB_NODE_LAYER_POPUP,
|
||||
LAB_NODE_SESSION_LOCK_SURFACE,
|
||||
LAB_NODE_IME_POPUP,
|
||||
|
||||
/* never returned by get_cursor_context() */
|
||||
LAB_NODE_TREE,
|
||||
LAB_NODE_SCALED_BUFFER,
|
||||
};
|
||||
|
||||
enum lab_node_type node_type_parse(const char *context);
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ struct server {
|
|||
*/
|
||||
struct view *active_view;
|
||||
|
||||
struct ssd_part_button *hovered_button;
|
||||
struct ssd_button *hovered_button;
|
||||
|
||||
/* Tree for all non-layer xdg/xwayland-shell surfaces */
|
||||
struct wlr_scene_tree *view_tree;
|
||||
|
|
|
|||
|
|
@ -2,30 +2,11 @@
|
|||
#ifndef LABWC_NODE_DESCRIPTOR_H
|
||||
#define LABWC_NODE_DESCRIPTOR_H
|
||||
#include <wlr/types/wlr_scene.h>
|
||||
|
||||
struct view;
|
||||
struct lab_layer_surface;
|
||||
struct lab_layer_popup;
|
||||
struct menuitem;
|
||||
struct ssd_part;
|
||||
struct scaled_buffer;
|
||||
|
||||
enum node_descriptor_type {
|
||||
LAB_NODE_DESC_NODE = 0,
|
||||
LAB_NODE_DESC_VIEW,
|
||||
LAB_NODE_DESC_XDG_POPUP,
|
||||
LAB_NODE_DESC_LAYER_SURFACE,
|
||||
LAB_NODE_DESC_LAYER_POPUP,
|
||||
LAB_NODE_DESC_SESSION_LOCK_SURFACE,
|
||||
LAB_NODE_DESC_IME_POPUP,
|
||||
LAB_NODE_DESC_MENUITEM,
|
||||
LAB_NODE_DESC_TREE,
|
||||
LAB_NODE_DESC_SCALED_BUFFER,
|
||||
LAB_NODE_DESC_SSD_PART,
|
||||
};
|
||||
#include "common/node-type.h"
|
||||
|
||||
struct node_descriptor {
|
||||
enum node_descriptor_type type;
|
||||
enum lab_node_type type;
|
||||
struct view *view;
|
||||
void *data;
|
||||
struct wl_listener destroy;
|
||||
};
|
||||
|
|
@ -38,16 +19,15 @@ struct node_descriptor {
|
|||
*
|
||||
* @scene_node: wlr_scene_node to attached node_descriptor to
|
||||
* @type: node descriptor type
|
||||
* @view: associated view
|
||||
* @data: struct to point to as follows:
|
||||
* - LAB_NODE_DESC_VIEW struct view
|
||||
* - LAB_NODE_DESC_XDG_POPUP struct view
|
||||
* - LAB_NODE_DESC_LAYER_SURFACE struct lab_layer_surface
|
||||
* - LAB_NODE_DESC_LAYER_POPUP struct lab_layer_popup
|
||||
* - LAB_NODE_DESC_MENUITEM struct menuitem
|
||||
* - LAB_NODE_DESC_SSD_PART struct ssd_part
|
||||
* - LAB_NODE_LAYER_SURFACE struct lab_layer_surface
|
||||
* - LAB_NODE_LAYER_POPUP struct lab_layer_popup
|
||||
* - LAB_NODE_MENUITEM struct menuitem
|
||||
* - LAB_NODE_BUTTON_* struct ssd_button
|
||||
*/
|
||||
void node_descriptor_create(struct wlr_scene_node *scene_node,
|
||||
enum node_descriptor_type type, void *data);
|
||||
enum lab_node_type type, struct view *view, void *data);
|
||||
|
||||
/**
|
||||
* node_view_from_node - return view struct from node
|
||||
|
|
@ -76,13 +56,6 @@ struct lab_layer_popup *node_layer_popup_from_node(
|
|||
struct menuitem *node_menuitem_from_node(
|
||||
struct wlr_scene_node *wlr_scene_node);
|
||||
|
||||
/**
|
||||
* node_ssd_part_from_node - return ssd_part struct from node
|
||||
* @wlr_scene_node: wlr_scene_node from which to return data
|
||||
*/
|
||||
struct ssd_part *node_ssd_part_from_node(
|
||||
struct wlr_scene_node *wlr_scene_node);
|
||||
|
||||
/**
|
||||
* node_scaled_buffer_from_node - return scaled_buffer from node
|
||||
* @wlr_scene_node: wlr_scene_node from which to return data
|
||||
|
|
@ -90,4 +63,11 @@ struct ssd_part *node_ssd_part_from_node(
|
|||
struct scaled_buffer *node_scaled_buffer_from_node(
|
||||
struct wlr_scene_node *wlr_scene_node);
|
||||
|
||||
/**
|
||||
* node_try_ssd_button_from_node - return ssd_button or NULL from node
|
||||
* @wlr_scene_node: wlr_scene_node from which to return data
|
||||
*/
|
||||
struct ssd_button *node_try_ssd_button_from_node(
|
||||
struct wlr_scene_node *wlr_scene_node);
|
||||
|
||||
#endif /* LABWC_NODE_DESCRIPTOR_H */
|
||||
|
|
|
|||
|
|
@ -135,23 +135,10 @@ struct ssd {
|
|||
struct border margin;
|
||||
};
|
||||
|
||||
/*
|
||||
* ssd_part wraps a scene-node with ssd-specific information and can be
|
||||
* accessed with node_ssd_part_from_node(wlr_scene_node *).
|
||||
* This allows get_cursor_context() in desktop.c to see which SSD part is under
|
||||
* the cursor.
|
||||
*/
|
||||
struct ssd_part {
|
||||
enum lab_node_type type;
|
||||
struct view *view;
|
||||
|
||||
/* This part represented in scene graph */
|
||||
struct ssd_button {
|
||||
struct wlr_scene_node *node;
|
||||
struct wl_listener node_destroy;
|
||||
};
|
||||
enum lab_node_type type;
|
||||
|
||||
struct ssd_part_button {
|
||||
struct ssd_part base;
|
||||
/*
|
||||
* Bitmap of lab_button_state that represents a combination of
|
||||
* hover/toggled/rounded states.
|
||||
|
|
@ -177,13 +164,10 @@ struct wlr_buffer;
|
|||
struct wlr_scene_tree;
|
||||
|
||||
/* SSD internal helpers to create various SSD elements */
|
||||
struct ssd_part *attach_ssd_part(enum lab_node_type type, struct view *view,
|
||||
struct wlr_scene_node *node);
|
||||
struct ssd_part_button *attach_ssd_part_button(struct wl_list *button_parts,
|
||||
struct ssd_button *attach_ssd_button(struct wl_list *button_parts,
|
||||
enum lab_node_type type, struct wlr_scene_tree *parent,
|
||||
struct lab_img *imgs[LAB_BS_ALL + 1], int x, int y,
|
||||
struct view *view);
|
||||
struct ssd_part_button *button_try_from_ssd_part(struct ssd_part *part);
|
||||
|
||||
/* SSD internal */
|
||||
void ssd_titlebar_create(struct ssd *ssd);
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ struct wlr_cursor;
|
|||
/* Forward declare arguments */
|
||||
struct server;
|
||||
struct ssd;
|
||||
struct ssd_part;
|
||||
struct ssd_button;
|
||||
struct view;
|
||||
struct wlr_scene;
|
||||
struct wlr_scene_node;
|
||||
|
|
@ -55,8 +55,7 @@ void ssd_enable_shade(struct ssd *ssd, bool enable);
|
|||
void ssd_update_hovered_button(struct server *server,
|
||||
struct wlr_scene_node *node);
|
||||
|
||||
enum lab_node_type ssd_part_get_type(const struct ssd_part *part);
|
||||
struct view *ssd_part_get_view(const struct ssd_part *part);
|
||||
void ssd_button_free(struct ssd_button *button);
|
||||
|
||||
/* Public SSD helpers */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue