Skip to content

⚡ Bolt: Cache XftDraw in Drw struct #168

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Draft
google-labs-jules wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

⚡ Bolt: Cache XftDraw in Drw struct #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions drw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ Drw *drw_create(Display *dpy, int screen, Window root, unsigned int w,
drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
drw->gc = XCreateGC(dpy, root, 0, NULL);
XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
drw->xftdraw = XftDrawCreate(dpy, drw->drawable, DefaultVisual(dpy, screen),
DefaultColormap(dpy, screen));

return drw;
}
Expand All @@ -96,11 +98,20 @@ void drw_resize(Drw *drw, unsigned int w, unsigned int h) {
}
drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h,
DefaultDepth(drw->dpy, drw->screen));
if (drw->xftdraw) {
XftDrawDestroy(drw->xftdraw);
}
drw->xftdraw = XftDrawCreate(drw->dpy, drw->drawable,
DefaultVisual(drw->dpy, drw->screen),
DefaultColormap(drw->dpy, drw->screen));
}

void drw_free(Drw *drw) {
XFreePixmap(drw->dpy, drw->drawable);
XFreeGC(drw->dpy, drw->gc);
if (drw->xftdraw) {
XftDrawDestroy(drw->xftdraw);
}
drw_fontset_free(drw->fonts);
free(drw);
}
Expand Down Expand Up @@ -272,7 +283,6 @@ int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h,
unsigned int ellipsis_w = 0;
unsigned int ellipsis_len;

XftDraw *d = NULL;
Fnt *usedfont;
Fnt *curfont;
Fnt *nextfont;
Expand Down Expand Up @@ -316,9 +326,6 @@ int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h,
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
}

d = XftDrawCreate(drw->dpy, drw->drawable,
DefaultVisual(drw->dpy, drw->screen),
DefaultColormap(drw->dpy, drw->screen));
x += lpad;
w -= lpad;
}
Expand Down Expand Up @@ -386,7 +393,8 @@ int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h,
if (utf8strlen) {
if (render) {
ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
XftDrawStringUtf8(drw->xftdraw,
&drw->scheme[invert ? ColBg : ColFg],
usedfont->xfont, x, ty, (XftChar8 *)utf8str,
utf8strlen);
}
Expand Down Expand Up @@ -457,9 +465,6 @@ int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h,
}
}
}
if (d) {
XftDrawDestroy(d);
}

return x + (render ? w : 0);
}
Expand Down
1 change: 1 addition & 0 deletions drw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ typedef struct {
GC gc;
Clr *scheme;
Fnt *fonts;
XftDraw *xftdraw;
} Drw;

/* Drawable abstraction */
Expand Down