Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-04 13:08:31 +00:00
Code Issues Releases Activity

colours: cache X11 pixel values

Browse Source 
now that we allocate these as-needed when converting colours to the X11 representation, we need to avoid reallocating the same colour over and over; cache them so we only allocate each colour once
This commit is contained in:
bi4k8 2023-03-04 15:45:11 +00:00 committed by Brenden Matthews
parent 91faa5ad67
commit 8f0a21bcc0
2 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/colours.cc
View File

@ -31,6 +31,10 @@
#include "logging.h"
#include "x11-color.h"
#ifdef BUILD_X11
std::unordered_map<Colour, unsigned long, Colour::Hash> Colour::x11_pixels;
#endif /* BUILD_X11 */
static int hex_nibble_value(char c) {
if (c >= '0' && c <= '9') {
return c - '0';

38
src/colours.h
View File

@ -33,6 +33,7 @@
#include <climits>
#include <memory>
#include <string>
#include <unordered_map>
#ifdef BUILD_X11
#include "x11.h"
#endif /* BUILD_X11 */
@ -51,7 +52,7 @@ struct Colour {
}
// Express the color as a 32-bit ARGB integer (alpha in MSB).
uint32_t to_argb32(void) {
uint32_t to_argb32(void) const {
uint32_t out;
out = alpha << 24 | red << 16 | green << 8 | blue;
return out;
@ -61,6 +62,12 @@ struct Colour {
static Colour from_argb32(uint32_t argb);
#ifdef BUILD_X11
class Hash {
public:
size_t operator()(const Colour &c) const { return c.to_argb32(); }
};
static std::unordered_map<Colour, unsigned long, Hash> x11_pixels;
unsigned long to_x11_color(Display *display, int screen,
bool premultiply = false) {
if (display == nullptr) {
@ -68,16 +75,29 @@ struct Colour {
return 0;
}
XColor xcolor{};
xcolor.red = red * 257;
xcolor.green = green * 257;
xcolor.blue = blue * 257;
if (XAllocColor(display, DefaultColormap(display, screen), &xcolor) == 0) {
// NORM_ERR("can't allocate X color");
return 0;
unsigned long pixel;
/* Either get a cached X11 pixel or allocate one */
if (auto pixel_iter = x11_pixels.find(*this);
pixel_iter != x11_pixels.end()) {
pixel = pixel_iter->second;
} else {
XColor xcolor{};
xcolor.red = red * 257;
xcolor.green = green * 257;
xcolor.blue = blue * 257;
if (XAllocColor(display, DefaultColormap(display, screen), &xcolor) ==
0) {
// NORM_ERR("can't allocate X color");
return 0;
}
/* Save pixel value in the cache to avoid reallocating it */
x11_pixels[*this] = xcolor.pixel;
pixel = static_cast<unsigned long>(xcolor.pixel);
}
unsigned long pixel = static_cast<unsigned long>(xcolor.pixel) & 0xffffff;
pixel &= 0xffffff;
#ifdef BUILD_ARGB
if (have_argb_visual) {
if (premultiply)