From 5416a83185b66042d371c516177cdecebed73751 Mon Sep 17 00:00:00 2001
From: root
Date: Sun, 29 Jan 2006 22:38:43 +0000
Subject: [PATCH] *** empty log message ***
---
Changes | 8 ++++----
doc/rxvt.1.html | 16 +++++++++++++---
doc/rxvt.1.man.in | 15 ++++++++++++---
doc/rxvt.1.pod | 11 ++++++++++-
doc/rxvt.1.txt | 15 ++++++++++++---
src/rxvttoolkit.C | 4 ++--
6 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/Changes b/Changes
index c5731770..156f00a2 100644
--- a/Changes
+++ b/Changes
@@ -8,7 +8,6 @@ TODO: harmonize --disable-options into position-dependent options.
TODO: "slow" rendering mode for bidi and scripts
TODO: read property sequence is broken with respect to utf-8 etc.
WISH: anyevent mouse notification / manage MotionMask better.
-WISH: just for fun, do shade and tint with XRender.
WISH: http://www120.pair.com/mccarthy/nextstep/intro.htmld/Workspace.html is the correct nextstep look.
DUMB: support tex fonts
@@ -18,9 +17,10 @@ DUMB: support tex fonts
- added the OSC sequence 702 to detect the urxvt version number.
- small configure updates.
- overhauled color management: smaller codesize, alpha support.
- - support rgba:r/g/b/a, #argb, #aarrggbb and #aaaarrrrggggbbbb
- colour "names", and try to work around xft forcing everything
- to be 100% transparent. Long Live Xft!
+ - support rgba:rrrr/gggg/bbbb/aaaa, #argb, #aarrggbb and
+ #aaaarrrrggggbbbb (yes, it did hurt) colour "names".
+ - try to work around Xft and Xrender forcing everything to be 100%
+ transparent. Long Live Xft!
- do not include X11/Intrinsic.h anymore, directly use
Xlib/Xutil/Xresource directly.
diff --git a/doc/rxvt.1.html b/doc/rxvt.1.html
index b22295ed..075d6cd3 100644
--- a/doc/rxvt.1.html
+++ b/doc/rxvt.1.html
@@ -136,7 +136,7 @@ respected). In the absence of this option, the display specified by the
-depth bitdepth
-Compile frills: Attempt to find a visual with the given bit depth;
+Compile xft: Attempt to find a visual with the given bit depth;
resource depth.
@@ -164,6 +164,10 @@ Turn on/off jump scrolling; resource jumpScroll.
Turn on/off inheriting parent window's pixmap. Alternative form is
-tr; resource inheritPixmap.
+
+Please note that transparency of any kind if completely unsupported by
+the author. Don't bug him with installation questions!
+
-fade number
@@ -177,7 +181,7 @@ colour; resource fading.
Fade to this colour when fading is used (see -fade). The default colour
-is black. resource fadeColor.
+is opaque black. resource fadeColor.
-tint colour
@@ -693,7 +697,7 @@ extensions not documented here):
depth: bitdepth
-Compile frills: Attempt to find a visual with the given bit depth;
+Compile xft: Attempt to find a visual with the given bit depth;
option -depth.
@@ -806,6 +810,10 @@ quickly, fewer screen updates are performed [default]; option -jFalse: do not inherit the parent windows'
pixmap.
+
+Please note that transparency of any kind if completely unsupported by
+the author. Don't bug him with installation questions!
+
fading: number
@@ -1737,6 +1745,8 @@ values (0 is completely transparent and the maximum is opaque). You
probably need to specify ``-depth 32'', too, and have the luck that your
X-server uses ARGB pixel layout, as X is far from just supporting ARGB
visuals out of the box, and rxvt-unicode just fudges around.
+Please note that transparency of any kind if completely unsupported by
+the author. Don't bug him with installation questions!
Note that -rv (``reverseVideo: True'') simulates reverse video by
always swapping the foreground/background colours. This is in contrast to
xterm(1) where the colours are only swapped if they have not otherwise
diff --git a/doc/rxvt.1.man.in b/doc/rxvt.1.man.in
index 800e5eef..8f13c30a 100644
--- a/doc/rxvt.1.man.in
+++ b/doc/rxvt.1.man.in
@@ -218,7 +218,7 @@ respected). In the absence of this option, the display specified by the
\&\fB\s-1DISPLAY\s0\fR environment variable is used.
.IP "\fB\-depth\fR \fIbitdepth\fR" 4
.IX Item "-depth bitdepth"
-Compile \fIfrills\fR: Attempt to find a visual with the given bit depth;
+Compile \fIxft\fR: Attempt to find a visual with the given bit depth;
resource \fBdepth\fR.
.IP "\fB\-geometry\fR \fIgeom\fR" 4
.IX Item "-geometry geom"
@@ -233,6 +233,9 @@ Turn on/off jump scrolling; resource \fBjumpScroll\fR.
.IX Item "-ip|+ip | -tr|+tr"
Turn on/off inheriting parent window's pixmap. Alternative form is
\&\fB\-tr\fR; resource \fBinheritPixmap\fR.
+.Sp
+\&\fIPlease note that transparency of any kind if completely unsupported by
+the author. Don't bug him with installation questions!\fR
.IP "\fB\-fade\fR \fInumber\fR" 4
.IX Item "-fade number"
Fade the text by the given percentage when focus is lost. Small values
@@ -241,7 +244,7 @@ colour; resource \fBfading\fR.
.IP "\fB\-fadecolor\fR \fIcolour\fR" 4
.IX Item "-fadecolor colour"
Fade to this colour when fading is used (see \fB\-fade\fR). The default colour
-is black. resource \fBfadeColor\fR.
+is opaque black. resource \fBfadeColor\fR.
.IP "\fB\-tint\fR \fIcolour\fR" 4
.IX Item "-tint colour"
Tint the transparent background pixmap with the given colour when
@@ -586,7 +589,7 @@ check the @@RXVT_NAME@@\fIperl\fR\|(3) manpage for additional settings by perl
extensions not documented here):
.IP "\fBdepth:\fR \fIbitdepth\fR" 4
.IX Item "depth: bitdepth"
-Compile \fIfrills\fR: Attempt to find a visual with the given bit depth;
+Compile \fIxft\fR: Attempt to find a visual with the given bit depth;
option \fB\-depth\fR.
.IP "\fBgeometry:\fR \fIgeom\fR" 4
.IX Item "geometry: geom"
@@ -659,6 +662,9 @@ quickly, fewer screen updates are performed [default]; option \fB\-j\fR.
\&\fBTrue\fR: make the background inherit the parent windows' pixmap, giving
artificial transparency. \fBFalse\fR: do not inherit the parent windows'
pixmap.
+.Sp
+\&\fIPlease note that transparency of any kind if completely unsupported by
+the author. Don't bug him with installation questions!\fR
.IP "\fBfading:\fR \fInumber\fR" 4
.IX Item "fading: number"
Fade the text by the given percentage when focus is lost; option \fB\-fade\fR.
@@ -1348,6 +1354,9 @@ probably need to specify \fB\*(L"\-depth 32\*(R"\fR, too, and have the luck that
X\-server uses \s-1ARGB\s0 pixel layout, as X is far from just supporting \s-1ARGB\s0
visuals out of the box, and rxvt-unicode just fudges around.
.PP
+\&\fIPlease note that transparency of any kind if completely unsupported by
+the author. Don't bug him with installation questions!\fR
+.PP
Note that \fB\-rv\fR (\fB\*(L"reverseVideo: True\*(R"\fR) simulates reverse video by
always swapping the foreground/background colours. This is in contrast to
\&\fIxterm\fR(1) where the colours are only swapped if they have not otherwise
diff --git a/doc/rxvt.1.pod b/doc/rxvt.1.pod
index 8e9c772c..3c168532 100644
--- a/doc/rxvt.1.pod
+++ b/doc/rxvt.1.pod
@@ -117,6 +117,9 @@ Turn on/off jump scrolling; resource B.
Turn on/off inheriting parent window's pixmap. Alternative form is
B<-tr>; resource B.
+I
+
=item B<-fade> I
Fade the text by the given percentage when focus is lost. Small values
@@ -126,7 +129,7 @@ colour; resource B.
=item B<-fadecolor> I
Fade to this colour when fading is used (see B<-fade>). The default colour
-is black. resource B.
+is opaque black. resource B.
=item B<-tint> I
@@ -599,6 +602,9 @@ B: make the background inherit the parent windows' pixmap, giving
artificial transparency. B: do not inherit the parent windows'
pixmap.
+I
+
=item B I
Fade the text by the given percentage when focus is lost; option B<-fade>.
@@ -1352,6 +1358,9 @@ probably need to specify B<"-depth 32">, too, and have the luck that your
X-server uses ARGB pixel layout, as X is far from just supporting ARGB
visuals out of the box, and rxvt-unicode just fudges around.
+I
+
Note that B<-rv> (B<"reverseVideo: True">) simulates reverse video by
always swapping the foreground/background colours. This is in contrast to
I(1) where the colours are only swapped if they have not otherwise
diff --git a/doc/rxvt.1.txt b/doc/rxvt.1.txt
index e23c5aaf..10cc9977 100644
--- a/doc/rxvt.1.txt
+++ b/doc/rxvt.1.txt
@@ -87,7 +87,7 @@ OPTIONS
the DISPLAY environment variable is used.
-depth *bitdepth*
- Compile *frills*: Attempt to find a visual with the given bit depth;
+ Compile *xft*: Attempt to find a visual with the given bit depth;
resource depth.
-geometry *geom*
@@ -103,6 +103,9 @@ OPTIONS
Turn on/off inheriting parent window's pixmap. Alternative form is
-tr; resource inheritPixmap.
+ *Please note that transparency of any kind if completely unsupported
+ by the author. Don't bug him with installation questions!*
+
-fade *number*
Fade the text by the given percentage when focus is lost. Small
values fade a little only, 100 completely replaces all colours by
@@ -110,7 +113,7 @@ OPTIONS
-fadecolor *colour*
Fade to this colour when fading is used (see -fade). The default
- colour is black. resource fadeColor.
+ colour is opaque black. resource fadeColor.
-tint *colour*
Tint the transparent background pixmap with the given colour when
@@ -439,7 +442,7 @@ RESOURCES (available also as long-options)
documented here):
depth: *bitdepth*
- Compile *frills*: Attempt to find a visual with the given bit depth;
+ Compile *xft*: Attempt to find a visual with the given bit depth;
option -depth.
geometry: *geom*
@@ -512,6 +515,9 @@ RESOURCES (available also as long-options)
artificial transparency. False: do not inherit the parent windows'
pixmap.
+ *Please note that transparency of any kind if completely unsupported
+ by the author. Don't bug him with installation questions!*
+
fading: *number*
Fade the text by the given percentage when focus is lost; option
-fade.
@@ -1182,6 +1188,9 @@ COLORS AND GRAPHICS
layout, as X is far from just supporting ARGB visuals out of the box,
and rxvt-unicode just fudges around.
+ *Please note that transparency of any kind if completely unsupported by
+ the author. Don't bug him with installation questions!*
+
Note that -rv ("reverseVideo: True") simulates reverse video by always
swapping the foreground/background colours. This is in contrast to
*xterm*(1) where the colours are only swapped if they have not otherwise
diff --git a/src/rxvttoolkit.C b/src/rxvttoolkit.C
index fcd2fbc5..68c99123 100644
--- a/src/rxvttoolkit.C
+++ b/src/rxvttoolkit.C
@@ -591,9 +591,9 @@ rxvt_color::set (rxvt_screen *screen, rxvt_rgba rgba)
c.color.blue = rgba.b;
c.color.alpha = rgba.a;
- c.pixel = ((rgba.r * format->direct.redMask / rxvt_rgba::MAX_CC) << format->direct.red)
+ c.pixel = ((rgba.r * format->direct.redMask / rxvt_rgba::MAX_CC) << format->direct.red )
| ((rgba.g * format->direct.greenMask / rxvt_rgba::MAX_CC) << format->direct.green)
- | ((rgba.b * format->direct.blueMask / rxvt_rgba::MAX_CC) << format->direct.blue)
+ | ((rgba.b * format->direct.blueMask / rxvt_rgba::MAX_CC) << format->direct.blue )
| ((rgba.a * format->direct.alphaMask / rxvt_rgba::MAX_CC) << format->direct.alpha);
return true;
--
2.34.1