From 18796951994ce955c1913c18e8fa01ccb6c6e9c6 Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Wed, 29 Sep 1999 20:38:29 +0000 Subject: [PATCH] Wed Sep 29 15:30:47 PDT 1999 Michael Jennings Make auto mode work with the terminal background (ETERM_BG) too. Sorry raster. :-) SVN revision: 455 --- ChangeLog | 6 ++++++ src/options.c | 1 - src/pixmap.h | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6181575..a5f054f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2506,3 +2506,9 @@ Tue Sep 28 18:54:16 PDT 1999 Michael Jennings with too many entries will no longer crash Eterm. ------------------------------------------------------------------------------- +Wed Sep 29 15:30:47 PDT 1999 Michael Jennings + + Make auto mode work with the terminal background (ETERM_BG) too. + Sorry raster. :-) + +------------------------------------------------------------------------------- diff --git a/src/options.c b/src/options.c index 1ce7a9b..f03d215 100644 --- a/src/options.c +++ b/src/options.c @@ -1574,7 +1574,6 @@ shell_expand(char *s) Output = (char *) MALLOC(fsize + 1); fread(Output, fsize, 1, fp); Output[fsize] = 0; - D_ENL(("Command returned \"%s\". Output length is %lu, j = %lu, max - j == %lu\n", Output, fsize, j, max - j)); fclose(fp); remove(OutFile); Output = CondenseWhitespace(Output); diff --git a/src/pixmap.h b/src/pixmap.h index 7afcf05..a923f8c 100644 --- a/src/pixmap.h +++ b/src/pixmap.h @@ -33,7 +33,9 @@ #ifdef PIXMAP_SUPPORT # define background_is_image() (images[image_bg].current && images[image_bg].current->iml && images[image_bg].current->iml->im) # define background_is_trans() (images[image_bg].mode & MODE_TRANS) -# define background_is_pixmap() (background_is_image() || background_is_trans()) +# define background_is_viewport() (images[image_bg].mode & MODE_VIEWPORT) +# define background_is_auto() (images[image_bg].mode & MODE_AUTO) +# define background_is_pixmap() (background_is_image() || background_is_trans() || background_is_viewport() || background_is_auto()) # define delete_simage(simg) do { \ Imlib_free_pixmap(imlib_id, (simg)->pmap->pixmap); \ Imlib_destroy_image(imlib_id, (simg)->iml->im); \