Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-06 05:17:57 +00:00
Code Issues Releases Activity

Fix imlib2 context.

Browse Source
This commit is contained in:
Brenden Matthews 2009-08-03 12:39:44 -06:00
parent dbf3448031
commit 51ddee12dd
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/conky.c
View File

@ -7787,6 +7787,9 @@ void clean_up(void *memtofree1, void* memtofree2)
llua_shutdown_hook(); llua_shutdown_hook();
llua_close(); llua_close();
#endif /* HAVE_LUA */ #endif /* HAVE_LUA */
#ifdef IMLIB2
cimlib_deinit();
#endif /* IMLIB2 */
if (specials) { if (specials) {
for (i = 0; i < special_count; i++) { for (i = 0; i < special_count; i++) {

24
src/imlib2.c
View File

@ -86,9 +86,14 @@ void cimlib_cleanup(void)
image_list_start = image_list_end = NULL; image_list_start = image_list_end = NULL;
} }
void cimlib_init(Display *disp, Window drawable, Visual *visual, Colormap colourmap) Imlib_Context context;
void cimlib_init(Display *disp, Window drawable, Visual *visual, Colormap
colourmap)
{ {
image_list_start = image_list_end = NULL; image_list_start = image_list_end = NULL;
context = imlib_context_new();
imlib_context_push(context);
if (!cache_size_set) cimlib_set_cache_size(DEFAULT_IMLIB2_CACHE_SIZE); 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 */ /* set the maximum number of colors to allocate for 8bpp and less to 256 */
imlib_set_color_usage(256); imlib_set_color_usage(256);
@ -101,6 +106,15 @@ void cimlib_init(Display *disp, Window drawable, Visual *visual, Colormap colour
imlib_context_set_drawable(drawable); 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) void cimlib_add_image(const char *args)
{ {
struct image_list_s *cur = NULL; struct image_list_s *cur = NULL;
@ -110,7 +124,8 @@ void cimlib_add_image(const char *args)
memset(cur, 0, sizeof(struct image_list_s)); memset(cur, 0, sizeof(struct image_list_s));
if (!sscanf(args, "%1023s", cur->name)) { 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); NORM_ERR("Invalid args for $image. Format is: '<path to image> (-p"
"x,y) (-s WxH) (-n) (-f interval)' (got '%s')", args);
free(cur); free(cur);
return; return;
} }
@ -154,9 +169,8 @@ void cimlib_add_image(const char *args)
} }
} }
static void static void cimlib_draw_image(struct image_list_s *cur, int *clip_x, int
cimlib_draw_image(struct image_list_s *cur, int *clip_x, *clip_y, int *clip_x2, int *clip_y2)
int *clip_y, int *clip_x2, int *clip_y2)
{ {
int w, h; int w, h;
time_t now = time(NULL); time_t now = time(NULL);

1
src/imlib2.h
View File

@ -30,6 +30,7 @@ void cimlib_add_image(const char *name);
void cimlib_set_cache_size(long size); void cimlib_set_cache_size(long size);
void cimlib_set_cache_flush_interval(long interval); void cimlib_set_cache_flush_interval(long interval);
void cimlib_init(Display *display, Window drawable, Visual *visual, Colormap colourmap); void cimlib_init(Display *display, Window drawable, Visual *visual, Colormap colourmap);
void cimlib_deinit(void);
void cimlib_render(int x, int y, int width, int height); void cimlib_render(int x, int y, int width, int height);
void cimlib_cleanup(void); void cimlib_cleanup(void);