Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Perfomance: Font cache, color cache, increase MAX_LINE_LEN #60

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Perfomance: Font cache, color cache, increase MAX_LINE_LEN #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4e9ccf
feature: alloc big 256k MAX_LINE_LEN
osv Sep 8, 2024
e826647
Feature: cache for colors and fonts
osv Sep 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 96 additions & 21 deletions draw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ textnw(Fnt *font, const char *text, unsigned int len) {
}
return XTextWidth(font->xfont, text, len);
#else
XftTextExtentsUtf8(dzen.dpy, dzen.font.xftfont, (unsigned const char *) text, strlen(text), dzen.font.extents);
if(dzen.font.extents->height > dzen.font.height)
dzen.font.height = dzen.font.extents->height;
return dzen.font.extents->xOff;
XftTextExtentsUtf8(dzen.dpy, dzen.font.xftfont, (unsigned const char *) text, strlen(text), &dzen.font.extents);
if(dzen.font.extents.height > dzen.font.height)
dzen.font.height = dzen.font.extents.height;
return dzen.font.extents.xOff;
#endif
}

Expand All @@ -104,17 +104,88 @@ drawtext(const char *text, int reverse, int line, int align) {
parse_line(text, line, align, reverse, 0);
}

long
getcolor(const char *colstr) {
Colormap cmap = DefaultColormap(dzen.dpy, dzen.screen);
XColor color;
/* Shared cache structure */
typedef struct Cache {
char *key;
void *value;
struct Cache *next;
} Cache;

Cache *font_cache = NULL;
Cache *color_cache = NULL;

void* get_cached_value(Cache **cache, const char *key) {
Cache *current = *cache;
while (current) {
if (strcmp(current->key, key) == 0) {
return current->value;
}
current = current->next;
}
return NULL;
}

void add_to_cache(Cache **cache, const char *key, void *value) {
Cache *new_entry = malloc(sizeof(Cache));
new_entry->key = strdup(key);
new_entry->value = value;
new_entry->next = *cache;
*cache = new_entry;
}

if(!XAllocNamedColor(dzen.dpy, cmap, colstr, &color, &color))
XftFont* get_cached_font(Display *display, int screen, const char *font_name) {
XftFont *font = get_cached_value(&font_cache, font_name);
if (!font) {
font = XftFontOpenName(display, screen, font_name);
if (font) {
add_to_cache(&font_cache, font_name, font);
}
}
return font;
}

long get_cached_color(Display *display, int screen, const char *colstr) {
long *cached_color = get_cached_value(&color_cache, colstr);
if (cached_color) {
return *cached_color;
}

Colormap cmap = DefaultColormap(display, screen);
XColor color;
if (!XAllocNamedColor(display, cmap, colstr, &color, &color)) {
return -1;
}

long *color_value = malloc(sizeof(long));
*color_value = color.pixel;
add_to_cache(&color_cache, colstr, color_value);

return color.pixel;
}

long
getcolor(const char *colstr) {
return get_cached_color(dzen.dpy, dzen.screen, colstr);
}

void free_cache(Cache **cache) {
Cache *current = *cache;
while (current) {
Cache *next = current->next;
free(current->key);
free(current->value);
free(current);
current = next;
}
*cache = NULL;
}

/* Free all caches before exiting, TODO: when I can call this? */
void free_all_caches() {
free_cache(&font_cache);
free_cache(&color_cache);
}

void
setfont(const char *fontstr) {
#ifndef DZEN_XFT
Expand Down Expand Up @@ -155,21 +226,19 @@ setfont(const char *fontstr) {
}
dzen.font.height = dzen.font.ascent + dzen.font.descent;
#else
if(dzen.font.xftfont)
XftFontClose(dzen.dpy, dzen.font.xftfont);
dzen.font.xftfont = XftFontOpenXlfd(dzen.dpy, dzen.screen, fontstr);
if(!dzen.font.xftfont)
dzen.font.xftfont = XftFontOpenName(dzen.dpy, dzen.screen, fontstr);
if(!dzen.font.xftfont)
eprint("error, cannot load font: '%s'\n", fontstr);
dzen.font.extents = malloc(sizeof(XGlyphInfo));
XftTextExtentsUtf8(dzen.dpy, dzen.font.xftfont, (unsigned const char *) fontstr, strlen(fontstr), dzen.font.extents);
if (dzen.font.xftfont)
XftFontClose(dzen.dpy, dzen.font.xftfont);

dzen.font.xftfont = get_cached_font(dzen.dpy, dzen.screen, fontstr);
if (!dzen.font.xftfont)
eprint("error, cannot load font: '%s'\n", fontstr);

XftTextExtentsUtf8(dzen.dpy, dzen.font.xftfont, (unsigned const char *) fontstr, strlen(fontstr), &dzen.font.extents);
dzen.font.height = dzen.font.xftfont->ascent + dzen.font.xftfont->descent;
dzen.font.width = (dzen.font.extents->width)/strlen(fontstr);
dzen.font.width = (dzen.font.extents.width) / strlen(fontstr);
#endif
}


int
get_tokval(const char* line, char **retdata) {
int i;
Expand Down Expand Up @@ -375,7 +444,13 @@ parse_line(const char *line, int lnr, int align, int reverse, int nodraw) {
int max_y=-1;

/* temp buffers */
char lbuf[MAX_LINE_LEN], *rbuf = NULL;
char *rbuf = NULL;
static char *lbuf = NULL;
/* Allocate lbuf once, if not already allocated. I dont care about free before prog terminate */
if (lbuf == NULL) {
lbuf = emalloc(MAX_LINE_LEN);
lbuf[0] = '\0';
}

/* parser state */
int t=-1, nobg=0;
Expand Down
7 changes: 4 additions & 3 deletions dzen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@
#define SLAVEWINDOW 1

#define MIN_BUF_SIZE 1024
#define MAX_LINE_LEN 8192

#ifndef MAX_LINE_LEN
#define MAX_LINE_LEN 262144
#endif
#define MAX_CLICKABLE_AREAS 256

#ifndef Button6
Expand Down Expand Up @@ -58,7 +59,7 @@ struct Fnt {
int height;
#ifdef DZEN_XFT
XftFont *xftfont;
XGlyphInfo *extents;
XGlyphInfo extents;
int width;
#endif
};
Expand Down