-/* Conky, a system monitor, based on torsmo
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
+ * Conky, a system monitor, based on torsmo
*
* Please see COPYING for details
*
- * Copyright (c) 2005-2009 Brenden Matthews, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, et. al.
* All rights reserved.
*
* This program is free software: you can redistribute it and/or modify
*
*/
-#include "imlib2.h"
#include "config.h"
+#include "imlib2.h"
+#include "conky.h"
#include "logging.h"
-#include "common.h"
#include <Imlib2.h>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
#include <limits.h>
+#include <string.h>
#include <time.h>
struct image_list_s {
- char name[DEFAULT_TEXT_BUFFER_SIZE];
+ char name[1024];
Imlib_Image image;
int x, y, w, h;
int wh_set;
static int cimlib_cache_flush_interval = 0;
static int cimlib_cache_flush_last = 0;
-#define DEFAULT_CACHE_SIZE 4096 * 1024 /* default cache size for loaded images */
+#define DEFAULT_IMLIB2_CACHE_SIZE 4096 * 1024 /* default cache size for loaded images */
void cimlib_set_cache_size(long size)
{
if (interval >= 0) {
cimlib_cache_flush_interval = interval;
} else {
- ERR("Imlib2: flush interval should be >= 0");
+ NORM_ERR("Imlib2: flush interval should be >= 0");
}
}
image_list_start = image_list_end = NULL;
}
-void cimlib_init(Display *display, Window drawable, Visual *visual, Colormap colourmap)
+Imlib_Context context;
+
+
+void cimlib_init(Display *disp, Drawable drawable, Visual *visual, Colormap
+ colourmap)
{
image_list_start = image_list_end = NULL;
- if (!cache_size_set) cimlib_set_cache_size(DEFAULT_CACHE_SIZE);
+ context = imlib_context_new();
+ imlib_context_push(context);
+ if (!cache_size_set) cimlib_set_cache_size(DEFAULT_IMLIB2_CACHE_SIZE);
/* set the maximum number of colors to allocate for 8bpp and less to 256 */
imlib_set_color_usage(256);
/* dither for depths < 24bpp */
imlib_context_set_dither(1);
/* set the display , visual, colormap and drawable we are using */
- imlib_context_set_display(display);
+ imlib_context_set_display(disp);
imlib_context_set_visual(visual);
imlib_context_set_colormap(colourmap);
imlib_context_set_drawable(drawable);
}
+void cimlib_deinit(void)
+{
+ cimlib_cleanup();
+ cache_size_set = 0;
+// imlib_context_disconnect_display();
+ imlib_context_pop();
+ imlib_context_free(context);
+}
+
void cimlib_add_image(const char *args)
{
struct image_list_s *cur = NULL;
cur = malloc(sizeof(struct image_list_s));
memset(cur, 0, sizeof(struct image_list_s));
- if (!sscanf(args, "%1024s", cur->name)) {
- ERR("Invalid args for $image. Format is: '<path to image> (-p x,y) (-s WxH) (-n) (-f interval)' (got '%s')", args);
+ if (!sscanf(args, "%1023s", cur->name)) {
+ NORM_ERR("Invalid args for $image. Format is: '<path to image> (-p"
+ "x,y) (-s WxH) (-n) (-f interval)' (got '%s')", args);
+ free(cur);
+ return;
}
to_real_path(cur->name, cur->name);
// now we check for optional args
}
}
if (cur->flush_interval < 0) {
- ERR("Imlib2: flush interval should be >= 0");
+ NORM_ERR("Imlib2: flush interval should be >= 0");
cur->flush_interval = 0;
}
}
}
-static void cimlib_draw_image(struct image_list_s *cur, int *clip_x, int *clip_y, int *clip_x2, int *clip_y2)
+static void cimlib_draw_image(struct image_list_s *cur, int *clip_x, int
+ *clip_y, int *clip_x2, int *clip_y2)
{
+ int w, h;
+ time_t now = time(NULL);
+ static int rep = 0;
+
image = imlib_load_image(cur->name);
- if (image) {
- int w, h;
- time_t now = time(NULL);
- DBGP("Drawing image '%s' at (%i,%i) scaled to %ix%i, caching interval set to %i (with -n opt %i)", cur->name, cur->x, cur->y, cur->w, cur->h, cur->flush_interval, cur->no_cache);
- imlib_context_set_image(image);
- /* turn alpha channel on */
- imlib_image_set_has_alpha(1);
- w = imlib_image_get_width();
- h = imlib_image_get_height();
- if (!cur->wh_set) {
- cur->w = w;
- cur->h = h;
- }
- imlib_context_set_image(buffer);
- imlib_blend_image_onto_image(image, 1, 0, 0, w, h,
- cur->x, cur->y, cur->w, cur->h);
- imlib_context_set_image(image);
- if (cur->no_cache || (cur->flush_interval && now % cur->flush_interval == 0)) {
- imlib_free_image_and_decache();
- } else {
- imlib_free_image();
- }
- if (cur->x < *clip_x) *clip_x = cur->x;
- if (cur->y < *clip_y) *clip_y = cur->y;
- if (cur->x + cur->w > *clip_x2) *clip_x2 = cur->x + cur->w;
- if (cur->y + cur->h > *clip_y2) *clip_y2 = cur->y + cur->h;
+ if (!image) {
+ if (!rep)
+ NORM_ERR("Unable to load image '%s'", cur->name);
+ rep = 1;
+ return;
+ }
+ rep = 0; /* reset so disappearing images are reported */
+
+ DBGP("Drawing image '%s' at (%i,%i) scaled to %ix%i, "
+ "caching interval set to %i (with -n opt %i)",
+ cur->name, cur->x, cur->y, cur->w, cur->h,
+ cur->flush_interval, cur->no_cache);
+
+ imlib_context_set_image(image);
+ /* turn alpha channel on */
+ imlib_image_set_has_alpha(1);
+ w = imlib_image_get_width();
+ h = imlib_image_get_height();
+ if (!cur->wh_set) {
+ cur->w = w;
+ cur->h = h;
+ }
+ imlib_context_set_image(buffer);
+ imlib_blend_image_onto_image(image, 1, 0, 0, w, h,
+ cur->x, cur->y, cur->w, cur->h);
+ imlib_context_set_image(image);
+ if (cur->no_cache || (cur->flush_interval &&
+ now % cur->flush_interval == 0)) {
+ imlib_free_image_and_decache();
} else {
- ERR("Unable to load image '%s'", cur->name);
+ imlib_free_image();
}
+ if (cur->x < *clip_x) *clip_x = cur->x;
+ if (cur->y < *clip_y) *clip_y = cur->y;
+ if (cur->x + cur->w > *clip_x2) *clip_x2 = cur->x + cur->w;
+ if (cur->y + cur->h > *clip_y2) *clip_y2 = cur->y + cur->h;
}
static void cimlib_draw_all(int *clip_x, int *clip_y, int *clip_x2, int *clip_y2)
time_t now;
if (!image_list_start) return; /* are we actually drawing anything? */
-
- /* cheque if it's time to flush our cache */
+ fprintf(stderr, PACKAGE_NAME": cimlib_render start\n");
+ /* check if it's time to flush our cache */
now = time(NULL);
if (cimlib_cache_flush_interval && now - cimlib_cache_flush_interval > cimlib_cache_flush_last) {
int size = imlib_get_cache_size();
cimlib_cache_flush_last = now;
DBGP("Flushing Imlib2 cache (%li)\n", now);
}
-
/* take all the little rectangles to redraw and merge them into
* something sane for rendering */
buffer = imlib_create_image(width, height);
imlib_context_set_blend(1);
/* turn alpha channel on */
imlib_image_set_has_alpha(1);
-
cimlib_draw_all(&clip_x, &clip_y, &clip_x2, &clip_y2);
-
/* set the buffer image as our current image */
imlib_context_set_image(buffer);
-
/* setup our clip rect */
if (clip_x == INT_MAX) clip_x = 0;
if (clip_y == INT_MAX) clip_y = 0;
-
/* render the image at 0, 0 */
imlib_render_image_part_on_drawable_at_size(clip_x, clip_y, clip_x2 - clip_x,
clip_y2 - clip_y, x + clip_x, y + clip_y, clip_x2 - clip_x,
projects / monky / blobdiff