mirror of
https://github.com/labwc/labwc.git
synced 2026-04-07 08:21:20 -04:00
Centralize buffer preparation and standardize placement
This commit is contained in:
Jack Zeal
parent
90e652a8a1
commit
d80dd2470b
16 changed files with 251 additions and 431 deletions
|
|
@ -1,8 +1,10 @@
|
|||
#include <wlr/types/wlr_scene.h>
|
||||
#include "common/borderset.h"
|
||||
#include "common/mem.h"
|
||||
#include "common/macros.h"
|
||||
#include "buffer.h"
|
||||
|
||||
struct borderset * getBorders(uint32_t id, int size, int type, int bevelSize) {
|
||||
struct borderset * getBorders(uint32_t id, int size, enum border_type type, int bevelSize) {
|
||||
struct borderset * current = borderCache;
|
||||
struct borderset * last;
|
||||
while (current != NULL) {
|
||||
|
|
@ -24,7 +26,7 @@ struct borderset * getBorders(uint32_t id, int size, int type, int bevelSize) {
|
|||
return NULL;
|
||||
}
|
||||
|
||||
struct borderset * createBuffer(uint32_t id, int size, int type, int bevelSize) {
|
||||
struct borderset * createBuffer(uint32_t id, int size, enum border_type type, int bevelSize) {
|
||||
struct borderset *newBorderset = znew(*newBorderset);
|
||||
|
||||
newBorderset->next = NULL;
|
||||
|
|
@ -64,7 +66,7 @@ struct borderset * createBuffer(uint32_t id, int size, int type, int bevelSize)
|
|||
newBorderset->br = znew_n(uint32_t, size*size);
|
||||
|
||||
switch(type) {
|
||||
case 1: // Single bevel borders have 1x1 sides
|
||||
case BORDER_SINGLE: // Single bevel borders have 1x1 sides
|
||||
newBorderset->top = znew(uint32_t);
|
||||
newBorderset->left = znew(uint32_t);
|
||||
newBorderset->right = znew(uint32_t);
|
||||
|
|
@ -77,10 +79,10 @@ struct borderset * createBuffer(uint32_t id, int size, int type, int bevelSize)
|
|||
// Fill with solid
|
||||
for (int j=0; j<size;j++) {
|
||||
for (int k=0; k<size;k++) {
|
||||
newBorderset->tl[PIXELSIZED(j, k, size)] = hl32;
|
||||
newBorderset->tr[PIXELSIZED(size - 1 - j, k, size)] = (j > k) ? hl32 : ll32;
|
||||
newBorderset->bl[PIXELSIZED(size - 1 -j, k, size)] = (j > k) ? hl32 : ll32;
|
||||
newBorderset->br[PIXELSIZED(j, k, size)] = ll32;
|
||||
newBorderset->tl[PIXEL(j, k, size)] = hl32;
|
||||
newBorderset->tr[PIXEL(size - 1 - j, k, size)] = (j > k) ? hl32 : ll32;
|
||||
newBorderset->bl[PIXEL(size - 1 -j, k, size)] = (j > k) ? hl32 : ll32;
|
||||
newBorderset->br[PIXEL(j, k, size)] = ll32;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -89,7 +91,7 @@ struct borderset * createBuffer(uint32_t id, int size, int type, int bevelSize)
|
|||
break;
|
||||
|
||||
|
||||
case 2:
|
||||
case BORDER_DOUBLE:
|
||||
newBorderset->top = znew_n(uint32_t, size);
|
||||
newBorderset->left = znew_n(uint32_t, size);
|
||||
newBorderset->right = znew_n(uint32_t, size);
|
||||
|
|
@ -119,10 +121,10 @@ struct borderset * createBuffer(uint32_t id, int size, int type, int bevelSize)
|
|||
// Blank corners...
|
||||
for (int i=0; i<size;i++) {
|
||||
for (int j=0; j<size;j++) {
|
||||
newBorderset->tl[PIXELSIZED(i, j, size)] = id;
|
||||
newBorderset->tr[PIXELSIZED(i, j, size)] = id;
|
||||
newBorderset->bl[PIXELSIZED(i, j, size)] = id;
|
||||
newBorderset->br[PIXELSIZED(i, j, size)] = id;
|
||||
newBorderset->tl[PIXEL(i, j, size)] = id;
|
||||
newBorderset->tr[PIXEL(i, j, size)] = id;
|
||||
newBorderset->bl[PIXEL(i, j, size)] = id;
|
||||
newBorderset->br[PIXEL(i, j, size)] = id;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -133,25 +135,25 @@ struct borderset * createBuffer(uint32_t id, int size, int type, int bevelSize)
|
|||
// Solid bar parts
|
||||
for (int j=0; j<size; j++) {
|
||||
// Top left corner: Entire "bevel size" top rows are highlighted
|
||||
newBorderset->tl[PIXELSIZED(j, i, size)] = hl32;
|
||||
newBorderset->tl[PIXEL(j, i, size)] = hl32;
|
||||
// First "bevel size" top columns are highlighted
|
||||
newBorderset->tl[PIXELSIZED(i, j, size)] = hl32;
|
||||
newBorderset->tl[PIXEL(i, j, size)] = hl32;
|
||||
|
||||
// Bottom Right corner: Entire "bevel size" last rows are lowlight
|
||||
newBorderset->br[PIXELSIZED(j, (size-1-i), size)] = ll32;
|
||||
newBorderset->br[PIXEL(j, (size-1-i), size)] = ll32;
|
||||
// Last "bevel size" columns are lowlight
|
||||
newBorderset->br[PIXELSIZED((size-1-i), j, size)] = ll32;
|
||||
newBorderset->br[PIXEL((size-1-i), j, size)] = ll32;
|
||||
|
||||
|
||||
// Bottom left corner: Entire "bevel size" last rows are lowlight
|
||||
newBorderset->bl[PIXELSIZED(j, (size-1-i), size)] = ll32;
|
||||
newBorderset->bl[PIXEL(j, (size-1-i), size)] = ll32;
|
||||
// First "bevel size" columns are highlight, except for the bottom right corner
|
||||
newBorderset->bl[PIXELSIZED(i, j, size)] = hl32;
|
||||
newBorderset->bl[PIXEL(i, j, size)] = hl32;
|
||||
|
||||
// Top Right corner: Entire "bevel size" first rows are highlight
|
||||
newBorderset->tr[PIXELSIZED(j, i, size)] = hl32;
|
||||
newBorderset->tr[PIXEL(j, i, size)] = hl32;
|
||||
// Last "bevel size" columns are lowlight, except for the top left
|
||||
newBorderset->tr[PIXELSIZED((size-1-i), j, size)] = ll32;
|
||||
newBorderset->tr[PIXEL((size-1-i), j, size)] = ll32;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -162,27 +164,27 @@ struct borderset * createBuffer(uint32_t id, int size, int type, int bevelSize)
|
|||
// Outer Corners
|
||||
// Bottom left corner:
|
||||
// First "bevel size" columns are highlight, except for the bottom right corner
|
||||
newBorderset->bl[PIXELSIZED(i, (size - 1 - j), size)] = (j >= i) ? hl32 : ll32;
|
||||
newBorderset->bl[PIXEL(i, (size - 1 - j), size)] = (j >= i) ? hl32 : ll32;
|
||||
|
||||
// Top Right corner:
|
||||
// Last "bevel size" columns are lowlight, except for the top left
|
||||
newBorderset->tr[PIXELSIZED((size-1-i), j, size)] = (j > i) ? ll32 : hl32;
|
||||
newBorderset->tr[PIXEL((size-1-i), j, size)] = (j > i) ? ll32 : hl32;
|
||||
|
||||
|
||||
// Inner Corners
|
||||
// Top left corner: Bottom right is all dark
|
||||
newBorderset->tl[PIXELSIZED((size-1-i), (size - 1 - j), size)] = ll32;
|
||||
newBorderset->tl[PIXEL((size-1-i), (size - 1 - j), size)] = ll32;
|
||||
|
||||
// Bottom Right corner: Top left is all light
|
||||
newBorderset->br[PIXELSIZED(i, j, size)] = hl32;
|
||||
newBorderset->br[PIXEL(i, j, size)] = hl32;
|
||||
|
||||
// Top Right corner:
|
||||
// Interior bottom left is dark on top, light on bottom
|
||||
newBorderset->tr[PIXELSIZED(i, (size-1-j), size)] = (i > j) ? hl32 : ll32;
|
||||
newBorderset->tr[PIXEL(i, (size-1-j), size)] = (i > j) ? hl32 : ll32;
|
||||
|
||||
// Bottom Left corner:
|
||||
// Interior top right is dark on top, light on bottom
|
||||
newBorderset->bl[PIXELSIZED((size-1-i), j, size)] = (i > j) ? ll32 : hl32;
|
||||
newBorderset->bl[PIXEL((size-1-i), j, size)] = (i > j) ? ll32 : hl32;
|
||||
|
||||
|
||||
|
||||
|
|
@ -196,7 +198,31 @@ struct borderset * createBuffer(uint32_t id, int size, int type, int bevelSize)
|
|||
|
||||
break;
|
||||
|
||||
case 3: // Sunken Single bevel borders have 1x1 sides
|
||||
case BORDER_FLAT: // Placeholder that uses buffers but for a flat colour
|
||||
newBorderset->top = znew(uint32_t);
|
||||
newBorderset->left = znew(uint32_t);
|
||||
newBorderset->right = znew(uint32_t);
|
||||
newBorderset->bottom = znew(uint32_t);
|
||||
*newBorderset->top = id;
|
||||
*newBorderset->left = id;
|
||||
*newBorderset->right = id;
|
||||
*newBorderset->bottom = id;
|
||||
|
||||
// Fill with solid
|
||||
for (int j=0; j<size;j++) {
|
||||
for (int k=0; k<size;k++) {
|
||||
newBorderset->tl[PIXEL(j, k, size)] = id;
|
||||
newBorderset->tr[PIXEL(size - 1 - j, k, size)] = id;
|
||||
newBorderset->bl[PIXEL(size - 1 -j, k, size)] = id;
|
||||
newBorderset->br[PIXEL(j, k, size)] = id;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
break;
|
||||
|
||||
case BORDER_INSET: // Sunken Single bevel borders have 1x1 sides
|
||||
newBorderset->top = znew(uint32_t);
|
||||
newBorderset->left = znew(uint32_t);
|
||||
newBorderset->right = znew(uint32_t);
|
||||
|
|
@ -209,10 +235,10 @@ struct borderset * createBuffer(uint32_t id, int size, int type, int bevelSize)
|
|||
// Fill with solid
|
||||
for (int j=0; j<size;j++) {
|
||||
for (int k=0; k<size;k++) {
|
||||
newBorderset->tl[PIXELSIZED(j, k, size)] = ll32;
|
||||
newBorderset->tr[PIXELSIZED(size - 1 - j, k, size)] = (j > k) ? ll32 : hl32;
|
||||
newBorderset->bl[PIXELSIZED(size - 1 -j, k, size)] = (j > k) ? ll32 : hl32;
|
||||
newBorderset->br[PIXELSIZED(j, k, size)] = hl32;
|
||||
newBorderset->tl[PIXEL(j, k, size)] = ll32;
|
||||
newBorderset->tr[PIXEL(size - 1 - j, k, size)] = (j > k) ? ll32 : hl32;
|
||||
newBorderset->bl[PIXEL(size - 1 -j, k, size)] = (j > k) ? ll32 : hl32;
|
||||
newBorderset->br[PIXEL(j, k, size)] = hl32;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -224,6 +250,118 @@ struct borderset * createBuffer(uint32_t id, int size, int type, int bevelSize)
|
|||
return newBorderset;
|
||||
}
|
||||
|
||||
|
||||
struct bufferset * generateBufferset(struct wlr_scene_tree * tree, struct borderset *borderset, int bw)
|
||||
{
|
||||
struct bufferset * bufferset = znew(struct bufferset);
|
||||
|
||||
bufferset->border_width = bw;
|
||||
if (borderset->type == BORDER_DOUBLE) {
|
||||
struct lab_data_buffer *ttexture_buffer =
|
||||
buffer_create_from_data(borderset->top, 1, bw, 4);
|
||||
bufferset->top = wlr_scene_buffer_create(tree, &ttexture_buffer->base);
|
||||
|
||||
struct lab_data_buffer *ltexture_buffer =
|
||||
buffer_create_from_data(borderset->left, bw, 1, 4*bw);
|
||||
bufferset->left = wlr_scene_buffer_create(tree, <exture_buffer->base);
|
||||
|
||||
struct lab_data_buffer *rtexture_buffer =
|
||||
buffer_create_from_data(borderset->right, bw, 1, 4*bw);
|
||||
bufferset->right = wlr_scene_buffer_create(tree, &rtexture_buffer->base);
|
||||
|
||||
struct lab_data_buffer *btexture_buffer =
|
||||
buffer_create_from_data(borderset->bottom, 1, bw, 4);
|
||||
bufferset->bottom = wlr_scene_buffer_create(tree, &btexture_buffer->base);
|
||||
|
||||
|
||||
} else {
|
||||
struct lab_data_buffer *ttexture_buffer =
|
||||
buffer_create_from_data(borderset->top, 1, 1, 4);
|
||||
bufferset->top = wlr_scene_buffer_create(tree, &ttexture_buffer->base);
|
||||
|
||||
struct lab_data_buffer *ltexture_buffer =
|
||||
buffer_create_from_data(borderset->left, 1, 1, 4);
|
||||
bufferset->left = wlr_scene_buffer_create(tree, <exture_buffer->base);
|
||||
|
||||
struct lab_data_buffer *rtexture_buffer =
|
||||
buffer_create_from_data(borderset->right, 1, 1, 4);
|
||||
bufferset->right = wlr_scene_buffer_create(tree, &rtexture_buffer->base);
|
||||
|
||||
struct lab_data_buffer *btexture_buffer =
|
||||
buffer_create_from_data(borderset->bottom, 1, 1, 4);
|
||||
bufferset->bottom = wlr_scene_buffer_create(tree, &btexture_buffer->base);
|
||||
}
|
||||
|
||||
|
||||
struct lab_data_buffer *tltexture_buffer =
|
||||
buffer_create_from_data(borderset->tl, bw, bw, 4*bw);
|
||||
bufferset->tl = wlr_scene_buffer_create(tree, &tltexture_buffer->base);
|
||||
|
||||
|
||||
struct lab_data_buffer *trtexture_buffer =
|
||||
buffer_create_from_data(borderset->tr, bw, bw, 4*bw);
|
||||
bufferset->tr = wlr_scene_buffer_create(tree, &trtexture_buffer->base);
|
||||
|
||||
|
||||
struct lab_data_buffer *bltexture_buffer =
|
||||
buffer_create_from_data(borderset->bl, bw, bw, 4*bw);
|
||||
bufferset->bl = wlr_scene_buffer_create(tree, &bltexture_buffer->base);
|
||||
|
||||
struct lab_data_buffer *brtexture_buffer =
|
||||
buffer_create_from_data(borderset->br, bw, bw, 4*bw);
|
||||
bufferset->br = wlr_scene_buffer_create(tree, &brtexture_buffer->base);
|
||||
|
||||
return bufferset;
|
||||
}
|
||||
|
||||
void renderBufferset(struct bufferset *bufferset, int width, int height, int y)
|
||||
{
|
||||
|
||||
wlr_scene_buffer_set_dest_size(bufferset->top,
|
||||
width - 2 * bufferset->border_width, bufferset->border_width);
|
||||
wlr_scene_node_set_position(&bufferset->top->node,
|
||||
bufferset->border_width,y);
|
||||
|
||||
wlr_scene_buffer_set_dest_size(bufferset->bottom,
|
||||
width - 2 * bufferset->border_width, bufferset->border_width);
|
||||
wlr_scene_node_set_position(&bufferset->bottom->node,
|
||||
bufferset->border_width, y+height - bufferset->border_width);
|
||||
|
||||
|
||||
wlr_scene_buffer_set_dest_size(bufferset->left,
|
||||
bufferset->border_width, height - bufferset->border_width * 2);
|
||||
wlr_scene_node_set_position(&bufferset->left->node,
|
||||
0, bufferset->border_width+y);
|
||||
|
||||
wlr_scene_buffer_set_dest_size(bufferset->right,
|
||||
bufferset->border_width, height - bufferset->border_width * 2);
|
||||
wlr_scene_node_set_position(&bufferset->right->node,
|
||||
width - bufferset->border_width, y+ bufferset->border_width);
|
||||
|
||||
wlr_scene_buffer_set_dest_size(bufferset->tl,
|
||||
bufferset->border_width, bufferset->border_width);
|
||||
wlr_scene_node_set_position(&bufferset->tl->node,
|
||||
0,y);
|
||||
|
||||
wlr_scene_buffer_set_dest_size(bufferset->tr,
|
||||
bufferset->border_width, bufferset->border_width);
|
||||
wlr_scene_node_set_position(&bufferset->tr->node,
|
||||
width-bufferset->border_width, y);
|
||||
|
||||
|
||||
wlr_scene_buffer_set_dest_size(bufferset->br,
|
||||
bufferset->border_width, bufferset->border_width);
|
||||
wlr_scene_node_set_position(&bufferset->br->node,
|
||||
width-bufferset->border_width , y+height-bufferset->border_width);
|
||||
|
||||
|
||||
wlr_scene_buffer_set_dest_size(bufferset->bl,
|
||||
bufferset->border_width, bufferset->border_width);
|
||||
wlr_scene_node_set_position(&bufferset->bl->node,
|
||||
0, height-bufferset->border_width+y);
|
||||
|
||||
}
|
||||
|
||||
void clearBorderCache(struct borderset * borderset)
|
||||
{
|
||||
if (borderset == NULL)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue