Skip to content

Commit

Permalink
improve message
Browse files Browse the repository at this point in the history
  • Loading branch information
Marc Lehmann committed May 10, 2012
1 parent e9da79b commit a5cc9b1
Show file tree
Hide file tree
Showing 7 changed files with 104 additions and 294 deletions.
4 changes: 2 additions & 2 deletions README.FAQ
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@ xterm? I need this to decide about setting colours etc.
convert wallpaper.jpg -blur 20x20 -modulate 30 background.jpg
urxvt -pixmap "background.jpg;:root"

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

3. Use an ARGB visual:

Expand Down
20 changes: 2 additions & 18 deletions README.configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,18 +106,6 @@ CONFIGURE OPTIONS
at start of rxvt execution. This option requires --enable-utmp to
also be specified.

--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
(<http://www.afterstep.org/visualdoc.php?show=asimagexml>).

Note that with this option enabled, rxvt'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.

--enable-pixbuf (default: on)
Add support for GDK-PixBuf to be used for background images. It adds
support for many file formats including JPG, PNG, TIFF, GIF, XPM,
Expand All @@ -130,9 +118,8 @@ CONFIGURE OPTIONS

--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 libXrender and on the availability of the RENDER
extension in the X server.
transparency. Note that blur and blend effects depend on libXrender
and on the availability of the RENDER extension in the X server.

--enable-fading (default: on)
Add support for fading the text when focus is lost.
Expand Down Expand Up @@ -263,9 +250,6 @@ CONFIGURE OPTIONS
dramatically when more than six fonts are in use by a terminal
instance.

--with-afterimage-config=DIR
Look for the libAfterImage config script in DIR.

--with-name=NAME (default: urxvt)
Set the basename for the installed binaries, resulting in "urxvt",
"urxvtd" etc.). Specify "--with-name=rxvt" to replace with "rxvt".
Expand Down
152 changes: 1 addition & 151 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -600,9 +600,6 @@ PERLFLAGS
PERLLIB
PERL
XFT_CONFIG
AFTERIMAGE_LIBS
AFTERIMAGE_CFLAGS
afterimage_config
STARTUP_NOTIFICATION_LIBS
STARTUP_NOTIFICATION_CFLAGS
PIXBUF_LIBS
Expand Down Expand Up @@ -692,8 +689,6 @@ enable_unicode3
enable_combining
enable_xft
enable_font_styles
enable_afterimage
with_afterimage_config
enable_pixbuf
enable_startup_notification
enable_transparency
Expand Down Expand Up @@ -1369,7 +1364,6 @@ 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-afterimage enable integration with libAfterImage for background images (deprecated)
--enable-pixbuf enable integration with gdk-pixbuf for background images
--enable-startup-notification enable freedesktop startup notification support
--enable-transparency enable transparent backgrounds
Expand Down Expand Up @@ -1401,7 +1395,6 @@ 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=CS,... 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)
Expand Down Expand Up @@ -4831,23 +4824,6 @@ if test "${enable_font_styles+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; if test "x$withval" != x; then
afterimage_config=$withval/afterimage-config
fi
fi


# Check whether --enable-pixbuf was given.
if test "${enable_pixbuf+set}" = set; then :
enableval=$enable_pixbuf; if test x$enableval = xyes -o x$enableval = xno; then
Expand Down Expand Up @@ -6328,7 +6304,6 @@ $as_echo_n "checking for gdk-pixbuf... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
$as_echo "ok" >&6; }
image_lib=gdk-pixbuf
support_afterimage=no

$as_echo "#define HAVE_PIXBUF 1" >>confdefs.h

Expand Down Expand Up @@ -6413,92 +6388,6 @@ fi



AFTERIMAGE_CFLAGS=
AFTERIMAGE_LIBS=

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
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_afterimage_config+set}" = set; then :
$as_echo_n "(cached) " >&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"
$as_echo "$as_me:${as_lineno-$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
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $afterimage_config" >&5
$as_echo "$afterimage_config" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi


fi
if test "x$afterimage_config" != "xno" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libAfterImage version >= 1.15" >&5
$as_echo_n "checking for libAfterImage version >= 1.15... " >&6; }
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
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $AFTERIMAGE_LIBS" >&5
$as_echo "$AFTERIMAGE_LIBS" >&6; }
image_lib=libafterimage

$as_echo "#define HAVE_AFTERIMAGE 1" >>confdefs.h


$as_echo "#define BG_IMAGE_FROM_FILE 1" >>confdefs.h

else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
AFTERIMAGE_CFLAGS=
AFTERIMAGE_LIBS=
fi
fi
fi




for ac_header in \
sys/byteorder.h \
sys/ioctl.h \
Expand Down Expand Up @@ -7988,46 +7877,7 @@ done
done
IFS=$as_save_IFS

;;
esac
fi
PERL=$ac_cv_path_PERL
if test -n "$PERL"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
$as_echo "$PERL" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi


# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_PERL+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $PERL in
[\\/]* | ?:[\\/]*)
ac_cv_path_PERL="$PERL" # 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_PERL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS

test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="perl"
;;
esac
fi
Expand Down
3 changes: 1 addition & 2 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -713,8 +713,7 @@ done

IF_PERL=\#
if test x$support_perl = xyes; then
AC_PATH_PROG(PERL, perl5)
AC_PATH_PROG(PERL, perl)
AC_PATH_PROG(PERL, perl5, perl)

AC_MSG_CHECKING(for $PERL suitability)
if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then
Expand Down
19 changes: 4 additions & 15 deletions doc/rxvt.1.man.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "@@RXVT_NAME@@ 1"
.TH @@RXVT_NAME@@ 1 "2012-01-21" "@@RXVT_VERSION@@" "RXVT-UNICODE"
.TH @@RXVT_NAME@@ 1 "2012-05-11" "@@RXVT_VERSION@@" "RXVT-UNICODE"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Expand Down Expand Up @@ -262,15 +262,6 @@ resource \fItintColor\fR.
.IX Item "-sh number"
Darken (0 .. 99) or lighten (101 .. 200) the transparent background.
A value of 100 means no shading; resource \fIshading\fR.
.IP "\fB\-blt\fR \fIstring\fR" 4
.IX Item "-blt string"
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:
\&\fBadd\fR, \fBalphablend\fR, \fBallanon\fR \- colour values averaging, \fBcolorize\fR,
\&\fBdarken\fR, \fBdiff\fR, \fBdissipate\fR, \fBhue\fR, \fBlighten\fR, \fBoverlay\fR,
\&\fBsaturate\fR, \fBscreen\fR, \fBsub\fR, \fBtint\fR, \fBvalue\fR. The default is
alpha-blending. Compile \fIafterimage\fR; resource \fIblendType\fR.
.IP "\fB\-blr\fR \fIHxV\fR" 4
.IX Item "-blr HxV"
Apply Gaussian Blur with the specified radii to the transparent
Expand All @@ -282,7 +273,7 @@ vertical radius of 0 disables blurring;
resource \fIblurRadius\fR.
.IP "\fB\-icon\fR \fIfile\fR" 4
.IX Item "-icon file"
Compile \fIafterimage\fR or \fIpixbuf\fR: Use the specified image as application icon. This
Compile \fIpixbuf\fR: Use the specified image as application icon. This
is used by many window managers, taskbars and pagers to represent the
application window; resource \fIiconFile\fR.
.IP "\fB\-bg\fR \fIcolour\fR" 4
Expand All @@ -293,7 +284,7 @@ Window background colour; resource \fBbackground\fR.
Window foreground colour; resource \fBforeground\fR.
.IP "\fB\-pixmap\fR \fIfile[;oplist]\fR" 4
.IX Item "-pixmap file[;oplist]"
Compile \fIafterimage\fR or \fIpixbuf\fR: Specify image file for the background and also
Compile \fIpixbuf\fR: 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 \f(CW\*(C`;\*(C'\fR in the
command-line; for more details see resource \fBbackgroundPixmap\fR.
Expand Down Expand Up @@ -829,9 +820,7 @@ If multiple templates are specified the last one wins. Note that a
template overrides all the scale, position and operations settings.
.Sp
If used in conjunction with \fB\-tr\fR option, the specified pixmap will be
blended over the transparent background using alpha-blending. If \fIafterimage\fR
support has been compiled in it is possible to choose other blending
types with \fB\-blt \*(L"type\*(R"\fR option.
blended over the transparent background using alpha-blending.
.RE
.IP "\fBpath:\fR \fIpath\fR" 4
.IX Item "path: path"
Expand Down
22 changes: 4 additions & 18 deletions doc/rxvt.7.man.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "@@RXVT_NAME@@ 7"
.TH @@RXVT_NAME@@ 7 "2012-01-21" "@@RXVT_VERSION@@" "RXVT-UNICODE"
.TH @@RXVT_NAME@@ 7 "2012-05-11" "@@RXVT_VERSION@@" "RXVT-UNICODE"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Expand Down Expand Up @@ -409,7 +409,7 @@ your picture with gimp or any other tool:
\& @@URXVT_NAME@@ \-pixmap "background.jpg;:root"
.Ve
.PP
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.
.PP
3. Use an \s-1ARGB\s0 visual:
Expand Down Expand Up @@ -2282,7 +2282,7 @@ Ps = 12 Change colour of text cursor foreground to Pt
Ps = 13 Change colour of mouse foreground to Pt
Ps = 17 Change background colour of highlight characters to Pt
Ps = 19 Change foreground colour of highlight characters to Pt
Ps = 20 Change background pixmap parameters (see section BACKGROUND IMAGE) (Compile afterimage or pixbuf).
Ps = 20 Change background pixmap parameters (see section BACKGROUND IMAGE) (Compile pixbuf).
Ps = 39 Change default foreground colour to Pt. [deprecated, use 10]
Ps = 46 Change Log File to Pt unimplemented
Ps = 49 Change default background colour to Pt. [deprecated, use 11]
Expand Down Expand Up @@ -2542,17 +2542,6 @@ option requires \-\-enable\-utmp to also be specified.
Write user and tty to lastlog file (used by programs like
\&\fIlastlogin\fR) at start of rxvt execution. This option requires
\&\-\-enable\-utmp to also be specified.
.IP "\-\-enable\-afterimage (default: off)" 4
.IX Item "--enable-afterimage (default: off)"
Add support for libAfterImage to be used for background
images. It adds support for many file formats including \s-1JPG\s0, \s-1PNG\s0,
\&\s-1SVG\s0, \s-1TIFF\s0, \s-1GIF\s0, \s-1XPM\s0, \s-1BMP\s0, \s-1ICO\s0, \s-1XCF\s0, \s-1TGA\s0 and AfterStep image \s-1XML\s0
(<http://www.afterstep.org/visualdoc.php?show=asimagexml>).
.Sp
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 \s-1SVG\s0.
.IP "\-\-enable\-pixbuf (default: on)" 4
.IX Item "--enable-pixbuf (default: on)"
Add support for GDK-PixBuf to be used for background images.
Expand All @@ -2565,7 +2554,7 @@ to display some kind of progress indicator during startup.
.IP "\-\-enable\-transparency (default: on)" 4
.IX 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 \s-1RENDER\s0 extension in the X
server.
.IP "\-\-enable\-fading (default: on)" 4
Expand Down Expand Up @@ -2697,9 +2686,6 @@ and consequently sets \f(CW\*(C`TERM\*(C'\fR to \f(CW\*(C`rxvt\-unicode\-256colo
.Sp
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.
.IP "\-\-with\-afterimage\-config=DIR" 4
.IX Item "--with-afterimage-config=DIR"
Look for the libAfterImage config script in \s-1DIR\s0.
.IP "\-\-with\-name=NAME (default: urxvt)" 4
.IX Item "--with-name=NAME (default: urxvt)"
Set the basename for the installed binaries, resulting
Expand Down
Loading

0 comments on commit a5cc9b1

Please sign in to comment.