fbt/lemonbar
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added image cache, reduces CPU load by a pretty large margin.

Browse Source
This commit is contained in:
Bram Wasti 2015-01-07 15:30:32 -05:00
parent 4b2840f040
commit 5c5bb41cd0
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bar.c
View File

@ -35,6 +35,8 @@ typedef struct area_t {
} area_t; } area_t;
#define N 20 #define N 20
#define MAX_IMAGES 20
#define MAX_IMAGE_FILENAME 50
typedef struct area_stack_t { typedef struct area_stack_t {
int pos; int pos;
@ -63,6 +65,11 @@ enum {
GC_MAX GC_MAX
}; };
typedef struct {
char filename[MAX_IMAGE_FILENAME];
cairo_surface_t *data;
} image_t;
static xcb_connection_t *c; static xcb_connection_t *c;
static xcb_screen_t *scr; static xcb_screen_t *scr;
static xcb_visualtype_t *vt; static xcb_visualtype_t *vt;
@ -76,7 +83,8 @@ static int bu = 1; /* Underline height */
static char *mfont = NULL; static char *mfont = NULL;
static uint32_t fgc, bgc; static uint32_t fgc, bgc;
static area_stack_t astack; static area_stack_t astack;
static char *img_file = NULL; static image_t imgs[MAX_IMAGES];
static char *img_file;
enum { enum {
PAL_BG, PAL_BG,
@ -110,6 +118,30 @@ cairo_copy (cairo_t *cr, cairo_surface_t *s, int sx, int sy, int dx, int dy, int
cairo_fill (cr); cairo_fill (cr);
} }
cairo_surface_t *
load_image(char *filename)
{
int i;
for (i = 0; i < MAX_IMAGES; i++) {
if (imgs[i].filename[0] == '\0') {
break;
} else if (!strncmp(filename, imgs[i].filename, MAX_IMAGE_FILENAME)) {
return imgs[i].data;
}
}
/* We boot the first thing in the cache. Approximate LRU. */
if (i >= MAX_IMAGES) {
i = 0;
cairo_surface_destroy(imgs[i].data);
}
strncpy(imgs[i].filename, filename, MAX_IMAGE_FILENAME);
imgs[i].data = cairo_image_surface_create_from_png(filename);
return imgs[i].data;
}
int int
draw_char (monitor_t *mon, int x, int align, char *ch, int draw_image) draw_char (monitor_t *mon, int x, int align, char *ch, int draw_image)
{ {
@ -123,7 +155,7 @@ draw_char (monitor_t *mon, int x, int align, char *ch, int draw_image)
/* Calculate the width of the character or image. */ /* Calculate the width of the character or image. */
cairo_surface_t *img; cairo_surface_t *img;
if (draw_image && img_file != NULL) { if (draw_image && img_file != NULL) {
img = cairo_image_surface_create_from_png(img_file); img = load_image(img_file);
int w = cairo_image_surface_get_width(img); int w = cairo_image_surface_get_width(img);
int h = cairo_image_surface_get_height(img); int h = cairo_image_surface_get_height(img);
ch_width = w; ch_width = w;
@ -148,7 +180,7 @@ draw_char (monitor_t *mon, int x, int align, char *ch, int draw_image)
if (draw_image && img != NULL) { if (draw_image && img != NULL) {
cairo_set_source_surface(mon->cr, img, x, 0); cairo_set_source_surface(mon->cr, img, x, 0);
cairo_mask_surface(mon->cr, img, x, 0); cairo_mask_surface(mon->cr, img, x, 0);
cairo_surface_destroy(img); //cairo_surface_destroy(img);
} else { } else {
/* String baseline coordinates */ /* String baseline coordinates */
cairo_move_to(mon->cr, x, bh / 2 + ext.height / 2 - ext.descent); cairo_move_to(mon->cr, x, bh / 2 + ext.height / 2 - ext.descent);