From cd259557d7f21b84b8fc18167f51bf88d74f48cb Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Tue, 25 Apr 2000 01:38:42 +0000 Subject: [PATCH] Mon Apr 24 18:46:25 PDT 2000 Michael Jennings Work around that polka-dot-making Imlib2 problem until it can be fixed properly. SVN revision: 2531 --- ChangeLog | 6 ++++++ src/pixmap.c | 7 +++++-- src/startup.c | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0fd1dcd..c24e5a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3508,3 +3508,9 @@ Tue Apr 18 23:55:42 PDT 2000 Michael Jennings courtesy of Brian McFee . ------------------------------------------------------------------------------- +Mon Apr 24 18:46:25 PDT 2000 Michael Jennings + + Work around that polka-dot-making Imlib2 problem until it can be + fixed properly. + +------------------------------------------------------------------------------- diff --git a/src/pixmap.c b/src/pixmap.c index bc79a7f..619b87e 100644 --- a/src/pixmap.c +++ b/src/pixmap.c @@ -1053,8 +1053,11 @@ render_simage(simage_t * simg, Window win, unsigned short width, unsigned short 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); rendered = 1; - if (simg->pmap->mask != None) { - shaped_window_apply_mask(win, simg->pmap->mask); + /* FIXME: This is a hack around an apparent Imlib2 bug! */ + if (which == image_up || which == image_down || which == image_st) { + if (simg->pmap->mask != None) { + shaped_window_apply_mask(win, simg->pmap->mask); + } } if (simg->pmap->pixmap != None) { if (pixmap != None) { diff --git a/src/startup.c b/src/startup.c index efef088..2b19f8e 100644 --- a/src/startup.c +++ b/src/startup.c @@ -132,6 +132,7 @@ eterm_bootstrap(int argc, char *argv[]) imlib_context_set_display(Xdisplay); imlib_context_set_visual(Xvisual); imlib_context_set_colormap(cmap); + imlib_context_set_dither_mask(0); get_modifiers(); /* Set up modifier masks before parsing config files. */