*** empty log message ***

diff --git a/Changes b/Changes
index c57317708f0d1e6ac3f36185a2f19b246083bf46..156f00a2d92e19ccd96bc06f31fda4a62dc2bf30 100644 (file)
--- 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 b22295ed40909bfc044d28daa23e6c3d783a25a4..075d6cd30a9de28715af78fedc95a4ed50090609 100644 (file)
--- 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
 <dt><strong><a name="item__2ddepth_bitdepth"><strong>-depth</strong> <em>bitdepth</em></a></strong><br />
 </dt>
 <dd>
-Compile <em>frills</em>: Attempt to find a visual with the given bit depth;
+Compile <em>xft</em>: Attempt to find a visual with the given bit depth;
 resource <strong>depth</strong>.
 </dd>
 <p></p>
@@ -164,6 +164,10 @@ Turn on/off jump scrolling; resource <strong>jumpScroll</strong>.
 Turn on/off inheriting parent window's pixmap. Alternative form is
 <strong>-tr</strong>; resource <strong>inheritPixmap</strong>.
 </dd>
+<dd>
+<p><em>Please note that transparency of any kind if completely unsupported by
+the author. Don't bug him with installation questions!</em></p>
+</dd>
 <p></p>
 <dt><strong><a name="item__2dfade_number"><strong>-fade</strong> <em>number</em></a></strong><br />
 </dt>
@@ -177,7 +181,7 @@ colour; resource <strong>fading</strong>.
 </dt>
 <dd>
 Fade to this colour when fading is used (see <strong>-fade</strong>). The default colour
-is black. resource <strong>fadeColor</strong>.
+is opaque black. resource <strong>fadeColor</strong>.
 </dd>
 <p></p>
 <dt><strong><a name="item__2dtint_colour"><strong>-tint</strong> <em>colour</em></a></strong><br />
@@ -693,7 +697,7 @@ extensions not documented here):</p>
 <dt><strong><a name="item_depth_3a_bitdepth"><strong>depth:</strong> <em>bitdepth</em></a></strong><br />
 </dt>
 <dd>
-Compile <em>frills</em>: Attempt to find a visual with the given bit depth;
+Compile <em>xft</em>: Attempt to find a visual with the given bit depth;
 option <strong>-depth</strong>.
 </dd>
 <p></p>
@@ -806,6 +810,10 @@ quickly, fewer screen updates are performed [default]; option <strong>-j</strong
 artificial transparency. <strong>False</strong>: do not inherit the parent windows'
 pixmap.
 </dd>
+<dd>
+<p><em>Please note that transparency of any kind if completely unsupported by
+the author. Don't bug him with installation questions!</em></p>
+</dd>
 <p></p>
 <dt><strong><a name="item_fading_3a_number"><strong>fading:</strong> <em>number</em></a></strong><br />
 </dt>
@@ -1737,6 +1745,8 @@ values (0 is completely transparent and the maximum is opaque). You
 probably need to specify <strong>``-depth 32''</strong>, 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.</p>
+<p><em>Please note that transparency of any kind if completely unsupported by
+the author. Don't bug him with installation questions!</em></p>
 <p>Note that <strong>-rv</strong> (<strong>``reverseVideo: True''</strong>) simulates reverse video by
 always swapping the foreground/background colours. This is in contrast to
 <em>xterm</em>(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 800e5eef763dc5a226b809440e0fbe9ff978f61f..8f13c30aa480b89a8dbb51c8a63a10caa43e3b66 100644 (file)
--- 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 8e9c772cc9c267fb1f15f7cbe481e1efe41c458c..3c1685326b0982ea5d8faabf82f10abf174a7c93 100644 (file)
--- a/doc/rxvt.1.pod
+++ b/doc/rxvt.1.pod
@@ -117,6 +117,9 @@ Turn on/off jump scrolling; resource B<jumpScroll>.
 Turn on/off inheriting parent window's pixmap. Alternative form is
 B<-tr>; resource B<inheritPixmap>.
 
+I<Please note that transparency of any kind if completely unsupported by
+the author. Don't bug him with installation questions!>
+
 =item B<-fade> I<number>
 
 Fade the text by the given percentage when focus is lost. Small values
@@ -126,7 +129,7 @@ colour; resource B<fading>.
 =item B<-fadecolor> I<colour>
 
 Fade to this colour when fading is used (see B<-fade>). The default colour
-is black. resource B<fadeColor>.
+is opaque black. resource B<fadeColor>.
 
 =item B<-tint> I<colour>
 
@@ -599,6 +602,9 @@ B<True>: make the background inherit the parent windows' pixmap, giving
 artificial transparency. B<False>: do not inherit the parent windows'
 pixmap.
 
+I<Please note that transparency of any kind if completely unsupported by
+the author. Don't bug him with installation questions!>
+
 =item B<fading:> I<number>
 
 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<Please note that transparency of any kind if completely unsupported by
+the author. Don't bug him with installation questions!>
+
 Note that B<-rv> (B<"reverseVideo: True">) simulates reverse video by
 always swapping the foreground/background colours. This is in contrast to
 I<xterm>(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 e23c5aafa1da75df01966688de464436c75f0378..10cc9977d7eea0c19fea1257bfe0f2273dd05fed 100644 (file)
--- 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 fcd2fbc57062913ec9cbf2b35726022e3f1205a5..68c9912373116283d575eda5e4685609545ff48a 100644 (file)
--- 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;