diff options
author | Michael Jennings <mej@kainx.org> | 2000-04-25 18:33:08 +0000 |
---|---|---|
committer | Michael Jennings <mej@kainx.org> | 2000-04-25 18:33:08 +0000 |
commit | 3c8fa7809dbe6d6e6434b6e8d086031521658c15 (patch) | |
tree | a09ccf3ee934f4376ad0a9892cd4432dbb5e021c | |
parent | b3f1428d23814d9dac9544d2c2e9033074c3b8be (diff) | |
download | eterm-3c8fa7809dbe6d6e6434b6e8d086031521658c15.tar.gz |
Tue Apr 25 11:45:15 PDT 2000 Michael Jennings <mej@eterm.org>
Updated per changes to Imlib2 API.
SVN revision: 2536
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | src/pixmap.c | 12 | ||||
-rw-r--r-- | utils/Esetroot.c | 2 |
3 files changed, 12 insertions, 7 deletions
@@ -3519,3 +3519,8 @@ Mon Apr 24 20:43:00 PDT 2000 Michael Jennings <mej@eterm.org> Found the Imlib2 bug and fixed it, so revert this hack. ------------------------------------------------------------------------------- +Tue Apr 25 11:45:15 PDT 2000 Michael Jennings <mej@eterm.org> + + Updated per changes to Imlib2 API. + +------------------------------------------------------------------------------- diff --git a/src/pixmap.c b/src/pixmap.c index 5b307e2..7da2f09 100644 --- a/src/pixmap.c +++ b/src/pixmap.c @@ -568,10 +568,10 @@ create_viewport_pixmap(simage_t *simg, Drawable d, int x, int y, unsigned short #endif if ((images[image_bg].current->pmap->w > 0) || (images[image_bg].current->pmap->op & OP_SCALE)) { D_PIXMAP(("Scaling image to %dx%d\n", scr->width, scr->height)); - imlib_render_pixmaps_for_whole_image_at_size(&viewport_pixmap, &mask, 0, scr->width, scr->height); + imlib_render_pixmaps_for_whole_image_at_size(&viewport_pixmap, &mask, scr->width, scr->height); } else { D_PIXMAP(("Tiling image at %dx%d\n", xsize, ysize)); - imlib_render_pixmaps_for_whole_image(&viewport_pixmap, &mask, 0); + imlib_render_pixmaps_for_whole_image(&viewport_pixmap, &mask); } if (viewport_pixmap == None) { print_error("Delayed image load failure for \"%s\". Using solid color mode.", imlib_image_get_filename()); @@ -727,9 +727,9 @@ paste_simage(simage_t *simg, unsigned char which, Drawable d, unsigned short x, } #endif if (w == imlib_image_get_width() && h == imlib_image_get_height()) { - imlib_render_pixmaps_for_whole_image(&pmap, &mask, 0); + imlib_render_pixmaps_for_whole_image(&pmap, &mask); } else { - imlib_render_pixmaps_for_whole_image_at_size(&pmap, &mask, 0, w, h); + imlib_render_pixmaps_for_whole_image_at_size(&pmap, &mask, w, h); } if (pmap == None) { print_error("Delayed image load failure for \"%s\".", imlib_image_get_filename()); @@ -1051,7 +1051,7 @@ render_simage(simage_t * simg, Window win, unsigned short width, unsigned short } #endif D_PIXMAP(("Rendering image simg->iml->im [%8p] to %hdx%hd pixmap\n", simg->iml->im, xscaled, yscaled)); - imlib_render_pixmaps_for_whole_image_at_size(&simg->pmap->pixmap, &simg->pmap->mask, 0, xscaled, yscaled); + imlib_render_pixmaps_for_whole_image_at_size(&simg->pmap->pixmap, &simg->pmap->mask, xscaled, yscaled); rendered = 1; if (simg->pmap->mask != None) { shaped_window_apply_mask(win, simg->pmap->mask); @@ -1762,7 +1762,7 @@ set_icon_pixmap(char *filename, XWMHints * pwm_hints) imlib_context_set_anti_alias(1); imlib_context_set_dither(1); imlib_context_set_blend(0); - imlib_render_pixmaps_for_whole_image_at_size(&wm_hints->icon_pixmap, &wm_hints->icon_mask, 0, w, h); + imlib_render_pixmaps_for_whole_image_at_size(&wm_hints->icon_pixmap, &wm_hints->icon_mask, w, h); if (check_for_enlightenment()) { wm_hints->flags |= IconPixmapHint | IconMaskHint; } else { diff --git a/utils/Esetroot.c b/utils/Esetroot.c index f22914b..2a400c8 100644 --- a/utils/Esetroot.c +++ b/utils/Esetroot.c @@ -215,7 +215,7 @@ main(int argc, char *argv[]) imlib_context_set_dither(1); imlib_context_set_blend(0); imlib_context_set_drawable(Xroot); - imlib_render_pixmaps_for_whole_image_at_size(&temp_pmap, &m, 0, w, h); + imlib_render_pixmaps_for_whole_image_at_size(&temp_pmap, &m, w, h); if (debug) { fprintf(stderr, "%s:%d: Rendered at %dx%d onto pixmap 0x%08x\n", __FILE__, __LINE__, w, h, (unsigned int) temp_pmap); } |