mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-07 08:21:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use cache for title bar double beveled borders

Browse source
This commit is contained in:
Jack Zeal 2026-03-27 20:57:28 -07:00
parent 2a0ff0d5b4
commit 536847cb5b
5 changed files with 143 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

127
src/common/borderset.c
View file

@ -2,8 +2,7 @@
#include "common/mem.h"
#include "common/macros.h"
struct borderset * getBorders(uint32_t id, int size, int type) {
struct borderset * getBorders(uint32_t id, int size, int type, int bevelSize) {
struct borderset * current = borderCache;
struct borderset * last;
while (current != NULL) {
@ -16,16 +15,16 @@ struct borderset * getBorders(uint32_t id, int size, int type) {
// Fall through, we need to create a buffer.
if (borderCache == NULL) {
borderCache = createBuffer(id, size, type);
borderCache = createBuffer(id, size, type, bevelSize);
return borderCache;
} else {
last->next = createBuffer(id, size, type);
last->next = createBuffer(id, size, type, bevelSize);
return last->next;
}
return NULL;
}
struct borderset * createBuffer(uint32_t id, int size, int type) {
struct borderset * createBuffer(uint32_t id, int size, int type, int bevelSize) {
struct borderset *newBorderset = znew(*newBorderset);
newBorderset->next = NULL;
@ -57,17 +56,19 @@ struct borderset * createBuffer(uint32_t id, int size, int type) {
uint32_t ll32 = ((uint32_t)a << 24) | ((uint32_t)r0 << 16)
| ((uint32_t)g0 << 8) | (uint32_t)b0;
// All borders have NxN corners
newBorderset->tl = znew_n(uint32_t, size*size);
newBorderset->tr = znew_n(uint32_t, size*size);
newBorderset->bl = znew_n(uint32_t, size*size);
newBorderset->br = znew_n(uint32_t, size*size);
newBorderset->top = znew(uint32_t);
newBorderset->left = znew(uint32_t);
newBorderset->right = znew(uint32_t);
newBorderset->bottom = znew(uint32_t);
switch(type) {
case 1:
case 1: // Single bevel borders have 1x1 sides
newBorderset->top = znew(uint32_t);
newBorderset->left = znew(uint32_t);
newBorderset->right = znew(uint32_t);
newBorderset->bottom = znew(uint32_t);
*newBorderset->top = hl32;
*newBorderset->left = hl32;
*newBorderset->right = ll32;
@ -89,6 +90,109 @@ struct borderset * createBuffer(uint32_t id, int size, int type) {
case 2:
newBorderset->top = znew_n(uint32_t, size);
newBorderset->left = znew_n(uint32_t, size);
newBorderset->right = znew_n(uint32_t, size);
newBorderset->bottom = znew_n(uint32_t, size);
for (int i = 0; i < size; i++) {
if (i<bevelSize) {
newBorderset->left[i] = hl32;
newBorderset->top[i] = hl32;
newBorderset->right[i] = hl32;
newBorderset->bottom[i] = hl32;
} else if (i > (size-bevelSize-1)) {
newBorderset->left[i] = ll32;
newBorderset->top[i] = ll32;
newBorderset->right[i] = ll32;
newBorderset->bottom[i] = ll32;
} else {
newBorderset->left[i] = id;
newBorderset->top[i] = id;
newBorderset->right[i] = id;
newBorderset->bottom[i] = id;
}
}
// 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;
}
}
// Main Corners
for (int i=0; i < bevelSize; i++) {
// 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;
// First "bevel size" top columns are highlighted
newBorderset->tl[PIXELSIZED(i, j, size)] = hl32;
// Bottom Right corner: Entire "bevel size" last rows are lowlight
newBorderset->br[PIXELSIZED(j, (size-1-i), size)] = ll32;
// Last "bevel size" columns are lowlight
newBorderset->br[PIXELSIZED((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;
// First "bevel size" columns are highlight, except for the bottom right corner
newBorderset->bl[PIXELSIZED(i, j, size)] = hl32;
// Top Right corner: Entire "bevel size" first rows are highlight
newBorderset->tr[PIXELSIZED(j, i, size)] = hl32;
// Last "bevel size" columns are lowlight, except for the top left
newBorderset->tr[PIXELSIZED((size-1-i), j, size)] = ll32;
}
}
// Beveled Corner Parts
for (int i=0; i < bevelSize; i++) {
for (int j=0; j<bevelSize; j++) {
// 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;
// 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;
// Inner Corners
// Top left corner: Bottom right is all dark
newBorderset->tl[PIXELSIZED((size-1-i), (size - 1 - j), size)] = ll32;
// Bottom Right corner: Top left is all light
newBorderset->br[PIXELSIZED(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;
// 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;
}
}
break;
@ -103,6 +207,7 @@ void clearBorderCache(struct borderset * borderset)
if (borderset->next != NULL) {
clearBorderCache(borderset->next);
}
free(borderset->top);
free(borderset->left);
free(borderset->right);