repo: rxvt-unicode-sixel
action: commit
revision: 
path_from: 
revision_from: 0a5e106e62c1475a2a78db82eb671309639cd3cf:
path_to: 
revision_to: 

commit 0a5e106e62c1475a2a78db82eb671309639cd3cf
Author: Emanuele Giaquinta 
Date:   Sat Feb 4 21:47:06 2012 +0000

    Remove deprecated libAfterImage image backend.

diff --git a/configure.ac b/configure.ac

--- a/configure.ac
+++ b/configure.ac
@@ -225,18 +225,6 @@ AC_ARG_ENABLE(font-styles,
     support_styles=$enableval
   fi])

-AC_ARG_ENABLE(afterimage,
-  [  --enable-afterimage     enable integration with libAfterImage for background images (deprecated)],
-  [if test x$enableval = xyes -o x$enableval = xno; then
-    support_afterimage=$enableval
-  fi])
-
-AC_ARG_WITH(afterimage_config,
-  [  --with-afterimage-config=DIR  use libAfterImage config script in DIR],
-  [if test "x$withval" != x; then
-    afterimage_config=$withval/afterimage-config
-  fi])
-
 AC_ARG_ENABLE(pixbuf,
   [  --enable-pixbuf         enable integration with gdk-pixbuf for background images],
   [if test x$enableval = xyes -o x$enableval = xno; then
@@ -453,7 +441,6 @@ if test x$support_pixbuf = xyes; then
   if test x$support_pixbuf = xyes; then
     AC_MSG_RESULT(ok)
     image_lib=gdk-pixbuf
-    support_afterimage=no
     AC_DEFINE(HAVE_PIXBUF, 1, Define if you want to use gdk-pixbuf for image processing)
     AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
   else
@@ -488,45 +475,6 @@ fi
 AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
 AC_SUBST(STARTUP_NOTIFICATION_LIBS)

-AFTERIMAGE_CFLAGS=
-AFTERIMAGE_LIBS=
-
-if test x$support_afterimage = xyes; then
-  support_afterimage=no
-
-  if test "x$afterimage_config" = "x" ; then
-    AC_PATH_PROG(afterimage_config, afterimage-config, no)
-  fi
-  if test "x$afterimage_config" != "xno" ; then
-    AC_MSG_CHECKING(for libAfterImage version >= 1.15)
-    AFTERIMAGE_VERSION=`$afterimage_config --version`
-    if test -n "$AFTERIMAGE_VERSION" ; then
-      AFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
-      AFTERIMAGE_LIBS=`$afterimage_config --libs`
-      if test "x$AFTERIMAGE_LIBS" != "x"; then
-        libai_ver_major=`echo $AFTERIMAGE_VERSION | cut -f 1 -d .`
-        libai_ver_minor=`echo $AFTERIMAGE_VERSION | cut -f 2 -d .`
-        if test $libai_ver_major -gt 1 -o \( $libai_ver_major -eq 1 -a $libai_ver_minor -ge 15 \); then
-          support_afterimage=yes
-        fi
-      fi
-    fi
-    if test "x$support_afterimage" = "xyes"; then
-      AC_MSG_RESULT($AFTERIMAGE_LIBS)
-      image_lib=libafterimage
-      AC_DEFINE(HAVE_AFTERIMAGE, 1, Define if you want to use libAfterImage for image processing)
-      AC_DEFINE(BG_IMAGE_FROM_FILE, 1, Define if you want to have sexy-looking background pixmaps.)
-    else
-      AC_MSG_RESULT(no)
-      AFTERIMAGE_CFLAGS=
-      AFTERIMAGE_LIBS=
-    fi
-  fi
-fi
-
-AC_SUBST(AFTERIMAGE_CFLAGS)
-AC_SUBST(AFTERIMAGE_LIBS)
-
 dnl# --------------------------------------------------------------------------
 dnl# CHECKING FOR HEADER FILES
 dnl# --------------------------------------------------------------------------
diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod

--- a/doc/rxvt.1.pod
+++ b/doc/rxvt.1.pod
@@ -152,16 +152,6 @@ resource I.
 Darken (0 .. 99) or lighten (101 .. 200) the transparent background.
 A value of 100 means no shading; resource I.

-=item B<-blt> I
-
-Specify background blending type. If background pixmap is specified
-at the same time as transparency - such pixmap will be blended over
-the transparent background, using the method specified. Supported values are:
-B, B, B - colour values averaging, B,
-B, B, B, B, B, B,
-B, B, B, B, B. The default is
-alpha-blending. Compile I; resource I.
-
 =item B<-blr> I

 Apply Gaussian Blur with the specified radii to the transparent
@@ -174,7 +164,7 @@ resource I.

 =item B<-icon> I

-Compile I or I: Use the specified image as application icon. This
+Compile I: Use the specified image as application icon. This
 is used by many window managers, taskbars and pagers to represent the
 application window; resource I.

@@ -188,7 +178,7 @@ Window foreground colour; resource B.

 =item B<-pixmap> I

-Compile I or I: Specify image file for the background and also
+Compile I: Specify image file for the background and also
 optionally specify a list of operations to modify it. Note you may need to
 add quotes to avoid special shell interpretation of the C<;> in the
 command-line; for more details see resource B.
@@ -809,9 +799,7 @@ If multiple templates are specified the last one wins. Note that a
 template overrides all the scale, position and operations settings.

 If used in conjunction with B<-tr> option, the specified pixmap will be
-blended over the transparent background using alpha-blending. If I
-support has been compiled in it is possible to choose other blending
-types with B<-blt "type"> option.
+blended over the transparent background using alpha-blending.

 =item B I

diff --git a/doc/rxvt.7.pod b/doc/rxvt.7.pod

--- a/doc/rxvt.7.pod
+++ b/doc/rxvt.7.pod
@@ -253,7 +253,7 @@ your picture with gimp or any other tool:
    convert wallpaper.jpg -blur 20x20 -modulate 30 background.jpg
    @@URXVT_NAME@@ -pixmap "background.jpg;:root"

-That works. If you think it doesn't, you lack libAfterImage or GDK-PixBuf support, or you
+That works. If you think it doesn't, you lack GDK-PixBuf support, or you
 are unable to read.

 3. Use an ARGB visual:
@@ -2056,7 +2056,7 @@ B can be escaped by prefixing it with SYN (0x16, ^V).
 	B<< C >>	Change colour of mouse foreground to B<< C >>
 	B<< C >>	Change background colour of highlight characters to B<< C >>
 	B<< C >>	Change foreground colour of highlight characters to B<< C >>
-	B<< C >>	Change background pixmap parameters (see section BACKGROUND IMAGE) (Compile afterimage or pixbuf).
+	B<< C >>	Change background pixmap parameters (see section BACKGROUND IMAGE) (Compile pixbuf).
 	B<< C >>	Change default foreground colour to B<< C >>. [deprecated, use 10]
 	B<< C >>	Change Log File to B<< C >> I
 	B<< C >>	Change default background colour to B<< C >>. [deprecated, use 11]
@@ -2359,18 +2359,6 @@ Write user and tty to lastlog file (used by programs like
 F) at start of rxvt execution.  This option requires
 --enable-utmp to also be specified.

-=item --enable-afterimage (default: off)
-
-Add support for libAfterImage to be used for background
-images. It adds support for many file formats including JPG, PNG,
-SVG, TIFF, GIF, XPM, BMP, ICO, XCF, TGA and AfterStep image XML
-(L).
-
-Note that with this option enabled, @@RXVT_NAME@@'s memory footprint might
-increase by a few megabytes even if no extra features are used (mostly due
-to third-party libraries used by libAI). Memory footprint may somewhat be
-lowered if libAfterImage is configured without support for SVG.
-
 =item --enable-pixbuf (default: on)

 Add support for GDK-PixBuf to be used for background images.
@@ -2385,7 +2373,7 @@ to display some kind of progress indicator during startup.
 =item --enable-transparency (default: on)

 Add support for using the root pixmap as background to simulate transparency.
-Note that blur and blend effects depend on libAfterImage or on
+Note that blur and blend effects depend on
 libXrender and on the availability of the RENDER extension in the X
 server.

@@ -2534,10 +2522,6 @@ and consequently sets C to C by default
 It also results in higher memory usage and can slow down @@RXVT_NAME@@
 dramatically when more than six fonts are in use by a terminal instance.

-=item --with-afterimage-config=DIR
-
-Look for the libAfterImage config script in DIR.
-
 =item --with-name=NAME (default: urxvt)

 Set the basename for the installed binaries, resulting
diff --git a/src/Makefile.in b/src/Makefile.in

--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -16,8 +16,8 @@ CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 DEFS = @DEFS@
 LIBS = @LIBS@
-XINC = @X_CFLAGS@ @AFTERIMAGE_CFLAGS@ @PIXBUF_CFLAGS@ @STARTUP_NOTIFICATION_CFLAGS@
-XLIB = @X_LIBS@ @AFTERIMAGE_LIBS@ -lX11 @X_EXTRA_LIBS@ @PIXBUF_LIBS@ @STARTUP_NOTIFICATION_LIBS@
+XINC = @X_CFLAGS@ @PIXBUF_CFLAGS@ @STARTUP_NOTIFICATION_CFLAGS@
+XLIB = @X_LIBS@ -lX11 @X_EXTRA_LIBS@ @PIXBUF_LIBS@ @STARTUP_NOTIFICATION_LIBS@
 COMPILE = $(CXX) -I.. -I$(srcdir) -I. -I$(srcdir)/../libev -I$(srcdir)/../libptytty/src -I$(srcdir)/../libecb $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(XINC)
 LINK = @LINKER@ $(LDFLAGS)
 EXEEXT = @EXEEXT@
diff --git a/src/background.C b/src/background.C

--- a/src/background.C
+++ b/src/background.C
@@ -60,15 +60,6 @@ create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_
 void
 rxvt_term::bg_destroy ()
 {
-#ifdef HAVE_AFTERIMAGE
-  if (original_asim)
-    safe_asimage_destroy (original_asim);
-  if (asv)
-    destroy_asvisual (asv, 0);
-  if (asimman)
-    destroy_image_manager (asimman, 0);
-#endif
-
 #ifdef HAVE_PIXBUF
   if (pixbuf)
     g_object_unref (pixbuf);
@@ -353,242 +344,6 @@ rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h
     bg_flags |= BG_IS_SIZE_SENSITIVE;
 }

-#  ifdef HAVE_AFTERIMAGE
-bool
-rxvt_term::render_image (unsigned long tr_flags)
-{
-  init_asv ();
-
-  ASImage *background = NULL;
-  ARGB32 background_tint = TINT_LEAVE_SAME;
-
-#   ifdef ENABLE_TRANSPARENCY
-  if (tr_flags)
-    background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
-
-  if (tr_flags & BG_NEEDS_TINT)
-    {
-      ShadingInfo as_shade;
-      as_shade.shading = shade;
-
-      rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
-      if (bg_flags & BG_TINT_SET)
-        tint.get (c);
-      as_shade.tintColor.red = c.r;
-      as_shade.tintColor.green = c.g;
-      as_shade.tintColor.blue = c.b;
-
-      background_tint = shading2tint32 (&as_shade);
-    }
-
-  if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
-    {
-      ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
-                                         ASA_XImage,
-                                         100, ASIMAGE_QUALITY_DEFAULT);
-      if (tmp)
-        {
-          destroy_asimage (&background);
-          background = tmp;
-        }
-    }
-#   endif
-
-  ASImage *result = 0;
-
-  int target_width    = szHint.width;
-  int target_height   = szHint.height;
-  int new_pmap_width  = target_width;
-  int new_pmap_height = target_height;
-
-  int x = 0;
-  int y = 0;
-  int w = 0;
-  int h = 0;
-
-  if (original_asim)
-    get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
-
-  if (!original_asim
-      || (!(bg_flags & BG_ROOT_ALIGN)
-          && (x >= target_width
-              || y >= target_height
-              || x + w <= 0
-              || y + h <= 0)))
-    {
-      if (background)
-        {
-          new_pmap_width = background->width;
-          new_pmap_height = background->height;
-          result = background;
-
-          if (background_tint != TINT_LEAVE_SAME)
-            {
-              ASImage *tmp = tile_asimage (asv, background, 0, 0,
-                                           target_width, target_height, background_tint,
-                                           ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
-              if (tmp)
-                result = tmp;
-            }
-        }
-      else
-        new_pmap_width = new_pmap_height = 0;
-    }
-  else
-    {
-      result = original_asim;
-
-      if (w != original_asim->width
-          || h != original_asim->height)
-        {
-          result = scale_asimage (asv, original_asim,
-                                  w, h,
-                                  ASA_XImage,
-                                  100, ASIMAGE_QUALITY_DEFAULT);
-        }
-
-      if (background == NULL)
-        {
-          if (bg_flags & BG_TILE)
-            {
-              /* if tiling - pixmap has to be sized exactly as the image,
-                 but there is no need to make it bigger than the window! */
-              new_pmap_width = min (result->width, target_width);
-              new_pmap_height = min (result->height, target_height);
-
-              /* we also need to tile our image in both directions */
-              ASImage *tmp = tile_asimage (asv, result,
-                                           (int)result->width - x,
-                                           (int)result->height - y,
-                                           new_pmap_width,
-                                           new_pmap_height,
-                                           TINT_LEAVE_SAME, ASA_XImage,
-                                           100, ASIMAGE_QUALITY_DEFAULT);
-              if (tmp)
-                {
-                  if (result != original_asim)
-                    destroy_asimage (&result);
-
-                  result = tmp;
-                }
-            }
-        }
-      else
-        {
-          /* if blending background and image - pixmap has to be sized same as target window */
-          ASImageLayer *layers = create_image_layers (2);
-
-          layers[0].im = background;
-          layers[0].clip_width = target_width;
-          layers[0].clip_height = target_height;
-          layers[0].tint = background_tint;
-          layers[1].im = result;
-
-          if (bg_flags & BG_TILE)
-            {
-              /* tile horizontally */
-              while (x > 0) x -= (int)result->width;
-              layers[1].dst_x = x;
-              layers[1].clip_width = result->width+target_width;
-            }
-          else
-            {
-              /* clip horizontally */
-              layers[1].dst_x = x;
-              layers[1].clip_width = result->width;
-            }
-
-          if (bg_flags & BG_TILE)
-            {
-              while (y > 0) y -= (int)result->height;
-              layers[1].dst_y = y;
-              layers[1].clip_height = result->height + target_height;
-            }
-          else
-            {
-              layers[1].dst_y = y;
-              layers[1].clip_height = result->height;
-            }
-
-          if (rs[Rs_blendtype])
-            {
-              layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
-              if (layers[1].merge_scanlines == NULL)
-                layers[1].merge_scanlines = alphablend_scanlines;
-            }
-
-          ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
-                                       ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
-
-          if (tmp)
-            {
-              if (result != original_asim)
-                destroy_asimage (&result);
-
-              result = tmp;
-            }
-
-          free (layers);
-        }
-    }
-
-  bool ret = false;
-
-  if (result)
-    {
-      XGCValues gcv;
-      GC gc;
-
-      /* create Pixmap */
-      if (bg_pixmap == None
-          || bg_pmap_width != new_pmap_width
-          || bg_pmap_height != new_pmap_height)
-        {
-          if (bg_pixmap)
-            XFreePixmap (dpy, bg_pixmap);
-          bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
-          bg_pmap_width = new_pmap_width;
-          bg_pmap_height = new_pmap_height;
-        }
-      /* fill with background color (if result's not completely overlapping it) */
-      gcv.foreground = pix_colors[Color_bg];
-      gc = XCreateGC (dpy, vt, GCForeground, &gcv);
-
-      int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
-      int dst_width = result->width, dst_height = result->height;
-      if (background == NULL)
-        {
-          if (!(bg_flags & BG_TILE))
-            {
-              src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
-              src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
-            }
-
-          if (dst_x > 0 || dst_y > 0
-              || dst_x + dst_width < new_pmap_width
-              || dst_y + dst_height < new_pmap_height)
-            XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
-        }
-
-      /* put result on pixmap */
-      if (dst_x < new_pmap_width && dst_y < new_pmap_height)
-        asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
-
-      if (result != background && result != original_asim)
-        destroy_asimage (&result);
-
-      XFreeGC (dpy, gc);
-
-      ret = true;
-    }
-
-  if (background)
-    destroy_asimage (&background);
-
-  return ret;
-}
-#  endif /* HAVE_AFTERIMAGE */
-
 #  ifdef HAVE_PIXBUF
 bool
 rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
@@ -856,20 +611,6 @@ rxvt_term::bg_set_file (const char *file)
       file = f;
     }

-#  ifdef HAVE_AFTERIMAGE
-  if (!asimman)
-    asimman = create_generic_imageman (rs[Rs_path]);
-  ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
-  if (image)
-    {
-      if (original_asim)
-        safe_asimage_destroy (original_asim);
-      original_asim = image;
-      bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
-      ret = true;
-    }
-#  endif
-
 #  ifdef HAVE_PIXBUF
   GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
   if (image)
@@ -1291,7 +1032,6 @@ rxvt_term::make_transparency_pixmap ()
               if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
                 result &= ~BG_NEEDS_TINT;
             }
-#  ifndef HAVE_AFTERIMAGE
           if (result & BG_NEEDS_TINT)
             {
               XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
@@ -1304,7 +1044,6 @@ rxvt_term::make_transparency_pixmap ()
                   XDestroyImage (ximage);
                 }
             }
-#  endif
         } /* server side rendering completed */

       XFreeGC (dpy, gc);
@@ -1395,7 +1134,7 @@ rxvt_term::bg_init ()

 #endif /* HAVE_BG_PIXMAP */

-#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
+#ifdef ENABLE_TRANSPARENCY
 /* based on code from aterm-0.4.2 */

 static inline void
@@ -1551,4 +1290,4 @@ rxvt_term::tint_ximage (Visual *visual, XImage *ximage)

   free (lookup);
 }
-#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */
+#endif /* ENABLE_TRANSPARENCY */
diff --git a/src/init.C b/src/init.C

--- a/src/init.C
+++ b/src/init.C
@@ -793,11 +793,6 @@ rxvt_term::init2 (int argc, const char *const *argv)

   pty = ptytty::create ();

-#ifdef HAVE_AFTERIMAGE
-  set_application_name ((char *)rs[Rs_name]);
-  set_output_threshold (OUTPUT_LEVEL_WARNING);
-#endif
-
   // must be called before create_windows, because the latter may call set_icon
 #ifdef HAVE_PIXBUF
   g_type_init ();
@@ -1296,57 +1291,6 @@ rxvt_term::get_ourmods ()
 void
 rxvt_term::set_icon (const char *file)
 {
-#ifdef HAVE_AFTERIMAGE
-  init_asv ();
-
-  ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
-  if (!im)
-    {
-      rxvt_warn ("Loading image icon failed, continuing without.\n");
-      return;
-    }
-
-  unsigned int w = im->width;
-  unsigned int h = im->height;
-
-  if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
-    {
-      rxvt_warn ("Icon image too big, continuing without.\n");
-      destroy_asimage (&im);
-      return;
-    }
-
-  ASImage *result = scale_asimage (asv, im,
-                                   w, h, ASA_ARGB32,
-                                   100, ASIMAGE_QUALITY_DEFAULT);
-  destroy_asimage (&im);
-
-  if (!result)
-    {
-      rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
-      return;
-    }
-
-  long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
-  if (buffer)
-    {
-      ARGB32 *asbuf = result->alt.argb32;
-      buffer [0] = w;
-      buffer [1] = h;
-
-      for (unsigned int i = 0; i < w * h; ++i)
-        buffer [i + 2] = asbuf [i];
-
-      XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
-                       PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
-      free (buffer);
-    }
-  else
-    rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
-
-  destroy_asimage (&result);
-#endif
-
 #ifdef HAVE_PIXBUF
   GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
   if (!pixbuf)
diff --git a/src/rsinc.h b/src/rsinc.h

--- a/src/rsinc.h
+++ b/src/rsinc.h
@@ -116,9 +116,6 @@
   def (iso14755)
   def (iso14755_52)
 #endif
-#ifdef HAVE_AFTERIMAGE
-  def (blendtype)
-#endif
 #ifdef ENABLE_EWMH
   def (iconfile)
 #endif
diff --git a/src/rxvt.h b/src/rxvt.h

--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -72,12 +72,6 @@ typedef  int32_t tlen_t_; // specifically for use in the line_t structure
 #include 
 #include 

-#ifdef HAVE_AFTERIMAGE
-# include 
-# undef min
-# undef max
-#endif
-
 #ifdef HAVE_PIXBUF
 # include 
 #endif
@@ -1180,17 +1174,6 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
     bg_flags &= ~BG_IS_VALID;
   }
 #endif
-#ifdef HAVE_AFTERIMAGE
-  ASImage        *original_asim;
-  ASVisual       *asv;
-  ASImageManager *asimman;
-
-  void init_asv ()
-  {
-    if (!asv)
-      asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
-  }
-#endif
 #ifdef HAVE_PIXBUF
   GdkPixbuf *pixbuf;
   bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
diff --git a/src/xdefaults.C b/src/xdefaults.C

--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -272,9 +272,6 @@ optList[] = {
               BOOL (Rs_iso14755, "iso14755", NULL, Opt_iso14755, 0, NULL),
               BOOL (Rs_iso14755_52, "iso14755_52", NULL, Opt_iso14755_52, 0, NULL),
 #endif
-#ifdef HAVE_AFTERIMAGE
-              STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
-#endif
 #ifndef NO_RESOURCES
               RINFO ("xrm", "string"),
 #endif
@@ -338,9 +335,6 @@ static const char optionsstring[] = "options: "
                                     "transparent,"
                                     "tint,"
 #endif
-#if HAVE_AFTERIMAGE
-                                    "afterimage,"
-#endif
 #if HAVE_PIXBUF
                                     "pixbuf,"
 #endif

-----END OF PAGE-----