old
/
eterm
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tue Apr 25 11:45:15 PDT 2000 Michael Jennings <mej@eterm.org> 

Updated per changes to Imlib2 API.


SVN revision: 2536
This commit is contained in:
Michael Jennings 2000-04-25 18:33:08 +00:00
parent b3f1428d23
commit 3c8fa7809d
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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.
-------------------------------------------------------------------------------

12
src/pixmap.c
View File

@ -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 {

2
utils/Esetroot.c
View File

@ -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);
}