Centralize buffer preparation and standardize placement

This commit is contained in:
Jack Zeal 2026-03-28 09:01:21 -07:00
parent 90e652a8a1
commit d80dd2470b
16 changed files with 251 additions and 431 deletions

View file

@ -3,10 +3,14 @@
#ifndef LABWC_BORDERSET_H
#define LABWC_BORDERSET_H
enum border_type {
BORDER_FLAT, BORDER_SINGLE, BORDER_DOUBLE, BORDER_INSET
};
struct borderset {
uint32_t id; // Base colour, but could be used as a tracking hash for images or whatever in the future
int size; // width (since I suspect a 2px border scaled up to 20px might look weird)
int type; // Single or double bevel
enum border_type type; // Single or double bevel
uint32_t * top;
uint32_t * left;
uint32_t * right;
@ -18,12 +22,29 @@ struct borderset {
struct borderset * next;
};
struct bufferset {
enum border_type type;
int border_width;
struct wlr_scene_buffer * top;
struct wlr_scene_buffer * left;
struct wlr_scene_buffer * right;
struct wlr_scene_buffer * bottom;
struct wlr_scene_buffer * tl;
struct wlr_scene_buffer * tr;
struct wlr_scene_buffer * bl;
struct wlr_scene_buffer * br;
};
extern struct borderset * borderCache;
struct borderset * getBorders(uint32_t id, int size, int type, int bevelSize);
struct borderset * getBorders(uint32_t id, int size, enum border_type, int bevelSize);
struct borderset * createBuffer(uint32_t id, int size, int type, int bevelSize);
struct borderset * createBuffer(uint32_t id, int size, enum border_type, int bevelSize);
struct bufferset * generateBufferset(struct wlr_scene_tree * tree, struct borderset *borderset, int bw);
void renderBufferset(struct bufferset *, int width, int height, int y);
void clearBorderCache(struct borderset *borderset);

View file

@ -12,7 +12,7 @@ struct lab_scene_rect_options {
float *bg_color; /* can be NULL */
int width;
int height;
int beveled;
bool beveled;
};
struct lab_scene_rect {

View file

@ -74,8 +74,6 @@
* Assumes "bw" was defined externally
*/
#define PIXEL(x, y) (bw * y + x)
#define PIXELSIZED(x, y, size) (size * y + x)
#define PIXEL(x, y, size) (size * y + x)
#endif /* LABWC_MACROS_H */

View file

@ -115,8 +115,7 @@ struct ssd {
struct ssd_border_subtree {
struct wlr_scene_tree *tree;
struct wlr_scene_rect *top, *bottom, *left, *right;
struct wlr_scene_buffer *tlcorner, *trcorner, *blcorner, *brcorner,
*ttexture, *btexture, *ltexture, *rtexture;
struct bufferset * texturedBorders;
} subtrees[2]; /* indexed by enum ssd_active_state */
} border;

View file

@ -244,7 +244,7 @@ struct view {
int width, height;
struct wlr_scene_tree *tree;
struct wlr_scene_rect *border;
struct wlr_scene_buffer *top, *left, *right, *bottom, *tl, *tr, *bl, *br;
struct bufferset * texturedBorders;
struct wlr_scene_rect *background;
struct scaled_font_buffer *text;
} resize_indicator;