- document some new bugs.

- document changes.
- improve configure for afterimage.
- fix type.
- some indenting.

diff --git a/Changes b/Changes
index 36f87896c7c67ead6a7becf205da800382970139..76e5b0df3c2dac7bbee704ed7a796f1054243f8b 100644 (file)
--- a/Changes
+++ b/Changes
@@ -20,7 +20,13 @@ WISH: kick out xpm.C, replace by pixbuf
 DUMB: support tex fonts
 
 TODO: skipscorll option
+TODO: really enable libafterimage by default (6mb => 10mb rss without using it)?
+TODO: document -blr units, and possibly fix blur (20 seems to be about 3 pixels,
+      80 seems to be about 3 pixels, too, just much slower).
+TODO: when window partilaly off-screen, -blr does not have any effetc anymore.
 8.
+       - fix a lot of commandline switches (-C, -iconic, -ic, , -tr)
+          that were being ignored (Sasha Vasko).
        - initial transparency improvement/afterstep support
           patch by Sasha Vasko.
        - nuke reconf script, serves no purpose anymore.

diff --git a/config.h.in b/config.h.in
index 202fceb266d30b577373bfd14b9ef7661bac1988..fc61b73539c941ec1ab7363b84739777f6f9d9a6 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -335,16 +335,16 @@
    the screen */
 #undef SELECTION_SCROLLING
 
-/* The size of a `int', as computed by sizeof. */
+/* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT
 
-/* The size of a `int *', as computed by sizeof. */
+/* The size of `int *', as computed by sizeof. */
 #undef SIZEOF_INT_P
 
-/* The size of a `long long', as computed by sizeof. */
+/* The size of `long long', as computed by sizeof. */
 #undef SIZEOF_LONG_LONG
 
-/* The size of a `short', as computed by sizeof. */
+/* The size of `short', as computed by sizeof. */
 #undef SIZEOF_SHORT
 
 /* Define to use "smart" resize behavior */

diff --git a/configure b/configure
index 4c0e13e0b36dd054fc463049af8fdb64c5e11d98..d1166e7b194dabc72377401a8a30760bb7b61bca 100755 (executable)
--- a/configure
+++ b/configure
@@ -694,6 +694,7 @@ X_CFLAGS
 X_PRE_LIBS
 X_LIBS
 X_EXTRA_LIBS
+afterimage_config
 XPM_CPPFLAGS
 XPM_CFLAGS
 XPM_LIBS
@@ -714,6 +715,8 @@ PERL_O
 DEBUG
 DINCLUDE
 DLIB
+LIBAFTERIMAGE_CFLAGS
+AFTERIMAGE_LIBS
 include_stdint_h
 include_stdarg_h
 include_stdlib_h
@@ -1332,7 +1335,9 @@ Optional Features:
   --enable-combining      enable composition of base and combining characters
   --enable-xft            enable xft support on systems that have it
   --enable-font-styles    enable bold and italic support
-  --enable-xpm-background enable XPM background pixmaps
+  --enable-xpm-background enable background pixmaps
+  --enable-afterimage enable integration with libAfterImage for background images
+  --enable-afterstep enable integration with AfterStep window manager
   --enable-transparency   enable transparent backgrounds
   --enable-tinting        enable tinting of transparent bg
   --enable-fading         enable colors fading when off focus
@@ -1364,6 +1369,7 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-afterimage-config=DIR  use libAfterImage config script in DIR
   --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)
   --with-res-name=NAME    use this as default resource name (default: urxvt)
   --with-res-class=CLASS  use this as the resource class (default: URxvt)
@@ -4430,6 +4436,8 @@ support_scroll_xterm=yes
 support_scroll_plain=yes
 support_xim=yes
 support_xpm=yes
+support_afterimage=yes
+support_afterstep=yes
 support_xft=yes
 support_unicode3=no
 support_combining=yes
@@ -4473,6 +4481,8 @@ if test "${enable_everything+set}" = set; then
        support_wtmp=no
        support_xim=no
        support_xpm=no
+       support_afterimage=no
+       support_afterstep=no
        support_xft=no
        support_unicode3=no
        support_combining=no
@@ -4502,6 +4512,8 @@ if test "${enable_everything+set}" = set; then
        support_wtmp=yes
        support_xim=yes
        support_xpm=yes
+       support_afterimage=yes
+       support_afterstep=yes
        support_xft=yes
        support_unicode3=yes
        support_combining=yes
@@ -4555,6 +4567,29 @@ if test "${enable_xpm_background+set}" = set; then
 fi
 
 
+# Check whether --enable-afterimage was given.
+if test "${enable_afterimage+set}" = set; then
+  enableval=$enable_afterimage; if test x$enableval = xyes -o x$enableval = xno; then
+    support_afterimage=$enableval
+  fi
+fi
+
+
+
+# Check whether --with-afterimage_config was given.
+if test "${with_afterimage_config+set}" = set; then
+  withval=$with_afterimage_config; afterimage_config="$withval"
+fi
+
+
+# Check whether --enable-afterstep was given.
+if test "${enable_afterstep+set}" = set; then
+  enableval=$enable_afterstep; if test x$enableval = xyes -o x$enableval = xno; then
+    support_afterstep=$enableval
+  fi
+fi
+
+
 # Check whether --enable-transparency was given.
 if test "${enable_transparency+set}" = set; then
   enableval=$enable_transparency; if test x$enableval = xyes -o x$enableval = xno; then
@@ -6686,7 +6721,79 @@ fi
 
 
 
-if test x$support_xpm = xyes; then
+LIBAFTERIMAGE_CFLAGS=
+AFTERIMAGE_LIBS=
+have_afterimage=
+
+if test x$support_afterimage = xyes; then
+  support_afterimage=no
+
+   if test "x$afterimage_config" = "x" ; then
+    # Extract the first word of "afterimage-config", so it can be a program name with args.
+set dummy afterimage-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_afterimage_config+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $afterimage_config in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_afterimage_config="$afterimage_config" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_afterimage_config="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_afterimage_config" && ac_cv_path_afterimage_config="no"
+  ;;
+esac
+fi
+afterimage_config=$ac_cv_path_afterimage_config
+if test -n "$afterimage_config"; then
+  { echo "$as_me:$LINENO: result: $afterimage_config" >&5
+echo "${ECHO_T}$afterimage_config" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+  else
+    afterimage_config=$afterimage_config/afterimage-config
+  fi
+
+  { echo "$as_me:$LINENO: checking for libAfterImage" >&5
+echo $ECHO_N "checking for libAfterImage... $ECHO_C" >&6; }
+  if $afterimage_config --version >/dev/null 2>&1 ; then
+    LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
+    AFTERIMAGE_LIBS=`$afterimage_config --libs`
+    if test "x$AFTERIMAGE_LIBS" != "x"; then
+      support_afterimage=yes
+    fi
+  fi
+
+  if test "x$support_afterimage" = "xyes"; then
+    { echo "$as_me:$LINENO: result: $AFTERIMAGE_LIBS" >&5
+echo "${ECHO_T}$AFTERIMAGE_LIBS" >&6; }
+  else
+    { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+  fi
+fi
+
+if test x$support_afterimage != xyes -a x$support_xpm = xyes ; then
 
 
 
@@ -13421,13 +13528,30 @@ _ACEOF
 
   fi
 fi
-if test x$support_xpm = xyes; then
+if test x$support_xpm = xyes -o x$support_afterimage = xyes ; then
 
 cat >>confdefs.h <<\_ACEOF
 #define XPM_BACKGROUND 1
 _ACEOF
 
 fi
+
+if test x$support_afterimage = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_AFTERIMAGE 1
+_ACEOF
+
+fi
+
+if test x$support_afterstep = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define AFTERSTEP_INTEGRATION 1
+_ACEOF
+
+fi
+
 if test x$support_scroll_rxvt = xyes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -13728,6 +13852,9 @@ fi
 
 
 
+
+
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -14513,6 +14640,7 @@ X_CFLAGS!$X_CFLAGS$ac_delim
 X_PRE_LIBS!$X_PRE_LIBS$ac_delim
 X_LIBS!$X_LIBS$ac_delim
 X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
+afterimage_config!$afterimage_config$ac_delim
 XPM_CPPFLAGS!$XPM_CPPFLAGS$ac_delim
 XPM_CFLAGS!$XPM_CFLAGS$ac_delim
 XPM_LIBS!$XPM_LIBS$ac_delim
@@ -14528,7 +14656,6 @@ PERL!$PERL$ac_delim
 PERLLIB!$PERLLIB$ac_delim
 PERLFLAGS!$PERLFLAGS$ac_delim
 PERLPRIVLIBEXP!$PERLPRIVLIBEXP$ac_delim
-IF_PERL!$IF_PERL$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -14570,10 +14697,13 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+IF_PERL!$IF_PERL$ac_delim
 PERL_O!$PERL_O$ac_delim
 DEBUG!$DEBUG$ac_delim
 DINCLUDE!$DINCLUDE$ac_delim
 DLIB!$DLIB$ac_delim
+LIBAFTERIMAGE_CFLAGS!$LIBAFTERIMAGE_CFLAGS$ac_delim
+AFTERIMAGE_LIBS!$AFTERIMAGE_LIBS$ac_delim
 include_stdint_h!$include_stdint_h$ac_delim
 include_stdarg_h!$include_stdarg_h$ac_delim
 include_stdlib_h!$include_stdlib_h$ac_delim
@@ -14591,7 +14721,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 22; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -15034,6 +15164,14 @@ if test x$support_xpm = xyes; then
   echo "  Xpm library:                $XPM_LIBS"
 fi
 
+if test x$support_afterimage = xyes; then
+  echo "  AfterImage support:         yes"
+fi
+
+if test x$support_afterstep = xyes; then
+  echo "  AfterStep intergration:     yes"
+fi
+
 if test x$term != x; then
   echo "  set TERM to:                $term"
 fi

diff --git a/configure.ac b/configure.ac
index f35b9a0e993330b7530510e8b321cbacb7c763dd..0d4eefbabba497e3d1d22ce842e7b192728c9f9d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -470,14 +470,16 @@ AFTERIMAGE_LIBS=
 have_afterimage=
 
 if test x$support_afterimage = xyes; then
-  AC_MSG_CHECKING(installed libAfterImage)
   support_afterimage=no
-  if test "x$afterimage_config" = "x" ; then
+
+   if test "x$afterimage_config" = "x" ; then
     AC_PATH_PROG(afterimage_config, afterimage-config, no)
   else
     afterimage_config=$afterimage_config/afterimage-config
   fi
-  if $afterimage_config --version > /dev/null 2>&1 ; then
+
+  AC_MSG_CHECKING(for libAfterImage)
+  if $afterimage_config --version >/dev/null 2>&1 ; then
     LIBAFTERIMAGE_CFLAGS=`$afterimage_config --cflags`
     AFTERIMAGE_LIBS=`$afterimage_config --libs`
     if test "x$AFTERIMAGE_LIBS" != "x"; then
@@ -488,7 +490,7 @@ if test x$support_afterimage = xyes; then
   if test "x$support_afterimage" = "xyes"; then
     AC_MSG_RESULT($AFTERIMAGE_LIBS)
   else
-    AC_MSG_RESULT(afterimage-config not found - can't use libAfterImage for images.)
+    AC_MSG_RESULT(no)
   fi
 fi
 
@@ -1028,11 +1030,11 @@ if test x$support_xpm = xyes; then
 fi
 
 if test x$support_afterimage = xyes; then
-  echo "  AfterImage library:                $AFTERIMAGE_LIBS"
+  echo "  AfterImage support:         yes"
 fi
 
 if test x$support_afterstep = xyes; then
-  echo "  With AfterStep integration"
+  echo "  AfterStep intergration:     yes"
 fi
 
 if test x$term != x; then

diff --git a/src/command.C b/src/command.C
index 4db610ad927eedc4529c24556970d30ac0152582..770198e2854900a2b4501e9d2f64bd7d250897a8 100644 (file)
--- a/src/command.C
+++ b/src/command.C
@@ -2476,8 +2476,8 @@ int
 rxvt_term::check_our_parents ()
 {
 #if TRANSPARENT || ENABLE_PERL
-  check_our_aprents_ev.stop();
-  check_our_aprents_ev.start(NOW + 1./3.);
+  check_our_parents_ev.stop ();
+  check_our_parents_ev.start (NOW + .1);
 #endif
   return 0;
 }

diff --git a/src/main.C b/src/main.C
index f8749dce3c81e1c99f0ca41244d8bff13ae81dfa..4dd99b67911cffd588e1b29b0b25733c35f68e86 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -152,7 +152,7 @@ rxvt_term::rxvt_term ()
     :
 #if TRANSPARENT || ENABLE_PERL
     rootwin_ev (this, &rxvt_term::rootwin_cb),
-    check_our_aprents_ev(this, &rxvt_term::check_our_parents_cb),
+    check_our_parents_ev(this, &rxvt_term::check_our_parents_cb),
 #endif
 #ifdef HAVE_SCROLLBARS
     scrollbar_ev (this, &rxvt_term::x_cb),

diff --git a/src/rxvt.h b/src/rxvt.h
index 0587e6fe921ee38dbd6ae72d2171f99bd55eacbc..3e261d587af6274fc246c5c2fa90f2b40bf13943 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1101,7 +1101,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
   void rootwin_cb (XEvent &xev);
   xevent_watcher rootwin_ev;
   void check_our_parents_cb (time_watcher &w);
-  time_watcher check_our_aprents_ev;
+  time_watcher check_our_parents_ev;
 #endif
 
   void x_cb (XEvent &xev);

diff --git a/src/rxvttoolkit.C b/src/rxvttoolkit.C
index d524ca1661ccb751e67c52d774821d815d00bb88..aa6728b1ce3588a473e9db6a2f10749aed04d9a0 100644 (file)
--- a/src/rxvttoolkit.C
+++ b/src/rxvttoolkit.C
@@ -447,7 +447,8 @@ bool rxvt_display::ref_init ()
 
 #ifdef HAVE_AFTERIMAGE
   ::dpy = dpy; /* init global var from libAfter... */
-  asv = create_asvisual_for_id( dpy, screen, DefaultDepth(dpy,screen), XVisualIDFromVisual(DefaultVisual(dpy,screen)), None, NULL );
+  asv = create_asvisual_for_id (dpy, screen, DefaultDepth (dpy,screen),
+                                XVisualIDFromVisual (DefaultVisual (dpy, screen)), None, NULL);
 #endif
 
   assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);