--- rxvt-unicode/src/scrollbar.C	2008/02/17 12:11:56	1.53
+++ rxvt-unicode/src/scrollbar.C	2008/02/18 09:58:05	1.55
@@ -63,6 +63,10 @@
 rxvt_term::resize_scrollbar ()
 {
   int delayed_init = 0;
+  int window_sb_x = 0;
+
+  if (option (Opt_scrollBar_right))
+    window_sb_x = szHint.width - scrollBar.total_width ();
 
 #define R_SCROLLBEG_XTERM	0
 #define R_SCROLLEND_XTERM	szHint.height
@@ -127,6 +131,10 @@
 
       delayed_init = 1;
     }
+  else
+    XMoveResizeWindow (dpy, scrollBar.win,
+                       window_sb_x, 0,
+                       scrollBar.total_width (), szHint.height);
 
   scrollbar_show (1);
 
@@ -141,17 +149,16 @@
 rxvt_term::scrollbar_show (int update)
 {
   int             ret = 0;
-  int             top, bot, len, adj;
 
   if (!scrollBar.state)
     return 0;
 
   if (update)
     {
-      top = view_start - top_row;
-      bot = top + (nrow - 1);
-      len = max (nrow - 1 - top_row, 1);
-      adj = (((bot - top) * scrollBar.size ()) % len) > 0 ? 1 : 0;
+      int top = view_start - top_row;
+      int bot = top + (nrow - 1);
+      int len = max (nrow - 1 - top_row, 1);
+      int adj = (((bot - top) * scrollBar.size ()) % len) > 0 ? 1 : 0;
 
       scrollBar.top = (scrollBar.beg + (top * scrollBar.size ()) / len);
       scrollBar.len = ((bot - top) * scrollBar.size ()) / len +