*** empty log message ***

diff --git a/Changes b/Changes
index 2601b3648ee299590da075e63964737b52be96a1..6b1ecca3403c7da2f98fe1c5d2b04d231552df78 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,4 @@
+TODO: F="Monaco CY" rxvt -fn 9x15bold -fb xft:"$F":bold -fi xft:"$F":italic -fbi xft:"$F":bold,italic vi screen.C scroll changed italic N
 TODO: do font request caching, might help rxvtd on some machines
 TODO: safer command: keymap processing.
 TODO: "slow" rendering mode for bidi and scripts
@@ -11,6 +12,10 @@ WISH: OnTheSpot editing, or maybe switch to miiiiiiif
 WISH: tabbed windows (hey, just use screen...)
 WISH: just for fun, do shade and tint with XRender.
 
+        - R_SB_RXVT bitset value was 0, so rxvt scrollbar was initialized
+          every time (original rxvt also affected). Reported by Jasmin
+          Buchert.
+
 5.5  Sat Apr 23 22:31:36 CEST 2005
        - re-enabled modifer state matching as in 5.3, but implement
           a new builtin: keysym style that simply reverts to the built-in

diff --git a/reconf b/reconf
index 1e868722aa98c33448bf2bda36cfdecc66b07db8..b1367d62f96505d3ae136e56f4435f7cdf90046e 100755 (executable)
--- a/reconf
+++ b/reconf
@@ -5,8 +5,8 @@
 
 # just set some compiler options
 if [ "x$HOSTNAME" = xcerebro -o "x$HOSTNAME" = xfuji ]; then
-   CC=ccache\ gcc-4.0
-   CXX=ccache\ g++-4.0
+   CC=ccache\ gcc-3.4
+   CXX=ccache\ g++-3.4
    export CC CXX
 fi
 

diff --git a/src/rxvt.h b/src/rxvt.h
index 3d81c288f7152f8e2306b8675d162bb72912c5ab..3643235e35230544b3cf85db8d5cb981daa54422 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -269,10 +269,10 @@ typedef struct _mwmhints {
 #define R_SB_ALIGN_TOP          1
 #define R_SB_ALIGN_BOTTOM       2
 
-#define R_SB_RXVT               0
 #define R_SB_NEXT               1
 #define R_SB_XTERM              2
 #define R_SB_PLAIN              4
+#define R_SB_RXVT               8
 
 #define SB_WIDTH_NEXT           19
 #define SB_WIDTH_XTERM          15

diff --git a/src/scrollbar-rxvt.C b/src/scrollbar-rxvt.C
index 94f5499fb8cf2dc9f2ee7ee56c332d36f919fec4..04a701d564ad5d19f90d0c4c413e61cefa7cfe24 100644 (file)
--- a/src/scrollbar-rxvt.C
+++ b/src/scrollbar-rxvt.C
@@ -134,6 +134,7 @@ rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scro
   if ((scrollBar.init & R_SB_RXVT) == 0)
     {
       scrollBar.init |= R_SB_RXVT;
+
       if (sbshadow)
         {
           XSetWindowBackground (display->display, scrollBar.win, pix_colors_focused[Color_trough]);
@@ -201,3 +202,4 @@ rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scro
 }
 #endif                         /* RXVT_SCROLLBAR */
 /*----------------------- end-of-file (C source) -----------------------*/
+